deferred urls should be fixed

desci-labs · Aug 18, 2024 · d4a5aa7 · d4a5aa7
1 parent 27084d7
commit d4a5aa7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/desci-server/src/controllers/attestations/claims.ts b/desci-server/src/controllers/attestations/claims.ts
@@ -82,11 +82,12 @@ export const claimAttestation = async (req: RequestWithUser, res: Response, _nex
 
   if (attestation.protected && isNodePublished) {
     await attestationService.emailProtectedAttestationCommunityMembers(
-      nodeClaim.id,
+      nodeClaim.attestationId,
       attestationVersion.id,
       body.nodeVersion,
       body.nodeDpid,
       req.user,
+      ensureUuidEndsWithDot(uuid),
     );
   }
 

diff --git a/desci-server/src/services/Attestation.ts b/desci-server/src/services/Attestation.ts
@@ -965,20 +965,22 @@ export class AttestationService {
    * Fires off an email to all community members when a protected attestation is claimed
    */
   async emailProtectedAttestationCommunityMembers(
-    nodeAttestationId: number,
+    attestationId: number,
     attestationVersionId: number,
     nodeVersion: number,
     nodeDpid: string,
     user: User,
+    nodeUuid: string,
   ) {
     logger.info(
-      { nodeAttestationId, attestationVersionId, nodeVersion, nodeDpid, user },
+      { attestationId, attestationVersionId, nodeVersion, nodeDpid, user },
       'init emailProtectedAttestationCommunityMembers',
     );
-    const nodeAttestation = await prisma.nodeAttestation.findFirst({ where: { id: nodeAttestationId } });
-    const attestationId = nodeAttestation.attestationId;
+    const nodeAttestation = await prisma.nodeAttestation.findFirst({
+      where: { attestationId, nodeUuid: ensureUuidEndsWithDot(nodeUuid), revoked: false },
+    });
     logger.info({ attestationId }, 'Emailing community members');
-    // const attestation = await this.findAttestationById(attestationId);
+
     const versionedAttestation = await this.getAttestationVersion(attestationVersionId, attestationId);
     const members = await prisma.communityMember.findMany({
       where: { communityId: versionedAttestation.attestation.communityId },
@@ -989,13 +991,13 @@ export class AttestationService {
       to: member.user.email,
       from: 'no-reply@desci.com',
       subject: `[nodes.desci.com] ${versionedAttestation.name} claimed on DPID://${nodeDpid}/v${nodeVersion + 1}`,
-      text: `${user.name} just claimed ${versionedAttestation.name} on ${process.env.DAPP_URL}/dpid/${nodeDpid}/v${nodeVersion + 1}?claim=${attestationId}`,
+      text: `${user.name} just claimed ${versionedAttestation.name} on ${process.env.DAPP_URL}/dpid/${nodeDpid}/v${nodeVersion + 1}?claim=${nodeAttestation.id}`,
       html: AttestationClaimedEmailHtml({
         dpid: nodeDpid,
         attestationName: versionedAttestation.name,
         communityName: versionedAttestation.name,
         userName: user.name,
-        dpidPath: `${process.env.DAPP_URL}/dpid/${nodeDpid}/v${nodeVersion + 1}?claim=${attestationId}`,
+        dpidPath: `${process.env.DAPP_URL}/dpid/${nodeDpid}/v${nodeVersion + 1}?claim=${nodeAttestation.id}`,
       }),
     }));
 

diff --git a/desci-server/src/services/PublishServices.ts b/desci-server/src/services/PublishServices.ts
@@ -146,6 +146,7 @@ export class PublishServices {
               nodeVersion - 1, // 0-indexed total expected
               dpid,
               entry.User,
+              ensureUuidEndsWithDot(uuid),
             );
           }),
         );