Initial routine in PopupWindow to handle authentication before presenting specific views

Author: StanleyGoldman

src/GitHub.Api/Application/ApiClient.cs

@@ -74,6 +74,20 @@ public async Task GetOrganizations(Action<IList<Organization>> onSuccess, Action
             await GetOrganizationInternal(onSuccess, onError);
         }
 
+        public async Task ValidateCurrentUser(Action onSuccess, Action<Exception> onError = null)
+        {
+            Guard.ArgumentNotNull(onSuccess, nameof(onSuccess));
+            try
+            {
+                await ValidateCurrentUserInternal();
+                onSuccess();
+            }
+            catch (Exception e)
+            {
+                onError?.Invoke(e);
+            }
+        }
+
         public async Task GetCurrentUser(Action<Octokit.User> callback)
         {
             Guard.ArgumentNotNull(callback, "callback");

src/GitHub.Api/Application/IApiClient.cs

@@ -16,5 +16,6 @@ interface IApiClient
         Task<bool> LoginAsync(string username, string password, Func<LoginResult, string> need2faCode);
         Task Logout(UriString host);
         Task GetCurrentUser(Action<Octokit.User> callback);
+        Task ValidateCurrentUser(Action onSuccess, Action<Exception> onError = null);
     }
 }

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

@@ -287,7 +287,7 @@ public void OnEmbeddedGUI()
                     var publishedClicked = GUILayout.Button(PublishButton, Styles.HistoryToolbarButtonStyle);
                     if (publishedClicked)
                     {
-                        PopupWindow.Open(PopupWindow.PopupViewType.PublishView);
+                        PopupWindow.OpenWindow(PopupWindow.PopupViewType.PublishView);
                     }
                 }
             }

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

@@ -20,32 +20,100 @@ public enum PopupViewType
         [SerializeField] private PublishView publishView;
         [SerializeField] private LoadingView loadingView;
 
+        [NonSerialized] private IApiClient client;
+
         public event Action<bool> OnClose;
 
         [MenuItem("GitHub/Authenticate")]
         public static void Launch()
         {
-            Open(PopupViewType.AuthenticationView);
+            OpenWindow(PopupViewType.AuthenticationView);
         }
 
-        public static PopupWindow Open(PopupViewType popupViewType, Action<bool> onClose = null)
+        public static PopupWindow OpenWindow(PopupViewType popupViewType, Action<bool> onClose = null)
         {
             var popupWindow = GetWindow<PopupWindow>(true);
 
-            popupWindow.OnClose.SafeInvoke(false);
+            popupWindow.Open(popupViewType, onClose);
+
+            return popupWindow;
+        }
+
+        private void Open(PopupViewType popupViewType, Action<bool> onClose)
+        {
+            OnClose.SafeInvoke(false);
+            OnClose = null;
+
+            Logger.Trace("OpenView: {0}", popupViewType.ToString());
+
+            var viewNeedsAuthentication = popupViewType == PopupViewType.PublishView;
+            if (viewNeedsAuthentication)
+            {
+                Logger.Trace("Validating to open view");
+
+                Client.ValidateCurrentUser(() => {
+
+                    Logger.Trace("User validated opening view");
+
+                    OpenInternal(popupViewType, onClose);
+
+                }, exception => {
+
+                    Logger.Trace("User required validation opening AuthenticationView");
+
+                    Open(PopupViewType.AuthenticationView, completedAuthentication => {
 
+                        if (completedAuthentication)
+                        {
+                            Logger.Trace("User completed validation opening view: {0}", popupViewType.ToString());
+
+                            Open(popupViewType, onClose);
+                        }
+                    });
+                });
+            }
+            else
+            {
+                OpenInternal(popupViewType, onClose);
+            }
+        }
+
+        private void OpenInternal(PopupViewType popupViewType, Action<bool> onClose)
+        {
             if (onClose != null)
             {
-                popupWindow.OnClose += onClose;
+                OnClose += onClose;
             }
 
-            popupWindow.ActiveViewType = popupViewType;
-            popupWindow.titleContent = new GUIContent(popupWindow.ActiveView.Title, Styles.SmallLogo);
-            popupWindow.OnEnable();
-            popupWindow.Show();
-            popupWindow.Refresh();
+            ActiveViewType = popupViewType;
+            titleContent = new GUIContent(ActiveView.Title, Styles.SmallLogo);
+            OnEnable();
+            Show();
+            Refresh();
+        }
 
-            return popupWindow;
+        public IApiClient Client
+        {
+            get
+            {
+                if (client == null)
+                {
+                    var repository = Environment.Repository;
+                    UriString host;
+                    if (repository != null && !string.IsNullOrEmpty(repository.CloneUrl))
+                    {
+                        host = repository.CloneUrl.ToRepositoryUrl();
+                    }
+                    else
+                    {
+                        host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
+                    }
+
+                    client = ApiClient.Create(host, Platform.Keychain);
+                }
+
+                return client;
+            }
         }
 
         public override void Initialize(IApplicationManager applicationManager)
@@ -59,6 +127,8 @@ public override void Initialize(IApplicationManager applicationManager)
             publishView.InitializeView(this);
             authenticationView.InitializeView(this);
             loadingView.InitializeView(this);
+
+            titleContent = new GUIContent(ActiveView.Title, Styles.SmallLogo);
         }
 
         public override void OnEnable()

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

@@ -146,7 +146,7 @@ private void LoadOwners()
                 if (keychainEmptyException != null)
                 {
                     Logger.Trace("Keychain empty");
-                    PopupWindow.Open(PopupWindow.PopupViewType.AuthenticationView);
+                    PopupWindow.OpenWindow(PopupWindow.PopupViewType.AuthenticationView);
                     return;
                 }
 

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

@@ -351,7 +351,7 @@ private void DoAccountDropdown()
 
         private void SignIn(object obj)
         {
-            PopupWindow.Open(PopupWindow.PopupViewType.AuthenticationView);
+            PopupWindow.OpenWindow(PopupWindow.PopupViewType.AuthenticationView);
         }
 
         private void GoToProfile(object obj)