Displaying a message on the Authentication window and setting the cached username

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs

@@ -23,6 +23,7 @@ class AuthenticationView : Subview
         [SerializeField] private Vector2 scroll;
         [SerializeField] private string username = "";
         [SerializeField] private string two2fa = "";
+        [SerializeField] private string message;
 
         [NonSerialized] private bool need2fa;
         [NonSerialized] private bool isBusy;
@@ -98,6 +99,16 @@ public override void OnGUI()
             GUILayout.EndScrollView();
         }
 
+        public void SetMessage(string value)
+        {
+            message = value;
+        }
+
+        public void SetUsername(string value)
+        {
+            username = value;
+        }
+
         private void HandleEnterPressed()
         {
             if (Event.current.type != EventType.KeyDown)
@@ -112,6 +123,8 @@ private void OnGUILogin()
         {
             EditorGUI.BeginDisabledGroup(isBusy);
             {
+                ShowMessage();
+
                 GUILayout.Space(3);
                 GUILayout.BeginHorizontal();
                 {
@@ -217,6 +230,16 @@ private void DoResult(bool success, string msg)
             }
         }
 
+        private void ShowMessage()
+        {
+            if (message != null)
+            {
+                GUILayout.Space(Styles.BaseSpacing + 3);
+                GUILayout.Label(message, Styles.CenteredLabel);
+                GUILayout.Space(Styles.BaseSpacing + 3);
+            }
+        }
+
         private void ShowErrorMessage()
         {
             if (errorMessage != null)

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PopupWindow.cs

@@ -59,19 +59,44 @@ private void Open(PopupViewType popupViewType, Action<bool> onClose)
                     shouldCloseOnFinish = true;
 
                 }, exception => {
-
                     Logger.Trace("User required validation opening AuthenticationView");
 
-                    OpenInternal(PopupViewType.AuthenticationView, completedAuthentication => {
+                    string message = null;
+                    string username = null;
+
+                    var usernameMismatchException = exception as TokenUsernameMismatchException;
+                    if (usernameMismatchException != null)
+                    {
+                        message = "Your credentials need to be refreshed";
+                        username = usernameMismatchException.CachedUsername;
+                    }
+
+                    var keychainEmptyException = exception as KeychainEmptyException;
+                    if (keychainEmptyException != null)
+                    {
+                        message = "We need you to authenticate first";
+                    }
 
+                    if (usernameMismatchException == null && keychainEmptyException == null)
+                    {
+                        message = "There was an error validating your account";
+                    }
+
+                    OpenInternal(PopupViewType.AuthenticationView, completedAuthentication => {
                         if (completedAuthentication)
                         {
                             Logger.Trace("User completed validation opening view: {0}", popupViewType.ToString());
 
                             Open(popupViewType, onClose);
                         }
                     });
+
                     shouldCloseOnFinish = false;
+                    authenticationView.SetMessage(message);
+                    if (username != null)
+                    {
+                        authenticationView.SetUsername(username);
+                    }
                 });
             }
             else