{
relations: ['workspaces'],
});
- userValidator.assertIsExist(
+ userValidator.assertIsDefinedOrThrow(
user,
new AuthException(
'User does not have access to this workspace',
AuthExceptionCode.FORBIDDEN_EXCEPTION,
),
);
+ }
+
+ async saveDefaultWorkspaceIfUserHasAccessOrThrow(
+ userId: string,
+ workspaceId: string,
+ ) {
+ await this.hasUserAccessToWorkspaceOrThrow(userId, workspaceId);
return await this.userRepository.save({
id: userId,
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
index 1aa3bf5f9e5a..6594293d864b 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -77,7 +77,10 @@ export class UserResolver {
this.environmentService.get('IS_MULTIWORKSPACE_ENABLED') &&
workspaceId
) {
- await this.userService.saveDefaultWorkspace(userId, workspaceId);
+ await this.userService.saveDefaultWorkspaceIfUserHasAccessOrThrow(
+ userId,
+ workspaceId,
+ );
}
const user = await this.userRepository.findOne({
@@ -87,7 +90,7 @@ export class UserResolver {
relations: ['defaultWorkspace', 'workspaces', 'workspaces.workspace'],
});
- userValidator.assertIsExist(
+ userValidator.assertIsDefinedOrThrow(
user,
new AuthException('User not found', AuthExceptionCode.USER_NOT_FOUND),
);
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.validate.ts b/packages/twenty-server/src/engine/core-modules/user/user.validate.ts
index 4fb4cec3b553..42a4b682d0fb 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.validate.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.validate.ts
@@ -1,34 +1,24 @@
import { User } from 'src/engine/core-modules/user/user.entity';
import { CustomException } from 'src/utils/custom-exception';
+import { isDefined } from 'src/utils/is-defined';
-const assertIsExist = (
+const assertIsDefinedOrThrow = (
user: User | undefined | null,
exceptionToThrow: CustomException,
): asserts user is User => {
- if (!user) {
+ if (!isDefined(user)) {
throw exceptionToThrow;
}
};
-const isExist = (user: User | undefined | null): user is User => {
- return !!user;
-};
-
-const assertHasDefaultWorkspace = (
- user: User,
- exceptionToThrow?: CustomException,
-): asserts user is User & { defaultWorkspaceId: string } => {
- if (!user.defaultWorkspaceId) {
- throw exceptionToThrow;
- }
+const isUserDefined = (user: User | undefined | null): user is User => {
+ return isDefined(user);
};
export const userValidator: {
- assertIsExist: typeof assertIsExist;
- assertHasDefaultWorkspace: typeof assertHasDefaultWorkspace;
- isExist: typeof isExist;
+ assertIsDefinedOrThrow: typeof assertIsDefinedOrThrow;
+ isDefined: typeof isUserDefined;
} = {
- assertIsExist,
- assertHasDefaultWorkspace,
- isExist,
+ assertIsDefinedOrThrow,
+ isDefined: isUserDefined,
};
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/types/workspace.type.ts b/packages/twenty-server/src/engine/core-modules/workspace/types/workspace.type.ts
new file mode 100644
index 000000000000..259fc76f2c43
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/types/workspace.type.ts
@@ -0,0 +1 @@
+export type WorkspaceAuthProvider = 'google' | 'microsoft' | 'password';
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.validate.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.validate.ts
index 72bebb48ecb2..33e666a000ec 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.validate.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.validate.ts
@@ -3,8 +3,8 @@ import {
WorkspaceActivationStatus,
} from 'src/engine/core-modules/workspace/workspace.entity';
import { CustomException } from 'src/utils/custom-exception';
-
-type WorkspaceAuthProvider = 'google' | 'microsoft' | 'password';
+import { AuthException } from 'src/engine/core-modules/auth/auth.exception';
+import { WorkspaceAuthProvider } from 'src/engine/core-modules/workspace/types/workspace.type';
const assertIsExist = (
workspace: Workspace | undefined | null,
@@ -25,40 +25,24 @@ const assertIsActive = (
throw exceptionToThrow;
};
-type IsAuthEnabled = (
- provider: P,
- exceptionToThrow: CustomException,
-) => (
+const isAuthEnabledOrThrow = (
+ provider: WorkspaceAuthProvider,
workspace: Workspace,
- exceptionToThrowCustom?: CustomException,
-) => boolean;
-
-const isAuthEnabled: IsAuthEnabled = (provider, exceptionToThrow) => {
- return (workspace, exceptionToThrowCustom = exceptionToThrow) => {
- if (provider === 'google' && workspace.isGoogleAuthEnabled) return true;
- if (provider === 'microsoft' && workspace.isMicrosoftAuthEnabled)
- return true;
- if (provider === 'password' && workspace.isPasswordAuthEnabled) return true;
+ exceptionToThrowCustom: AuthException,
+) => {
+ if (provider === 'google' && workspace.isGoogleAuthEnabled) return true;
+ if (provider === 'microsoft' && workspace.isMicrosoftAuthEnabled) return true;
+ if (provider === 'password' && workspace.isPasswordAuthEnabled) return true;
- if (exceptionToThrowCustom) {
- throw exceptionToThrowCustom;
- }
-
- return false;
- };
+ throw exceptionToThrowCustom;
};
-const validateAuth = (fn: ReturnType, workspace: Workspace) =>
- fn(workspace);
-
export const workspaceValidator: {
assertIsExist: typeof assertIsExist;
assertIsActive: typeof assertIsActive;
- isAuthEnabled: IsAuthEnabled;
- validateAuth: typeof validateAuth;
+ isAuthEnabledOrThrow: typeof isAuthEnabledOrThrow;
} = {
assertIsExist: assertIsExist,
assertIsActive: assertIsActive,
- isAuthEnabled,
- validateAuth,
+ isAuthEnabledOrThrow: isAuthEnabledOrThrow,
};