From 17c8ada36959deb646fba7eb435fbe65696bd964 Mon Sep 17 00:00:00 2001
From: Alessandro Magionami <alessandro.magionami@gmail.com>
Date: Wed, 22 Jan 2025 12:08:36 +0100
Subject: [PATCH] chore(workspaces): use logic function to check workspace is
 joinable

---
 .../services/workspaceJoinRequests.ts         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/server/modules/workspaces/services/workspaceJoinRequests.ts b/packages/server/modules/workspaces/services/workspaceJoinRequests.ts
index 22afcd8a4..807cd1c2e 100644
--- a/packages/server/modules/workspaces/services/workspaceJoinRequests.ts
+++ b/packages/server/modules/workspaces/services/workspaceJoinRequests.ts
@@ -1,8 +1,8 @@
 import {
-  WorkspaceJoinNotAllowedError,
   WorkspaceNotDiscoverableError,
   WorkspaceNotFoundError,
-  WorkspaceNotJoinableError
+  WorkspaceNotJoinableError,
+  WorkspaceProtectedError
 } from '@/modules/workspaces/errors/workspace'
 import { GetUser } from '@/modules/core/domain/users/operations'
 import { NotFoundError } from '@/modules/shared/errors'
@@ -20,6 +20,7 @@ import {
 } from '@/modules/workspaces/domain/operations'
 import { Roles } from '@speckle/shared'
 import { FindEmailsByUserId } from '@/modules/core/domain/userEmails/operations'
+import { userEmailsCompliantWithWorkspaceDomains } from '@/modules/workspaces/domain/logic'
 
 export const dismissWorkspaceJoinRequestFactory =
   ({
@@ -71,14 +72,14 @@ export const requestToJoinWorkspaceFactory =
     if (!workspaceDomains.length) throw new WorkspaceNotJoinableError()
 
     const userEmails = await getUserEmails({ userId })
-    const matchingEmail = userEmails.find((userEmail) => {
-      if (!userEmail.verified) return false
-      return workspaceDomains
-        .map((domain) => domain.domain)
-        .includes(userEmail.email.split('@')[1])
-    })
 
-    if (!matchingEmail) throw new WorkspaceJoinNotAllowedError()
+    const canJoinWorkspace = userEmailsCompliantWithWorkspaceDomains({
+      workspaceDomains: workspace.domains,
+      userEmails
+    })
+    if (!canJoinWorkspace) {
+      throw new WorkspaceProtectedError()
+    }
 
     await createWorkspaceJoinRequest({
       workspaceJoinRequest: {