fix: post signup hook for ee was using user without platform id

activepieces · Dec 5, 2023 · 927b8a1 · 927b8a1
1 parent 4b118c2
commit 927b8a1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.../app/ee/authentication/authentication-service/hooks/cloud-authentication-service-hooks.ts b/.../app/ee/authentication/authentication-service/hooks/cloud-authentication-service-hooks.ts
@@ -6,6 +6,7 @@ import { otpService } from '../../../otp/otp-service'
 import { referralService } from '../../../referrals/referral.service'
 import { authenticationHelper } from './authentication-helper'
 import { projectService } from '../../../../project/project-service'
+import { userService } from '../../../../user/user-service'
 import { ProjectType, UserStatus, isNil } from '@activepieces/shared'
 
 export const cloudAuthenticationServiceHooks: AuthenticationServiceHooks = {
@@ -27,7 +28,8 @@ export const cloudAuthenticationServiceHooks: AuthenticationServiceHooks = {
             })
         }
 
-        const updatedUser = await authenticationHelper.autoVerifyUserIfEligible(user)
+        await authenticationHelper.autoVerifyUserIfEligible(user)
+        const updatedUser = await userService.getOneOrFail({ id: user.id })
         const { project, token } = await authenticationHelper.getProjectAndTokenOrThrow(user)
 
         if (updatedUser.status !== UserStatus.VERIFIED) {
@@ -38,7 +40,7 @@ export const cloudAuthenticationServiceHooks: AuthenticationServiceHooks = {
             })
         }
         return {
-            user: updatedUser,
+            user: await userService.getOneOrFail({ id: user.id }),
             project,
             token,
         }

diff --git a/...ee/authentication/authentication-service/hooks/enterprise-authentication-service-hooks.ts b/...ee/authentication/authentication-service/hooks/enterprise-authentication-service-hooks.ts
@@ -22,7 +22,7 @@ export const enterpriseAuthenticationServiceHooks: AuthenticationServiceHooks =
             }
         }
 
-        const project =  await  projectService.create({
+        const project = await projectService.create({
             displayName: `${user.firstName}'s Project`,
             ownerId: user.id,
             platformId: undefined,
@@ -42,8 +42,8 @@ export const enterpriseAuthenticationServiceHooks: AuthenticationServiceHooks =
             value: true,
         })
 
-        const updatedUser = await authenticationHelper.autoVerifyUserIfEligible(user)
-
+        await authenticationHelper.autoVerifyUserIfEligible(user)
+        const updatedUser = await userService.getOneOrFail({ id: user.id })
         const { project: updatedProject, token } = await authenticationHelper.getProjectAndTokenOrThrow(user)
         return {
             user: updatedUser,

diff --git a/packages/backend/src/app/user/user-service.ts b/packages/backend/src/app/user/user-service.ts
@@ -33,6 +33,9 @@ export const userService = {
     async get({ id }: IdParams): Promise<User | null> {
         return userRepo.findOneBy({ id })
     },
+    async getOneOrFail({ id }: IdParams): Promise<User> {
+        return userRepo.findOneByOrFail({ id })
+    },
 
     async getMetaInfo({ id }: IdParams): Promise<UserMeta | null> {
         const user = await this.get({ id })