From 789ff30dc7570da36ae9693afcdd203591c45b03 Mon Sep 17 00:00:00 2001 From: Antoine Moreaux Date: Wed, 15 Jan 2025 19:27:05 +0100 Subject: [PATCH] fix(sso|auth): fix sso signinup (#9651) Renamed `user` to `payload` for better context clarity and updated related references. Adjusted the login token generation to use `workspace.id`, improving readability and maintainability of the code. --- .../auth/controllers/sso-auth.controller.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts index c7accf7cb..6afa35744 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts @@ -137,7 +137,7 @@ export class SSOAuthController { } private async generateLoginToken( - user: { email: string } & Record, + payload: { email: string } & Record, identityProvider: WorkspaceSSOIdentityProvider, ) { if (!identityProvider) { @@ -149,16 +149,16 @@ export class SSOAuthController { const existingUser = await this.userRepository.findOne({ where: { - email: user.email, + email: payload.email, }, }); const { userData } = this.authService.formatUserDataPayload( - user, + payload, existingUser, ); - await this.authService.signInUp({ + const { workspace, user } = await this.authService.signInUp({ userData, workspace: identityProvider.workspace, authParams: { @@ -170,7 +170,7 @@ export class SSOAuthController { identityProvider, loginToken: await this.loginTokenService.generateLoginToken( user.email, - identityProvider.workspace.id, + workspace.id, ), }; }