Update addUserToDefaultWorkspace to refresh the user from the database before calling projectService.getOneForUser

Author: cezudas

packages/server/api/src/app/authentication/basic/authentication-service.ts

@@ -18,9 +18,8 @@ export const authenticationService = {
   async signUp(params: SignUpParams): Promise<AuthenticationResponse> {
     const { user, tablesRefreshToken } = await createUser(params);
 
-    await assignDefaultOrganization(user);
-
-    await addUserToDefaultWorkspace(user);
+    const updatedUser = await assignDefaultOrganization(user);
+    await addUserToDefaultWorkspace(updatedUser);
 
     const projectContext = await getProjectAndToken(user, tablesRefreshToken);
     return buildAuthResponse(projectContext);

packages/server/api/src/app/authentication/new-user/organization-assignment.ts

@@ -1,12 +1,20 @@
 import { AppSystemProp, system } from '@openops/server-shared';
-import { ApplicationError, ErrorCode, isNil, User } from '@openops/shared';
+import {
+  ApplicationError,
+  ErrorCode,
+  isNil,
+  User,
+  UserWithOrganization,
+} from '@openops/shared';
 import { openopsTables } from '../../openops-tables';
 import { authenticateAdminUserInOpenOpsTables } from '../../openops-tables/auth-admin-tables';
 import { organizationService } from '../../organization/organization.service';
 import { projectService } from '../../project/project-service';
 import { userService } from '../../user/user-service';
 
-export async function assignDefaultOrganization(user: User): Promise<void> {
+export async function assignDefaultOrganization(
+  user: User,
+): Promise<UserWithOrganization> {
   let organization = await organizationService.getOldestOrganization();
 
   const adminUser = await userService.getUserByEmailOrFail({
@@ -26,10 +34,7 @@ export async function assignDefaultOrganization(user: User): Promise<void> {
     });
   }
 
-  await userService.addUserToOrganization({
-    id: user.id,
-    organizationId: organization.id,
-  });
+  return userService.addUserToOrganization(user, organization.id);
 }
 
 export async function addUserToDefaultWorkspace(user: User): Promise<void> {

packages/server/api/src/app/user/user-service.ts

@@ -15,6 +15,7 @@ import {
   UserId,
   UserMeta,
   UserStatus,
+  UserWithOrganization,
 } from '@openops/shared';
 import dayjs from 'dayjs';
 import { passwordHasher } from '../authentication/basic/password-hasher';
@@ -283,13 +284,13 @@ export const userService = {
     });
   },
 
-  async addUserToOrganization({
-    id,
-    organizationId,
-  }: UpdateOrganizationIdParams): Promise<void> {
-    await userRepo().update(id, {
+  async addUserToOrganization(
+    user: User,
+    organizationId: OrganizationId,
+  ): Promise<UserWithOrganization> {
+    return userRepo().save({
+      ...user,
       updated: dayjs().toISOString(),
-      organizationRole: OrganizationRole.MEMBER,
       organizationId,
     });
   },

packages/shared/src/lib/user/user.ts

@@ -1,6 +1,7 @@
 import { Static, Type } from '@sinclair/typebox';
 import { BaseModelSchema } from '../common/base-model';
 import { OpenOpsId } from '../common/id-generator';
+import { OrganizationId } from '../organization';
 
 export type UserId = OpenOpsId;
 
@@ -42,6 +43,10 @@ export const User = Type.Object({
 
 export type User = Static<typeof User>;
 
+export type UserWithOrganization = User & {
+  organizationId: OrganizationId;
+};
+
 export const UserMeta = Type.Object({
   id: Type.String(),
   email: Type.String(),