From 510b54f16e197406d20a0e26c9a17d8b8fb72435 Mon Sep 17 00:00:00 2001 From: Convly Date: Fri, 13 May 2022 11:33:25 +0200 Subject: [PATCH] Moved logic to the right controller --- packages/core/admin/server/controllers/authentication.js | 8 +------- packages/core/admin/server/controllers/user.js | 4 ++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/core/admin/server/controllers/authentication.js b/packages/core/admin/server/controllers/authentication.js index 48aeba3130..b230661e22 100644 --- a/packages/core/admin/server/controllers/authentication.js +++ b/packages/core/admin/server/controllers/authentication.js @@ -124,16 +124,10 @@ module.exports = { strapi.telemetry.send('didCreateFirstAdmin'); - const sanitizedUser = getService('user').sanitizeUser(user); - - // Note: We need to assign manually the registrationToken to the - // final user payload so that it's not removed in the sanitation process. - Object.assign(sanitizedUser, { registrationToken: user.registrationToken }); - ctx.body = { data: { token: getService('token').createJwtToken(user), - user: sanitizedUser, + user: getService('user').sanitizeUser(user), }, }; }, diff --git a/packages/core/admin/server/controllers/user.js b/packages/core/admin/server/controllers/user.js index d81cf5b881..9229ad4db3 100644 --- a/packages/core/admin/server/controllers/user.js +++ b/packages/core/admin/server/controllers/user.js @@ -36,6 +36,10 @@ module.exports = { const userInfo = getService('user').sanitizeUser(createdUser); + // Note: We need to assign manually the registrationToken to the + // final user payload so that it's not removed in the sanitation process. + Object.assign(userInfo, { registrationToken: createdUser.registrationToken }); + // Send 201 created ctx.created({ data: userInfo }); },