AuthenticationView can handle its own message logic

Author: shana

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

@@ -9,6 +9,8 @@ class AuthenticationView : Subview
     {
         private static readonly Vector2 viewSize = new Vector2(290, 290);
 
+        private const string CredentialsNeedRefreshMessage = "We've detected that your stored credentials are out of sync with your current user. This can happen if you have signed in to git outside of Unity. Sign in again to refresh your credentials.";
+        private const string NeedAuthenticationMessage = "We need you to authenticate first";
         private const string WindowTitle = "Authenticate";
         private const string UsernameLabel = "Username";
         private const string PasswordLabel = "Password";
@@ -41,14 +43,25 @@ public override void InitializeView(IView parent)
             Size = viewSize;
         }
 
-        public override void OnEnable()
+        public void Initialize(Exception exception)
         {
-            base.OnEnable();
-        }
+            var usernameMismatchException = exception as TokenUsernameMismatchException;
+            if (usernameMismatchException != null)
+            {
+                message = CredentialsNeedRefreshMessage;
+                username = usernameMismatchException.CachedUsername;
+            }
 
-        public override void OnDisable()
-        {
-            base.OnDisable();
+            var keychainEmptyException = exception as KeychainEmptyException;
+            if (keychainEmptyException != null)
+            {
+                message = NeedAuthenticationMessage;
+            }
+
+            if (usernameMismatchException == null && keychainEmptyException == null)
+            {
+                message = exception.Message;
+            }
         }
 
         public override void OnGUI()
@@ -81,27 +94,7 @@ public override void OnGUI()
             }
             GUILayout.EndScrollView();
         }
-
-        public void SetMessage(string value)
-        {
-            message = value;
-        }
-
-        public void ClearMessage()
-        {
-            message = null;
-        }
-
-        public void SetUsername(string value)
-        {
-            username = value;
-        }
-
-        public void ClearUsername()
-        {
-            username = string.Empty;
-        }
-
+        
         private void HandleEnterPressed()
         {
             if (Event.current.type != EventType.KeyDown)

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

@@ -7,9 +7,6 @@ namespace GitHub.Unity
     [Serializable]
     class PopupWindow : BaseWindow
     {
-        private const string CredentialsNeedRefreshMessage = "We've detected that your stored credentials are out of sync with your current user. This can happen if you have signed in to git outside of Unity. Sign in again to refresh your credentials.";
-        private const string NeedAuthenticationMessage = "We need you to authenticate first";
-
         public enum PopupViewType
         {
             None,
@@ -63,32 +60,8 @@ private void Open(PopupViewType popupViewType, Action<bool> onClose)
 
                 }, exception => {
                     Logger.Trace("User required validation opening AuthenticationView");
-
-                    string message = null;
-                    string username = null;
-
-                    var usernameMismatchException = exception as TokenUsernameMismatchException;
-                    if (usernameMismatchException != null)
-                    {
-                        message = CredentialsNeedRefreshMessage;
-                        username = usernameMismatchException.CachedUsername;
-                    }
-
-                    var keychainEmptyException = exception as KeychainEmptyException;
-                    if (keychainEmptyException != null)
-                    {
-                        message = NeedAuthenticationMessage;
-                    }
-
-                    if (usernameMismatchException == null && keychainEmptyException == null)
-                    {
-                        message = exception.Message;
-                    }
-
+                    authenticationView.Initialize(exception);
                     OpenInternal(PopupViewType.AuthenticationView, completedAuthentication => {
-                        authenticationView.ClearMessage();
-                        authenticationView.ClearUsername();
-
                         if (completedAuthentication)
                         {
                             Logger.Trace("User completed validation opening view: {0}", popupViewType.ToString());
@@ -98,11 +71,6 @@ private void Open(PopupViewType popupViewType, Action<bool> onClose)
                     });
 
                     shouldCloseOnFinish = false;
-                    authenticationView.SetMessage(message);
-                    if (username != null)
-                    {
-                        authenticationView.SetUsername(username);
-                    }
                 });
             }
             else
@@ -120,10 +88,7 @@ private void OpenInternal(PopupViewType popupViewType, Action<bool> onClose)
             }
 
             ActiveViewType = popupViewType;
-            titleContent = new GUIContent(ActiveView.Title, Styles.SmallLogo);
-            OnEnable();
             Show();
-            Refresh();
         }
 
         public IApiClient Client