Security - Inject logout url (elastic#57201)

legrego · Feb 10, 2020 · b4e7049 · b4e7049
1 parent 8576fe8
commit b4e7049
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/x-pack/legacy/plugins/security/index.js b/x-pack/legacy/plugins/security/index.js
@@ -112,6 +112,7 @@ export const security = kibana =>
             tenant: server.newPlatform.setup.core.http.basePath.serverBasePath,
           },
           enableSpaceAwarePrivileges: server.config().get('xpack.spaces.enabled'),
+          logoutUrl: `${server.newPlatform.setup.core.http.basePath.serverBasePath}/logout`,
         };
       },
     },

diff --git a/x-pack/plugins/security/public/nav_control/nav_control_service.tsx b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
@@ -65,9 +65,7 @@ export class SecurityNavControlService {
       mount: (el: HTMLElement) => {
         const I18nContext = core.i18n.Context;
 
-        const serverBasePath = core.injectedMetadata.getInjectedVar('serverBasePath') as string;
-
-        const logoutUrl = `${serverBasePath}/logout`;
+        const logoutUrl = core.injectedMetadata.getInjectedVar('logoutUrl') as string;
 
         const props = {
           user: currentUserPromise,
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,6 +112,7 @@ export const security = kibana => @@
                 tenant: server.newPlatform.setup.core.http.basePath.serverBasePath,
               },
               enableSpaceAwarePrivileges: server.config().get('xpack.spaces.enabled'),
+              logoutUrl: `${server.newPlatform.setup.core.http.basePath.serverBasePath}/logout`,
             };
           },
         },
@@ Expand Down @@