Decouple tables workspace user assignment from Openops organization user assignment (#1750)

Fixes OPS-3220.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **Bug Fixes**
* Fixed the user sign-up flow to ensure new users are properly assigned
to both the default organization and default workspace during
onboarding.

<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Author: cezudas

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

@@ -3,7 +3,10 @@ import { AuthenticationResponse } from '@openops/shared';
 import { userService } from '../../user/user-service';
 import { getProjectAndToken } from '../context/create-project-auth-context';
 import { createUser } from '../new-user/create-user';
-import { assignDefaultOrganization } from '../new-user/organization-assignment';
+import {
+  addUserToDefaultWorkspace,
+  assignDefaultOrganization,
+} from '../new-user/organization-assignment';
 import { SignInParams, SignUpParams } from '../types';
 import {
   assertPasswordMatches,
@@ -15,7 +18,8 @@ export const authenticationService = {
   async signUp(params: SignUpParams): Promise<AuthenticationResponse> {
     const { user, tablesRefreshToken } = await createUser(params);
 
-    await assignDefaultOrganization(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,13 +34,11 @@ export async function assignDefaultOrganization(user: User): Promise<void> {
     });
   }
 
-  await userService.addUserToOrganization({
-    id: user.id,
-    organizationId: organization.id,
-  });
+  return userService.addUserToOrganization(user, organization.id);
+}
 
-  const updatedUser = await userService.getOneOrThrow({ id: user.id });
-  const project = await projectService.getOneForUser(updatedUser);
+export async function addUserToDefaultWorkspace(user: User): Promise<void> {
+  const project = await projectService.getOneForUser(user);
 
   if (isNil(project)) {
     throw new ApplicationError({
@@ -43,19 +49,10 @@ export async function assignDefaultOrganization(user: User): Promise<void> {
     });
   }
 
-  await addUserToDefaultWorkspace({
-    email: user.email,
-    workspaceId: project.tablesWorkspaceId,
-  });
-}
-
-async function addUserToDefaultWorkspace(values: {
-  email: string;
-  workspaceId: number;
-}): Promise<void> {
   const { token: defaultToken } = await authenticateAdminUserInOpenOpsTables();
 
   await openopsTables.addUserToWorkspace(defaultToken, {
-    ...values,
+    email: user.email,
+    workspaceId: project.tablesWorkspaceId,
   });
 }

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,14 @@ export const userService = {
     });
   },
 
-  async addUserToOrganization({
-    id,
-    organizationId,
-  }: UpdateOrganizationIdParams): Promise<void> {
-    await userRepo().update(id, {
-      updated: dayjs().toISOString(),
+  async addUserToOrganization(
+    user: User,
+    organizationId: OrganizationId,
+  ): Promise<UserWithOrganization> {
+    return userRepo().save({
+      ...user,
       organizationRole: OrganizationRole.MEMBER,
+      updated: dayjs().toISOString(),
       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(),