Review#1: introduce showInSelector config value, properly handle de…

…fault value of `selector.enabled`, improve redirect URL handling.

x-pack/plugins/security/common/login_state.ts

@@ -8,7 +8,11 @@ import { LoginLayout } from './licensing';
 
 interface LoginSelector {
   enabled: boolean;
-  providers: Array<{ type: string; name: string; options: { description: string; order: number } }>;
+  providers: Array<{
+    type: string;
+    name: string;
+    options: { description?: string; order: number };
+  }>;
 }
 
 export interface LoginState {

x-pack/plugins/security/common/model/authenticated_user.mock.ts

@@ -15,7 +15,7 @@ export function mockAuthenticatedUser(user: Partial<AuthenticatedUser> = {}) {
     enabled: true,
     authentication_realm: { name: 'native1', type: 'native' },
     lookup_realm: { name: 'native1', type: 'native' },
-    authentication_provider: 'basic',
+    authentication_provider: 'basic1',
     ...user,
   };
 }

x-pack/plugins/security/common/parse_next.test.ts

@@ -34,6 +34,15 @@ describe('parseNext', () => {
       expect(parseNext(href, basePath)).toEqual(`${next}#${hash}`);
     });
 
+    it('should properly handle multiple next with hash', () => {
+      const basePath = '/iqf';
+      const next1 = `${basePath}/app/kibana`;
+      const next2 = `${basePath}/app/ml`;
+      const hash = '/discover/New-Saved-Search';
+      const href = `${basePath}/login?next=${next1}&next=${next2}#${hash}`;
+      expect(parseNext(href, basePath)).toEqual(`${next1}#${hash}`);
+    });
+
     it('should properly decode special characters', () => {
       const basePath = '/iqf';
       const next = `${encodeURIComponent(basePath)}%2Fapp%2Fkibana`;
@@ -118,6 +127,14 @@ describe('parseNext', () => {
       expect(parseNext(href)).toEqual(`${next}#${hash}`);
     });
 
+    it('should properly handle multiple next with hash', () => {
+      const next1 = '/app/kibana';
+      const next2 = '/app/ml';
+      const hash = '/discover/New-Saved-Search';
+      const href = `/login?next=${next1}&next=${next2}#${hash}`;
+      expect(parseNext(href)).toEqual(`${next1}#${hash}`);
+    });
+
     it('should properly decode special characters', () => {
       const next = '%2Fapp%2Fkibana';
       const hash = '/discover/New-Saved-Search';

x-pack/plugins/security/common/parse_next.ts

@@ -40,5 +40,5 @@ export function parseNext(href: string, basePath = '') {
     return `${basePath}/`;
   }
 
-  return query.next + (hash || '');
+  return next + (hash || '');
 }

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

@@ -38,7 +38,6 @@ describe('loginApp', () => {
   it('properly renders application', async () => {
     const coreSetupMock = coreMock.createSetup();
     const coreStartMock = coreMock.createStart();
-    coreStartMock.injectedMetadata.getInjectedVar.mockReturnValue(true);
     coreSetupMock.getStartServices.mockResolvedValue([coreStartMock, {}]);
     const containerMock = document.createElement('div');
 
@@ -55,16 +54,13 @@ describe('loginApp', () => {
       history: (scopedHistoryMock.create() as unknown) as ScopedHistory,
     });
 
-    expect(coreStartMock.injectedMetadata.getInjectedVar).toHaveBeenCalledTimes(1);
-    expect(coreStartMock.injectedMetadata.getInjectedVar).toHaveBeenCalledWith('secureCookies');
-
     const mockRenderApp = jest.requireMock('./login_page').renderLoginPage;
     expect(mockRenderApp).toHaveBeenCalledTimes(1);
     expect(mockRenderApp).toHaveBeenCalledWith(coreStartMock.i18n, containerMock, {
       http: coreStartMock.http,
+      notifications: coreStartMock.notifications,
       fatalErrors: coreStartMock.fatalErrors,
       loginAssistanceMessage: 'some-message',
-      requiresSecureConnection: true,
     });
   });
 });

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

@@ -31,6 +31,7 @@ export const loginApp = Object.freeze({
         ]);
         return renderLoginPage(coreStart.i18n, element, {
           http: coreStart.http,
+          notifications: coreStart.notifications,
           fatalErrors: coreStart.fatalErrors,
           loginAssistanceMessage: config.loginAssistanceMessage,
         });