Decouple tables workspace user assignment from Openops organization user assignment

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,
@@ -17,6 +20,8 @@ export const authenticationService = {
 
     await assignDefaultOrganization(user);
 
+    await addUserToDefaultWorkspace(user);
+
     const projectContext = await getProjectAndToken(user, tablesRefreshToken);
     return buildAuthResponse(projectContext);
   },

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

@@ -30,9 +30,10 @@ export async function assignDefaultOrganization(user: User): Promise<void> {
     id: user.id,
     organizationId: 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 +44,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/shared/src/lib/user/user.ts

@@ -42,6 +42,10 @@ export const User = Type.Object({
 
 export type User = Static<typeof User>;
 
+export type UserWithOrganization = User & {
+  organizationId: OpenOpsId;
+};
+
 export const UserMeta = Type.Object({
   id: Type.String(),
   email: Type.String(),