Fixing Canceled Sign In Bug (#249)

MSFT-Heba · web-flow · commit ffa2d3d91a75 · 2018-09-05T17:09:56.000-07:00
diff --git a/Assets/Xbox Live/Scripts/PlayerAuthentication.cs b/Assets/Xbox Live/Scripts/PlayerAuthentication.cs
@@ -280,13 +280,15 @@ private void OnPlayerSignIn(XboxLiveUser xboxLiveUser, XboxLiveAuthStatus authSt
             }
             else
             {
-                ExceptionManager.Instance.ThrowException(
-                            ExceptionSource.PlayerAuthentication,
-                            ExceptionType.SignInFailed,
-                            new Exception(errorMessage));
-                this.signInPanel.GetComponentInChildren<Button>().interactable = true;
-                this.AllowSignInAttempt = true;
+                if (authStatus != XboxLiveAuthStatus.Canceled)
+                {
+                    ExceptionManager.Instance.ThrowException(
+                                ExceptionSource.PlayerAuthentication,
+                                ExceptionType.SignInFailed,
+                                new Exception(errorMessage));
+                }
             }
+            this.ExecuteOnMainThread.Enqueue(Refresh);
         }
 
         private void Refresh()
diff --git a/Assets/Xbox Live/Scripts/SignInManager.cs b/Assets/Xbox Live/Scripts/SignInManager.cs
@@ -83,20 +83,38 @@ public IEnumerator SignInPlayer(int playerNumber)
                         {
                             if (task.Status == TaskStatus.RanToCompletion)
                             {
-                                playerInfo.WindowsUser = task.Result;
-                                playerInfo.XboxLiveUser = new XboxLiveUser(playerInfo.WindowsUser);
-                                XboxLiveUser.SignOutCompleted += XboxLiveUserSignOutCompleted;
-                                this.PlayersPendingSignIn.Add(playerNumber);
-                                userPicked = true;
+                                if (task.Result != null)
+                                {
+                                    playerInfo.WindowsUser = task.Result;
+                                    playerInfo.XboxLiveUser = new XboxLiveUser(playerInfo.WindowsUser);
+                                    XboxLiveUser.SignOutCompleted += XboxLiveUserSignOutCompleted;
+                                    this.PlayersPendingSignIn.Add(playerNumber);
+                                    userPicked = true;
+                                }
+                                else {
+                                    userPicked = false;
+                                    NotifyAllCallbacks(playerNumber, null, XboxLiveAuthStatus.Canceled, "Sign In Failed: Player " + playerNumber + " failed. Status: Canceled by the User.");
+                                }
                             }
                             else
                             {
-                                ExceptionManager.Instance.ThrowException(
-                                        ExceptionSource.SignInManager,
-                                        ExceptionType.SignInFailed,
-                                        task.Exception);
-                                userPicked = false;
-
+                                if (task.Status == TaskStatus.Canceled)
+                                {
+                                    userPicked = false;
+                                    NotifyAllCallbacks(playerNumber, null, XboxLiveAuthStatus.Canceled, "Sign In Failed: Player " + playerNumber + " failed. Status: Canceled by the User.");
+                                }
+                                else
+                                {
+                                    if (task.Status == TaskStatus.Faulted)
+                                    {
+                                        ExceptionManager.Instance.ThrowException(
+                                            ExceptionSource.SignInManager,
+                                            ExceptionType.SignInFailed,
+                                            task.Exception);
+                                        userPicked = false;
+                                        NotifyAllCallbacks(playerNumber, null, XboxLiveAuthStatus.Failed, "Sign In Failed: Player " + playerNumber + " failed.");
+                                    }
+                                }
                             }
                         });
                     if (userPicked) {
diff --git a/Assets/Xbox Live/Scripts/XboxLiveAuthStatus.cs b/Assets/Xbox Live/Scripts/XboxLiveAuthStatus.cs
@@ -7,6 +7,7 @@ public enum XboxLiveAuthStatus
     {
         Unknown,
         Succeeded,
+        Canceled,
         Unsupported,
         Invalid,
         Failed

Original file line number	Diff line number	Diff line change
`@@ -280,13 +280,15 @@ private void OnPlayerSignIn(XboxLiveUser xboxLiveUser, XboxLiveAuthStatus authSt`
`280`	`280`	`}`
`281`	`281`	`else`
`282`	`282`	`{`
`283`		`- ExceptionManager.Instance.ThrowException(`
`284`		`- ExceptionSource.PlayerAuthentication,`
`285`		`- ExceptionType.SignInFailed,`
`286`		`- new Exception(errorMessage));`
`287`		`- this.signInPanel.GetComponentInChildren<Button>().interactable = true;`
`288`		`- this.AllowSignInAttempt = true;`
	`283`	`+ if (authStatus != XboxLiveAuthStatus.Canceled)`
	`284`	`+ {`
	`285`	`+ ExceptionManager.Instance.ThrowException(`
	`286`	`+ ExceptionSource.PlayerAuthentication,`
	`287`	`+ ExceptionType.SignInFailed,`
	`288`	`+ new Exception(errorMessage));`
	`289`	`+ }`
`289`	`290`	`}`
	`291`	`+ this.ExecuteOnMainThread.Enqueue(Refresh);`
`290`	`292`	`}`
`291`	`293`
`292`	`294`	`private void Refresh()`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ public enum XboxLiveAuthStatus`
`7`	`7`	`{`
`8`	`8`	`Unknown,`
`9`	`9`	`Succeeded,`
	`10`	`+ Canceled,`
`10`	`11`	`Unsupported,`
`11`	`12`	`Invalid,`
`12`	`13`	`Failed`