From 1449663b27ef5bc4e180c088015d97d2c70a9030 Mon Sep 17 00:00:00 2001 From: Bassel Date: Tue, 6 Jun 2023 18:40:23 +0300 Subject: [PATCH] move to user controller --- .../admin/ee/server/controllers/authentication.js | 13 ------------- packages/core/admin/ee/server/controllers/user.js | 12 ++++++++++++ packages/core/admin/ee/server/routes/sso.js | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/core/admin/ee/server/controllers/authentication.js b/packages/core/admin/ee/server/controllers/authentication.js index a1a41c51b8..511ff4cacf 100644 --- a/packages/core/admin/ee/server/controllers/authentication.js +++ b/packages/core/admin/ee/server/controllers/authentication.js @@ -7,8 +7,6 @@ const { ValidationError } = require('@strapi/utils').errors; const { validateProviderOptionsUpdate } = require('../validation/authentication'); const { middlewares, utils } = require('./authentication/index'); -const { isSsoLocked } = require('../utils/sso-lock'); - const toProviderDTO = pick(['uid', 'displayName', 'icon']); const toProviderLoginOptionsDTO = pick(['autoRegister', 'defaultRole', 'ssoLockedRoles']); @@ -63,15 +61,4 @@ module.exports = { return providerAuthenticationFlow(ctx, next); }, - - async isSSOLocked(ctx) { - const { user } = ctx.state; - const isSSOLocked = await isSsoLocked(user); - - ctx.body = { - data: { - isSSOLocked, - }, - }; - }, }; diff --git a/packages/core/admin/ee/server/controllers/user.js b/packages/core/admin/ee/server/controllers/user.js index 4bd2014951..8b4ad88e0d 100644 --- a/packages/core/admin/ee/server/controllers/user.js +++ b/packages/core/admin/ee/server/controllers/user.js @@ -8,6 +8,7 @@ const { ApplicationError, ForbiddenError } = require('@strapi/utils').errors; const { validateUserCreationInput } = require('../validation/user'); const { validateUserUpdateInput } = require('../../../server/validation/user'); const { getService } = require('../../../server/utils'); +const { isSsoLocked } = require('../utils/sso-lock'); const pickUserCreationAttributes = pick(['firstname', 'lastname', 'email', 'roles']); @@ -95,4 +96,15 @@ module.exports = { data: getService('user').sanitizeUser(updatedUser), }; }, + + async isSSOLocked(ctx) { + const { user } = ctx.state; + const isSSOLocked = await isSsoLocked(user); + + ctx.body = { + data: { + isSSOLocked, + }, + }; + }, }; diff --git a/packages/core/admin/ee/server/routes/sso.js b/packages/core/admin/ee/server/routes/sso.js index 1185463647..8355c3508b 100644 --- a/packages/core/admin/ee/server/routes/sso.js +++ b/packages/core/admin/ee/server/routes/sso.js @@ -59,7 +59,7 @@ module.exports = { { method: 'GET', path: '/providers/isSSOLocked', - handler: 'authentication.isSSOLocked', + handler: 'user.isSSOLocked', config: { middlewares: [enableFeatureMiddleware('sso')], policies: ['admin::isAuthenticatedAdmin'],