Review#1: add more tests, host more views under /app/security and m…

…ore.

test/functional/config.js

@@ -92,10 +92,6 @@ export default async function({ readConfigFile }) {
         pathname: '/app/kibana',
         hash: '/dev_tools/console',
       },
-      account: {
-        pathname: '/app/kibana',
-        hash: '/account',
-      },
       home: {
         pathname: '/app/kibana',
         hash: '/home',

x-pack/legacy/plugins/security/public/hacks/legacy.ts

@@ -15,7 +15,7 @@ const securityPluginSetup = (npSetup.plugins as any).security as SecurityPluginS
 if (securityPluginSetup) {
   routes.when('/account', {
     template: '<div />',
-    controller: () => npStart.core.application.navigateToApp('security'),
+    controller: () => npStart.core.application.navigateToApp('security/account'),
   });
 
   const getNextParameter = () => {
@@ -37,7 +37,6 @@ if (securityPluginSetup) {
 
       function interceptorFactory(responseHandler: (response: ng.IHttpResponse<unknown>) => any) {
         return function interceptor(response: ng.IHttpResponse<unknown>) {
-          // TODO: SHOULD WE CHECK THAT IT'S NOT ERROR RESPONSE (&& response.status !== 401)?
           if (!isAnonymous && !isSystemApiRequest(response.config)) {
             securityPluginSetup.sessionTimeout.extend(response.config.url);
           }

x-pack/legacy/plugins/xpack_main/public/services/path.js

@@ -9,6 +9,11 @@ import chrome from 'ui/chrome';
 export const Path = {
   isUnauthenticated() {
     const path = chrome.removeBasePath(window.location.pathname);
-    return path === '/login' || path === '/logout' || path === '/logged_out' || path === '/status';
+    return (
+      path === '/login' ||
+      path === '/logout' ||
+      path === '/app/security/logged_out' ||
+      path === '/status'
+    );
   },
 };

x-pack/legacy/plugins/xpack_main/server/routes/api/v1/__tests__/xpack_info.js

@@ -58,7 +58,6 @@ describe('XPackInfo routes', () => {
           showLinks: false,
           allowRoleDocumentLevelSecurity: false,
           allowRoleFieldLevelSecurity: false,
-          linksMessage: 'Message',
         },
       },
     });

x-pack/plugins/security/common/licensing/license_features.ts

@@ -52,9 +52,4 @@ export interface SecurityLicenseFeatures {
    * Describes the layout of the login form if it's displayed.
    */
   readonly layout?: LoginLayout;
-
-  /**
-   * Message to show when security links are clicked throughout the kibana app.
-   */
-  readonly linksMessage?: string;
 }

x-pack/plugins/security/common/licensing/license_service.test.ts

@@ -79,7 +79,6 @@ describe('license features', function() {
             "allowRbac": false,
             "allowRoleDocumentLevelSecurity": false,
             "allowRoleFieldLevelSecurity": false,
-            "linksMessage": "Access is denied because Security is disabled in Elasticsearch.",
             "showLinks": false,
             "showLogin": false,
             "showRoleMappingsManagement": false,
@@ -130,7 +129,6 @@ describe('license features', function() {
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
       allowRbac: false,
-      linksMessage: 'Access is denied because Security is disabled in Elasticsearch.',
     });
   });
 

x-pack/plugins/security/common/licensing/license_service.ts

@@ -90,7 +90,6 @@ export class SecurityLicenseService {
         allowRoleDocumentLevelSecurity: false,
         allowRoleFieldLevelSecurity: false,
         allowRbac: false,
-        linksMessage: 'Access is denied because Security is disabled in Elasticsearch.',
       };
     }
 

x-pack/plugins/security/public/account_management/account_management_app.test.ts

@@ -27,8 +27,8 @@ describe('accountManagementApp', () => {
 
     const [[appRegistration]] = coreSetupMock.application.register.mock.calls;
     expect(appRegistration).toEqual({
-      id: 'security',
-      appRoute: '/security/account',
+      id: 'security/account',
+      appRoute: '/app/security/account',
       navLinkStatus: AppNavLinkStatus.hidden,
       title: 'Account Management',
       mount: expect.any(Function),

x-pack/plugins/security/public/account_management/account_management_app.ts

@@ -16,29 +16,24 @@ interface CreateDeps {
 }
 
 export const accountManagementApp = Object.freeze({
-  id: 'security',
+  id: 'security/account',
   create({ application, authc, getStartServices }: CreateDeps) {
+    const title = i18n.translate('xpack.security.account.breadcrumb', {
+      defaultMessage: 'Account Management',
+    });
     application.register({
       id: this.id,
-      title: i18n.translate('xpack.security.account.breadcrumb', {
-        defaultMessage: 'Account Management',
-      }),
+      title,
       // TODO: switch to proper enum once https://github.com/elastic/kibana/issues/58327 is resolved.
       navLinkStatus: 3,
-      appRoute: '/security/account',
+      appRoute: '/app/security/account',
       async mount({ element }: AppMountParameters) {
         const [[coreStart], { renderAccountManagementPage }] = await Promise.all([
           getStartServices(),
           import('./account_management_page'),
         ]);
 
-        coreStart.chrome.setBreadcrumbs([
-          {
-            text: i18n.translate('xpack.security.account.breadcrumb', {
-              defaultMessage: 'Account Management',
-            }),
-          },
-        ]);
+        coreStart.chrome.setBreadcrumbs([{ text: title }]);
 
         return renderAccountManagementPage(coreStart.i18n, element, {
           authc,

x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts

@@ -18,15 +18,17 @@ describe('loggedOutApp', () => {
     loggedOutApp.create(coreSetupMock);
 
     expect(coreSetupMock.http.anonymousPaths.register).toHaveBeenCalledTimes(1);
-    expect(coreSetupMock.http.anonymousPaths.register).toHaveBeenCalledWith('/logged_out');
+    expect(coreSetupMock.http.anonymousPaths.register).toHaveBeenCalledWith(
+      '/app/security/logged_out'
+    );
 
     expect(coreSetupMock.application.register).toHaveBeenCalledTimes(1);
 
     const [[appRegistration]] = coreSetupMock.application.register.mock.calls;
     expect(appRegistration).toEqual({
-      id: 'logged_out',
+      id: 'security/logged_out',
       chromeless: true,
-      appRoute: '/logged_out',
+      appRoute: '/app/security/logged_out',
       title: 'Logged out',
       mount: expect.any(Function),
     });

x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts

@@ -14,14 +14,14 @@ interface CreateDeps {
 }
 
 export const loggedOutApp = Object.freeze({
-  id: 'logged_out',
+  id: 'security/logged_out',
   create({ application, http, getStartServices }: CreateDeps) {
-    http.anonymousPaths.register('/logged_out');
+    http.anonymousPaths.register('/app/security/logged_out');
     application.register({
       id: this.id,
       title: i18n.translate('xpack.security.loggedOutAppTitle', { defaultMessage: 'Logged out' }),
       chromeless: true,
-      appRoute: '/logged_out',
+      appRoute: '/app/security/logged_out',
       async mount({ element }: AppMountParameters) {
         const [[coreStart], { renderLoggedOutPage }] = await Promise.all([
           getStartServices(),

x-pack/plugins/security/public/authentication/login/login_app.test.ts

@@ -27,7 +27,7 @@ describe('loginApp', () => {
 
     const [[appRegistration]] = coreSetupMock.application.register.mock.calls;
     expect(appRegistration).toEqual({
-      id: 'login',
+      id: 'security/login',
       chromeless: true,
       appRoute: '/login',
       title: 'Login',

x-pack/plugins/security/public/authentication/login/login_app.ts

@@ -16,7 +16,7 @@ interface CreateDeps {
 }
 
 export const loginApp = Object.freeze({
-  id: 'login',
+  id: 'security/login',
   create({ application, http, getStartServices, config }: CreateDeps) {
     http.anonymousPaths.register('/login');
     application.register({

x-pack/plugins/security/public/authentication/logout/logout_app.test.ts

@@ -38,7 +38,7 @@ describe('logoutApp', () => {
 
     const [[appRegistration]] = coreSetupMock.application.register.mock.calls;
     expect(appRegistration).toEqual({
-      id: 'logout',
+      id: 'security/logout',
       chromeless: true,
       appRoute: '/logout',
       title: 'Logout',

x-pack/plugins/security/public/authentication/logout/logout_app.ts

@@ -13,7 +13,7 @@ interface CreateDeps {
 }
 
 export const logoutApp = Object.freeze({
-  id: 'logout',
+  id: 'security/logout',
   create({ application, http }: CreateDeps) {
     http.anonymousPaths.register('/logout');
     application.register({

x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts

@@ -26,10 +26,10 @@ describe('overwrittenSessionApp', () => {
 
     const [[appRegistration]] = coreSetupMock.application.register.mock.calls;
     expect(appRegistration).toEqual({
-      id: 'overwritten_session',
+      id: 'security/overwritten_session',
       title: 'Overwritten Session',
       chromeless: true,
-      appRoute: '/overwritten_session',
+      appRoute: '/app/security/overwritten_session',
       mount: expect.any(Function),
     });
   });

x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts

@@ -15,15 +15,15 @@ interface CreateDeps {
 }
 
 export const overwrittenSessionApp = Object.freeze({
-  id: 'overwritten_session',
+  id: 'security/overwritten_session',
   create({ application, authc, getStartServices }: CreateDeps) {
     application.register({
       id: this.id,
       title: i18n.translate('xpack.security.overwrittenSessionAppTitle', {
         defaultMessage: 'Overwritten Session',
       }),
       chromeless: true,
-      appRoute: '/overwritten_session',
+      appRoute: '/app/security/overwritten_session',
       async mount({ element }: AppMountParameters) {
         const [[coreStart], { renderOverwrittenSessionPage }] = await Promise.all([
           getStartServices(),