Move can_redirect_request back into security plugin. Not needed by sp…

…aces
elastic · Apr 27, 2018 · b0443c6 · b0443c6
1 parent 1f1be38
commit b0443c6
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 58 deletions.
diff --git a/...ver/lib/__tests__/can_redirect_request.js → ...ver/lib/__tests__/can_redirect_request.js b/...ver/lib/__tests__/can_redirect_request.js → ...ver/lib/__tests__/can_redirect_request.js
diff --git a/x-pack/plugins/security/server/lib/authentication/providers/basic.js b/x-pack/plugins/security/server/lib/authentication/providers/basic.js
@@ -5,7 +5,7 @@
  */
 
 import Boom from 'boom';
-import { canRedirectRequest } from '../../../../../../server/lib/can_redirect_request';
+import { canRedirectRequest } from '../../can_redirect_request';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
 

diff --git a/x-pack/plugins/security/server/lib/authentication/providers/saml.js b/x-pack/plugins/security/server/lib/authentication/providers/saml.js
@@ -5,7 +5,7 @@
  */
 
 import Boom from 'boom';
-import { canRedirectRequest } from '../../../../../../server/lib/can_redirect_request';
+import { canRedirectRequest } from '../../can_redirect_request';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
 

diff --git a/x-pack/server/lib/can_redirect_request.js → ...curity/server/lib/can_redirect_request.js b/x-pack/server/lib/can_redirect_request.js → ...curity/server/lib/can_redirect_request.js
diff --git a/x-pack/plugins/security/server/routes/api/v1/authenticate.js b/x-pack/plugins/security/server/routes/api/v1/authenticate.js
@@ -8,7 +8,7 @@ import Boom from 'boom';
 import Joi from 'joi';
 import { wrapError } from '../../../lib/errors';
 import { BasicCredentials } from '../../../../server/lib/authentication/providers/basic';
-import { canRedirectRequest } from '../../../../../../server/lib/can_redirect_request';
+import { canRedirectRequest } from '../../../lib/can_redirect_request';
 
 export function initAuthenticateApi(server) {
   server.route({

diff --git a/x-pack/plugins/spaces/index.js b/x-pack/plugins/spaces/index.js
@@ -9,7 +9,6 @@ import { validateConfig } from './server/lib/validate_config';
 import { checkLicense } from './server/lib/check_license';
 import { initSpacesApi } from './server/routes/api/v1/spaces';
 import { mirrorPluginStatus } from '../../server/lib/mirror_plugin_status';
-import { canRedirectRequest } from '../../server/lib/can_redirect_request';
 import mappings from './mappings.json';
 
 export const spaces = (kibana) => new kibana.Plugin({
@@ -59,37 +58,5 @@ export const spaces = (kibana) => new kibana.Plugin({
     }
 
     initSpacesApi(server);
-
-    server.ext('onRequest', async (request, reply) => {
-      const appId = `space_selector`;
-
-      const canRedirect = canRedirectRequest(request);
-
-      const requiresSpaceIdentifier = request.path.startsWith(`/app/`) && !request.path.startsWith(`/app/${appId}`);
-
-      // TODO(legrego) - rendering space selector app is prompting browser for credentials (basic auth dialog) after logging in...
-
-      if (requiresSpaceIdentifier && canRedirect && false) {
-        const { total } = await request.getSavedObjectsClient().find({
-          type: 'space'
-        });
-
-        if (total === 0) {
-          // No spaces available, fallback to default behavior
-          return reply.continue();
-        }
-
-        if (total === 1) {
-          // Only one space available, we can handle this automatically.
-          // TODO(legrego): handle this.
-          return reply.continue();
-        }
-
-        const selectorApp = server.getHiddenUiAppById(appId);
-        return reply.renderApp(selectorApp);
-      }
-
-      return reply.continue();
-    });
   }
 });
diff --git a/x-pack/server/lib/__tests__/__fixtures__/request.js b/x-pack/server/lib/__tests__/__fixtures__/request.js