From 74f1a3917e3b581a92db25d0f8fb2986eaf10277 Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Tue, 12 May 2020 12:51:49 +0100
Subject: [PATCH] ui: Misc SSO w/Namespace amends (#7851)

* ui: If an auth-method is in another namespace than default, make that clear

* Pass through the namespace of the auth method rather than use the current

* Make sure we refresh the application route, before redirecting

This ensure that the nspaces and are refreshed in the main nav menu
---
 ui-v2/app/components/auth-form/index.hbs   |  2 +-
 ui-v2/app/components/oidc-select/index.hbs |  6 ++++--
 ui-v2/app/controllers/application.js       | 23 +++++++++++++++-------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ui-v2/app/components/auth-form/index.hbs b/ui-v2/app/components/auth-form/index.hbs
index 2b25ccdd6e..4da0b5b12e 100644
--- a/ui-v2/app/components/auth-form/index.hbs
+++ b/ui-v2/app/components/auth-form/index.hbs
@@ -90,7 +90,7 @@
   <State @matches="loading">
     <TokenSource
       @dc={{dc}}
-      @nspace={{nspace}}
+      @nspace={{or value.Namespace nspace}}
       @type={{if value.Name 'oidc' 'secret'}}
       @value={{if value.Name value.Name value}}
       @onchange={{action onsubmit}}
diff --git a/ui-v2/app/components/oidc-select/index.hbs b/ui-v2/app/components/oidc-select/index.hbs
index 99b173be5f..5c6b2b08bc 100644
--- a/ui-v2/app/components/oidc-select/index.hbs
+++ b/ui-v2/app/components/oidc-select/index.hbs
@@ -11,7 +11,7 @@
                   type="button" class={{concat item.Kind '-oidc-provider'}}
                   onclick={{action onchange item}}
                 >
-                  Continue with {{or item.DisplayName item.Name}}
+                  Continue with {{or item.DisplayName item.Name}}{{#if (not-eq item.Namespace 'default')}} ({{item.Namespace}}){{/if}}
                 </button>
               </li>
             {{/each}}
@@ -26,7 +26,9 @@
                 @selected={{item}}
                 @searchEnabled={{false}}
                 @options={{items}} as |item|>
-                <span class={{concat item.Kind '-oidc-provider'}}>{{or item.DisplayName item.Name}}</span>
+                <span class={{concat item.Kind '-oidc-provider'}}>
+                  {{or item.DisplayName item.Name}}{{#if (not-eq item.Namespace 'default')}} ({{item.Namespace}}){{/if}}
+                </span>
               </PowerSelect>
             </label>
             <button
diff --git a/ui-v2/app/controllers/application.js b/ui-v2/app/controllers/application.js
index 0ad991e3f5..47349bcca5 100644
--- a/ui-v2/app/controllers/application.js
+++ b/ui-v2/app/controllers/application.js
@@ -44,13 +44,22 @@ export default Controller.extend({
           }
           const routeName = this.router.currentRoute.name;
           const route = getOwner(this).lookup(`route:${routeName}`);
-          // We use transitionable here as refresh doesn't work if you are on an error page
-          // which is highly likely to happen here (403s)
-          if (routeName !== this.router.currentRouteName) {
-            return route.transitionTo(...transitionable(this.router, params, getOwner(this)));
-          } else {
-            return route.refresh();
-          }
+          const router = this.router;
+          // Refresh the application route
+          return getOwner(this)
+            .lookup('route:application')
+            .refresh()
+            .promise.then(() => {
+              // We use transitionable here as refresh doesn't work if you are on an error page
+              // which is highly likely to happen here (403s)
+              if (routeName !== router.currentRouteName || typeof params.nspace !== 'undefined') {
+                return route.transitionTo(
+                  ...transitionable(router.currentRoute, params, getOwner(this))
+                );
+              } else {
+                return route.refresh();
+              }
+            });
         },
         e.type,
         function(type, e) {