Split authentication service into overridable factory hooks

Author: cezudas

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

@@ -1,12 +1,24 @@
-import { AuthenticationResponse } from '@openops/shared';
-import { authenticationService } from './basic/authentication-service';
-import { SignInParams, SignUpParams } from './types';
+import { User, UserWithOrganization } from '@openops/shared';
+import { getProjectAndToken } from './context/create-project-auth-context';
+import { addUserToDefaultWorkspace } from './new-user/organization-assignment';
+import { ProjectContext } from './types';
 
-export type AuthenticationService = {
-  signUp(params: SignUpParams): Promise<AuthenticationResponse>;
-  signIn(request: SignInParams): Promise<AuthenticationResponse>;
+export type ProjectAndTokenService = {
+  fetch(user: User, tablesRefreshToken: string): Promise<ProjectContext>;
 };
 
-export function getAuthenticationService(): AuthenticationService {
-  return authenticationService;
+export type UserCreatedHook = { execute: () => Promise<void> | void };
+
+export function getProjectAndTokenService(): ProjectAndTokenService {
+  return { fetch: getProjectAndToken };
+}
+
+export function getUserCreatedHook(
+  userWithOrganization: UserWithOrganization,
+): UserCreatedHook {
+  return {
+    execute: async (): Promise<void> => {
+      await addUserToDefaultWorkspace(userWithOrganization);
+    },
+  };
 }

packages/server/api/src/app/authentication/authentication.controller.ts

@@ -16,7 +16,7 @@ import { analyticsDashboardService } from '../openops-analytics/analytics-dashbo
 import { resolveOrganizationIdForAuthnRequest } from '../organization/organization-utils';
 import { userService } from '../user/user-service';
 import { analyticsAuthenticationService } from './analytics-authentication-service';
-import { getAuthenticationService } from './authentication-service-factory';
+import { authenticationService } from './basic/authentication-service';
 import {
   removeAuthCookies,
   setAuthCookies,
@@ -100,7 +100,7 @@ const signUpRoute = async (request: any, reply: any) => {
     });
   }
 
-  const signUpResponse = await getAuthenticationService().signUp({
+  const signUpResponse = await authenticationService.signUp({
     ...request.body,
     verified: edition === OpsEdition.COMMUNITY,
     organizationId: null,
@@ -117,7 +117,7 @@ const signInRoute = async (request: any, reply: any) => {
     request,
   );
 
-  const signInResponse = await getAuthenticationService().signIn({
+  const signInResponse = await authenticationService.signIn({
     email: request.body.email,
     password: request.body.password,
     organizationId,

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

@@ -1,12 +1,10 @@
 import { authenticateUserInOpenOpsTables } from '@openops/common';
 import { AuthenticationResponse } from '@openops/shared';
 import { userService } from '../../user/user-service';
+import { getUserCreatedHook } from '../authentication-service-factory';
 import { getProjectAndToken } from '../context/create-project-auth-context';
 import { createUser } from '../new-user/create-user';
-import {
-  addUserToDefaultWorkspace,
-  assignDefaultOrganization,
-} from '../new-user/organization-assignment';
+import { assignDefaultOrganization } from '../new-user/organization-assignment';
 import { SignInParams, SignUpParams } from '../types';
 import {
   assertPasswordMatches,
@@ -18,8 +16,8 @@ export const authenticationService = {
   async signUp(params: SignUpParams): Promise<AuthenticationResponse> {
     const { user, tablesRefreshToken } = await createUser(params);
 
-    const updatedUser = await assignDefaultOrganization(user);
-    await addUserToDefaultWorkspace(updatedUser);
+    const userWithOrganization = await assignDefaultOrganization(user);
+    await getUserCreatedHook(userWithOrganization).execute();
 
     const projectContext = await getProjectAndToken(user, tablesRefreshToken);
     return buildAuthResponse(projectContext);

packages/server/api/src/app/database/seeds/dev-seeds.ts

@@ -1,6 +1,6 @@
 import { logger, SharedSystemProp, system } from '@openops/server-shared';
 import { EnvironmentType, Provider } from '@openops/shared';
-import { getAuthenticationService } from '../../authentication/authentication-service-factory';
+import { authenticationService } from '../../authentication/basic/authentication-service';
 import { FlagEntity } from '../../flags/flag.entity';
 import { databaseConnection } from '../database-connection';
 
@@ -30,7 +30,7 @@ const seedDevUser = async (): Promise<void> => {
   const DEV_EMAIL = 'dev@openops.com';
   const DEV_PASSWORD = '12345678';
 
-  await getAuthenticationService().signUp({
+  await authenticationService.signUp({
     email: DEV_EMAIL,
     password: DEV_PASSWORD,
     firstName: 'Dev',