fix(server): some serverinvites regressions (#2538)

* project invite retrieval * fix for invalid invite target when inviting registered user by email * improved error msg w/ broken streamId
specklesystems · Jul 29, 2024 · 281f77a · 281f77a
1 parent abd89a3
commit 281f77a
Show file tree

Hide file tree

Showing 7 changed files with 271 additions and 114 deletions.
diff --git a/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts b/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
@@ -154,12 +154,6 @@ export = {
     },
 
     async streamInviteCreate(_parent, args, context) {
-      await authorizeResolver(
-        context.userId,
-        args.input.streamId,
-        Roles.Stream.Owner,
-        context.resourceAccessRules
-      )
       const createProjectInvite = createProjectInviteFactory({
         createAndSendInvite: buildCreateAndSendServerOrProjectInvite()
       })
@@ -320,17 +314,18 @@ export = {
   },
   ProjectInviteMutations: {
     async create(_parent, args, ctx) {
-      await authorizeResolver(
-        ctx.userId,
-        args.projectId,
-        Roles.Stream.Owner,
-        ctx.resourceAccessRules
-      )
       const createProjectInvite = createProjectInviteFactory({
         createAndSendInvite: buildCreateAndSendServerOrProjectInvite()
       })
 
-      await createProjectInvite(args, ctx.userId!, ctx.resourceAccessRules)
+      await createProjectInvite(
+        {
+          projectId: args.projectId,
+          ...args.input
+        },
+        ctx.userId!,
+        ctx.resourceAccessRules
+      )
       return ctx.loaders.streams.getStream.load(args.projectId)
     },
     async batchCreate(_parent, args, ctx) {

diff --git a/...ages/server/modules/serverinvites/migrations/20240716134617_migrate_to_resources_array.ts b/...ages/server/modules/serverinvites/migrations/20240716134617_migrate_to_resources_array.ts
@@ -57,7 +57,7 @@ export async function down(knex: Knex): Promise<void> {
     table.string('serverRole')
 
     table.index(OLD_IDX_2)
-    table.index(OLD_UNIQUE_IDX_COLS)
+    table.unique(OLD_UNIQUE_IDX_COLS)
   })
 
   // Move back from resource to old fields

diff --git a/packages/server/modules/serverinvites/services/creation.ts b/packages/server/modules/serverinvites/services/creation.ts
@@ -95,7 +95,8 @@ export const createAndSendInviteFactory =
   }): CreateAndSendInvite =>
   async (params, inviterResourceAccessLimits?) => {
     const sendInviteEmail = sendInviteEmailFactory({ buildInviteEmailContents })
-    const { inviterId, target } = params
+    const { inviterId } = params
+    let { target } = params
     let { message } = params
 
     const [inviter, targetUser, serverInfo] = await Promise.all([
@@ -111,6 +112,10 @@ export const createAndSendInviteFactory =
       throw new InviteCreateValidationError('Attempting to invite an invalid user')
     }
 
+    if (targetData.userId) {
+      target = buildUserTarget(targetData.userId)!
+    }
+
     if (message && message.length >= 1024) {
       throw new InviteCreateValidationError('Personal message too long')
     }

diff --git a/packages/server/modules/serverinvites/services/projectInviteManagement.ts b/packages/server/modules/serverinvites/services/projectInviteManagement.ts
@@ -57,6 +57,13 @@ export const createProjectInviteFactory =
       throw new InviteCreateValidationError('Either email or userId must be specified')
     }
 
+    const resourceId = isStreamInviteCreateInput(input)
+      ? input.streamId
+      : input.projectId
+    if (!resourceId?.length) {
+      throw new InviteCreateValidationError('Invalid project ID specified')
+    }
+
     const target = (userId ? buildUserTarget(userId) : email)!
     await deps.createAndSendInvite(
       {
@@ -67,9 +74,7 @@ export const createProjectInviteFactory =
           : undefined,
         primaryResourceTarget: {
           resourceType: ProjectInviteResourceType,
-          resourceId: isStreamInviteCreateInput(input)
-            ? input.streamId
-            : input.projectId,
+          resourceId,
           role: role || Roles.Stream.Contributor,
           primary: true
         }