Skip to content

Credman Helper #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wickedcube wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Credman Helper #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10860a2
Credman Helper
wickedcube Jun 8, 2026
c5248a2
Removed empty webclientID
wickedcube Jun 8, 2026
9ea1e9e
Update CredManBridge.java
wickedcube Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 90 additions & 104 deletions trivialkart/trivialkart-unity/Assets/Scripts/AuthManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,10 @@ public class AuthManager : MonoBehaviour
private string customJwtToken;

#if PGS_V2
private GoogleSignInUser googleUser;

// --- NEW VARIABLES for main-thread dispatching ---
// V2 (CredMan) Specific Variables

@borisf borisf Jun 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PGS v2 + link

private volatile bool googleTaskComplete = false;
private Exception googleSignInException = null;
private string authCodeToExchange = null;
private string credManError = null;
#endif

public string serverUrl;
Expand Down Expand Up @@ -132,18 +130,8 @@ private void Awake()
PlayGamesPlatform.DebugLogEnabled = true;
PlayGamesPlatform.Activate();
#elif PGS_V2
// --- V2 INITIALIZATION ---
statusText.text = "Initializing Google Sign-In...";
GoogleSignIn.Configuration = new GoogleSignInConfiguration
{
WebClientId = webClientId,
ForceTokenRefresh = true,

UseGameSignIn = false,
RequestEmail = true,
RequestAuthCode = true,
};

// V2 Initialization
statusText.text = "Initializing...";
PlayGamesPlatform.DebugLogEnabled = true;
#endif

Expand Down Expand Up @@ -171,57 +159,52 @@ private void Awake()
#if PGS_V1
PlayGamesPlatform.Instance.Authenticate(OnSilentSignInFinished, true);
#elif PGS_V2
GoogleSignIn.DefaultInstance.SignInSilently().ContinueWith(OnGoogleSignInComplete);
if (TryLoadSession())
{
Debug.Log("Valid session found. Skipping CredMan.");
ShowGamePanel();
SignInToPlayGamesServices(); // Achievements only
}
else if (PlayerPrefs.GetInt("UserSignedOut", 0) == 0)
{
Debug.Log("Attempting CredMan Silent Sign-In...");
StartSignIn(false); // Silent Mode
}
else
{
ShowStartPanel();
}
#endif
}

private void Update()
{
#if PGS_V2
// V2 Main Thread Dispatcher

@borisf borisf Jun 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PGS v2

if (googleTaskComplete)
{
googleTaskComplete = false; // Reset flag

if (authCodeToExchange != null && googleSignInException == null)
googleTaskComplete = false;
if (!string.IsNullOrEmpty(credManError))
{
// --- Success case ---
Debug.Log($"Google Sign-In successful for: {this.googleUser.Email}");
Debug.Log($"Retrieved Server Auth Code. Sending to backend...");
statusText.text = "Connecting to game server...";
StartCoroutine(ExchangeAuthcodeAndLink(authCodeToExchange));
}
else
{
if (googleSignInException != null)
if (credManError == "SilentFailed")
{
var e = googleSignInException.GetBaseException();

if (e is GoogleSignIn.SignInException signInException)
{
Debug.Log($"Google Sign-In Error: {signInException.Status}");
if (signInException.Status == GoogleSignInStatusCode.Canceled)
{
statusText.text = "Sign-in cancelled.";
}
}
else
{
Debug.Log($"Google Sign-In Task Error: {e.Message}");
if (e.Message.Contains("Canceled"))
{
statusText.text = "Sign-in cancelled.";
}
else
{
statusText.text = "Sign-in failed. Please try again.";
}
}
Debug.Log("CredMan Silent Sign-In failed.");
statusText.text = "Please sign in.";
}
else
{
Debug.LogError("CredMan Error: " + credManError);
statusText.text = "Sign-in Failed.";
}

ShowStartPanel();
}
Comment on lines +187 to 200

@gemini-code-assist gemini-code-assist Bot Jun 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

If silent sign-in fails, OnSignInError is called with "SilentFailed". Currently, this error is ignored and does not trigger the main thread dispatcher to show the start panel. As a result, the game will soft-lock on the loading screen. We should handle "SilentFailed" gracefully by showing the start panel and updating the status text to "Please sign in.".

            if (!string.IsNullOrEmpty(credManError))
            {
                Debug.LogError("CredMan Error: " + credManError);
                statusText.text = credManError == "SilentFailed" ? "Please sign in." : "Sign-in Failed.";
                ShowStartPanel();
            }


googleSignInException = null;
else if (!string.IsNullOrEmpty(authCodeToExchange))
{
Debug.Log("Got Auth Code. Exchanging...");
statusText.text = "Connecting to server...";
StartCoroutine(ExchangeAuthcodeAndLink(authCodeToExchange));
}
credManError = null;
authCodeToExchange = null;
}
#endif
Expand Down Expand Up @@ -376,30 +359,57 @@ private IEnumerator VerifyAndLinkGoogleAccount(string idToken)
#endif

#if PGS_V2
private void OnGoogleSignInComplete(Task<GoogleSignInUser> task)
private bool TryLoadSession()
{
try
{
if (task.IsFaulted)
{
googleSignInException = task.Exception;
}
else if (task.IsCanceled)
{
googleSignInException = new System.Exception("Google Sign-In Canceled.");
}
else
{
this.googleUser = task.Result;
this.authCodeToExchange = this.googleUser.AuthCode;
}
}
catch (System.Exception ex)
{
googleSignInException = ex;
}
string token = PlayerPrefs.GetString("Cached_JWT", null);
if (string.IsNullOrEmpty(token)) return false;

this.customJwtToken = token;
string email = PlayerPrefs.GetString("Cached_Email", "");
int count = PlayerPrefs.GetInt("Cached_Count", 0);

statusText.text = $"Signed in as: {email}";
incText.text = count.ToString("000");
return true;
}

private void SaveSession(LinkResponse data)
{
PlayerPrefs.SetString("Cached_JWT", data.jwtToken);
PlayerPrefs.SetString("Cached_Email", data.email);
PlayerPrefs.SetString("Cached_ID", data.inGameAccountID);
PlayerPrefs.SetInt("Cached_Count", data.inGameCount);
PlayerPrefs.SetInt("UserSignedOut", 0);
PlayerPrefs.Save();
this.customJwtToken = data.jwtToken;
}

private void ClearSession()
{
PlayerPrefs.DeleteKey("Cached_JWT");
PlayerPrefs.DeleteKey("Cached_Email");
PlayerPrefs.DeleteKey("Cached_ID");
PlayerPrefs.DeleteKey("Cached_Count");
PlayerPrefs.SetInt("UserSignedOut", 1);
PlayerPrefs.Save();
this.customJwtToken = null;
}

public void StartSignIn(bool interactive)
{
AndroidJavaClass unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
AndroidJavaObject currentActivity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
AndroidJavaClass bridge = new AndroidJavaClass("com.gamesamples.trivialkartunity.CredManBridge");

googleTaskComplete = true;
string methodName = interactive ? "signInInteractive" : "signInSilent";
bridge.CallStatic(methodName, currentActivity, this.webClientId);
}

public void OnSignInSuccess(string token) { authCodeToExchange = token; googleTaskComplete = true; }
public void OnSignInError(string error)
{
credManError = error;
googleTaskComplete = true;
}
Comment on lines +409 to 413

@gemini-code-assist gemini-code-assist Bot Jun 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

Returning early when error == "SilentFailed" prevents the main thread from being notified of the failure, leading to a soft-lock. We should set credManError and googleTaskComplete for all errors so the main thread can handle them and show the appropriate UI.

    public void OnSignInError(string error) 
    {
        credManError = error;
        googleTaskComplete = true;
    }


private IEnumerator ExchangeAuthcodeAndLink(string serverAuthCode)
Expand All @@ -422,8 +432,6 @@ private IEnumerator ExchangeAuthcodeAndLink(string serverAuthCode)
Debug.LogError($"Backend Error: {request.error}");
Debug.LogError($"Response: {request.downloadHandler.text}");
statusText.text = "Failed to link account. Server error.";

GoogleSignIn.DefaultInstance.SignOut();
ShowStartPanel();
}

@borisf borisf Jun 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about this, mismatched braces?

else
Expand All @@ -443,28 +451,9 @@ private IEnumerator ExchangeAuthcodeAndLink(string serverAuthCode)
}
}

// This is called from ExchangeAuthcodeAndLink (main thread), so it's safe.
private void SignInToPlayGamesServices()
{
Debug.Log("Attempting silent sign-in to Play Games Services...");
statusText.text = "Loading game services...";

PlayGamesPlatform.Instance.Authenticate((SignInStatus status) =>
{
if (status == SignInStatus.Success)
{
Debug.Log("Play Games Services silent sign-in successful!");
if (this.googleUser != null)
{
statusText.text = $"Signed in as: {this.googleUser.Email}";
}
}
else
{
Debug.LogWarning("Play Games Services silent sign-in failed: " + status);
statusText.text = "Game services (achievements) failed to load.";
}
});
PlayGamesPlatform.Instance.Authenticate((SignInStatus status) => { Debug.Log("PGS Auth: " + status); });
}
#endif

Expand Down Expand Up @@ -528,8 +517,7 @@ private void GetStartedClicked()
#if PGS_V1
PlayGamesPlatform.Instance.Authenticate(ProcessAuthenticationResult, false);
#elif PGS_V2
// This is safe because OnGoogleSignInComplete now dispatches to Update()
GoogleSignIn.DefaultInstance.SignIn().ContinueWith(OnGoogleSignInComplete);
StartSignIn(true);
#endif
}

Expand All @@ -540,8 +528,7 @@ private void OnSignInWithGoogleClicked()
#if PGS_V1
PlayGamesPlatform.Instance.Authenticate(ProcessAuthenticationResult, false);
#elif PGS_V2
// This is safe because OnGoogleSignInComplete now dispatches to Update()
GoogleSignIn.DefaultInstance.SignIn().ContinueWith(OnGoogleSignInComplete);
StartSignIn(true);
#endif
}

Expand Down Expand Up @@ -642,8 +629,7 @@ private void OnSignOutClicked()
PlayGamesPlatform.Instance.SignOut();
}
#elif PGS_V2
GoogleSignIn.DefaultInstance.SignOut();
googleUser = null;
ClearSession();
#endif

if (FB.IsLoggedIn)
Expand Down
Loading