@cedarjs/cli 8.0.0-canary.3548 → 8.0.0-canary.3550

package/dist/commands/setup/tenancy/schemaPrisma.js

@@ -7,19 +7,21 @@ const ORGANIZATION_MODEL = `model Organization {
   memberships Membership[]
 }`;
 const MEMBERSHIP_MODEL = `model Membership {
-  id              String       @id @default(cuid())
-  role            String
+  id                  String       @id @default(cuid())
+  role                String
   // Null while the membership is a pending invitation.
-  userId          String?
-  organizationId  String
-  invitedById     String?
-  invitationToken String?      @unique
-  createdAt       DateTime     @default(now())
-  updatedAt       DateTime     @updatedAt
-  user            User?        @relation(fields: [userId], references: [id])
-  organization    Organization @relation(fields: [organizationId], references: [id])
-  invitedBy       Membership?  @relation("Inviter", fields: [invitedById], references: [id])
-  invitees        Membership[] @relation("Inviter")
+  userId              String?
+  organizationId      String
+  invitedById         String?
+  invitationToken     String?      @unique
+  // When a pending invitation stops being claimable.
+  invitationExpiresAt DateTime?
+  createdAt           DateTime     @default(now())
+  updatedAt           DateTime     @updatedAt
+  user                User?        @relation(fields: [userId], references: [id])
+  organization        Organization @relation(fields: [organizationId], references: [id])
+  invitedBy           Membership?  @relation("Inviter", fields: [invitedById], references: [id])
+  invitees            Membership[] @relation("Inviter")
 
   @@unique([userId, organizationId])
   @@index([organizationId])

package/dist/commands/setup/tenancy/templates/organizations.scenarios.ts.template

@@ -48,6 +48,16 @@ export const standard = defineScenario<
       data: {
         role: 'admin',
         invitationToken: 'invite-token',
+        invitationExpiresAt: new Date('2999-01-01T00:00:00Z'),
+        organization: { connect: { slug: 'acme-inc' } },
+      },
+    },
+    // A pending invitation whose expiry has passed.
+    expired: {
+      data: {
+        role: 'member',
+        invitationToken: 'expired-token',
+        invitationExpiresAt: new Date('2000-01-01T00:00:00Z'),
         organization: { connect: { slug: 'acme-inc' } },
       },
     },
@@ -55,4 +65,8 @@ export const standard = defineScenario<
 })
 
 export type StandardScenario = ScenarioData<Organization, 'organization', 'acme'> &
-  ScenarioData<Membership, 'membership', 'owner' | 'admin' | 'pending'>
+  ScenarioData<
+    Membership,
+    'membership',
+    'owner' | 'admin' | 'pending' | 'expired'
+  >

package/dist/commands/setup/tenancy/templates/organizations.sdl.ts.template

@@ -30,6 +30,8 @@ export const schema = gql`
   type Invitation {
     membership: Membership!
     invitationToken: String!
+    "When the invitation stops being claimable."
+    invitationExpiresAt: DateTime!
   }
 
   input CreateOrganizationInput {
@@ -61,6 +63,7 @@ export const schema = gql`
     organizations.ts) -- an admin can invite an admin or a member, but not an
     owner. The app is responsible for emailing input.email a link built from
     the returned invitationToken; Membership has no email column of its own.
+    The invitation can be claimed until the returned invitationExpiresAt.
     Web callers must call reauthenticate() from useAuth() in onCompleted so
     the invite shows up if the inviter is also the invitee.
     """
@@ -70,7 +73,7 @@ export const schema = gql`
     """
     Attaches the pending membership matching token to the signed-in user, or
     is a no-op if it is already attached to them. Throws if the token is
-    invalid or was already claimed by someone else.
+    invalid, expired or was already claimed by someone else.
     Web callers must call reauthenticate() from useAuth() in onCompleted so
     the new membership is reflected in currentUser.memberships.
     """

package/dist/commands/setup/tenancy/templates/organizations.test.ts.template

@@ -99,6 +99,27 @@ describe('organizations service', () => {
       },
     )
 
+    scenario(
+      'sets an expiry in the future',
+      async (scenario: StandardScenario) => {
+        asMember(scenario, scenario.membership.owner)
+
+        const result = await inviteMember({
+          input: { email: 'new-member@example.com', role: 'member' },
+        })
+
+        const created = await db.membership.findFirst({
+          where: { invitationToken: result.invitationToken },
+        })
+
+        expect(created?.invitationExpiresAt).toBeInstanceOf(Date)
+        expect(created!.invitationExpiresAt!.getTime()).toBeGreaterThan(
+          Date.now(),
+        )
+        expect(result.invitationExpiresAt).toEqual(created?.invitationExpiresAt)
+      },
+    )
+
     scenario(
       'an admin cannot invite an owner',
       async (scenario: StandardScenario) => {
@@ -316,6 +337,34 @@ describe('organizations service', () => {
       },
     )
 
+    scenario(
+      'rejects an expired invitation and leaves it unclaimed',
+      async (scenario: StandardScenario) => {
+        const invitee = await db.user.create({
+          data: {
+            email: 'invitee@example.com',
+            hashedPassword: 'x',
+            salt: 'x',
+          },
+        })
+
+        const token = scenario.membership.expired.invitationToken!
+
+        mockCurrentUser({ id: invitee.id })
+
+        await expect(acceptInvitation({ token })).rejects.toThrow(
+          /has expired/,
+        )
+
+        const row = await db.membership.findUnique({
+          where: { id: scenario.membership.expired.id },
+        })
+
+        expect(row?.userId).toBeNull()
+        expect(row?.invitationToken).toEqual(token)
+      },
+    )
+
     it('rejects a token that never matched a pending invitation', async () => {
       mockCurrentUser({ id: 'some-user-id' })
 

package/dist/commands/setup/tenancy/templates/organizations.ts.template

@@ -11,6 +11,12 @@ import { requireCurrentOrg } from '@cedarjs/tenancy'
 
 import { Prisma, db } from 'src/lib/db'
 
+/**
+ * How long an invitation stays claimable after `inviteMember` creates it.
+ * Change it if seven days does not suit the app.
+ */
+const INVITATION_LIFETIME_MS = 7 * 24 * 60 * 60 * 1000
+
 interface MembershipSummary {
   id: string
   organizationId: string
@@ -143,7 +149,9 @@ export const createOrganization: MutationResolvers['createOrganization'] =
  * `Membership` has no email column: the caller is responsible for emailing
  * `input.email` a link built from the returned `invitationToken`, with its
  * own mailer. The token is returned here and nowhere else -- see the SDL
- * doc comment on `Invitation` for why.
+ * doc comment on `Invitation` for why. The invitation can be claimed until
+ * `invitationExpiresAt`, which is returned with the token so the email can
+ * say when the link stops working.
  */
 export const inviteMember: MutationResolvers['inviteMember'] = async ({
   input,
@@ -164,6 +172,7 @@ export const inviteMember: MutationResolvers['inviteMember'] = async ({
   }
 
   const invitationToken = crypto.randomUUID()
+  const invitationExpiresAt = new Date(Date.now() + INVITATION_LIFETIME_MS)
 
   const membership = await db.membership.create({
     data: {
@@ -171,10 +180,11 @@ export const inviteMember: MutationResolvers['inviteMember'] = async ({
       organizationId: currentOrg.id,
       invitedById: currentOrg.membershipId,
       invitationToken,
+      invitationExpiresAt,
     },
   })
 
-  return { membership, invitationToken }
+  return { membership, invitationToken, invitationExpiresAt }
 }
 
 /**
@@ -203,16 +213,23 @@ interface ClaimedInvitation {
  * `updateManyAndReturn` because Prisma only supports the latter on
  * PostgreSQL, CockroachDB and SQLite.
  *
+ * The same guard refuses an expired invitation: it only matches while
+ * `invitationExpiresAt` is in the future.
+ *
  * Returns the claimed membership's organization id when `userId` holds the
  * membership, whether this call claimed it or an earlier one did, or `null`
- * when the token is invalid or was claimed by a different user.
+ * when the token is invalid, expired, or was claimed by a different user.
  */
 const claimInvitation = async (
   token: string,
   userId: string,
 ): Promise<ClaimedInvitation | null> => {
   await db.membership.updateMany({
-    where: { invitationToken: token, userId: null },
+    where: {
+      invitationToken: token,
+      userId: null,
+      invitationExpiresAt: { gt: new Date() },
+    },
     data: { userId, invitationToken: spentInvitationToken(token) },
   })
 
@@ -223,11 +240,29 @@ const claimInvitation = async (
   return claimed ? { organizationId: claimed.organizationId } : null
 }
 
+/**
+ * Whether `token` belongs to an invitation that is still unclaimed but past
+ * its expiry. Only used to pick the error message after a failed claim; the
+ * guard in `claimInvitation` is what decides.
+ */
+const isExpiredInvitation = async (token: string): Promise<boolean> => {
+  const pending = await db.membership.findFirst({
+    where: {
+      invitationToken: token,
+      userId: null,
+      invitationExpiresAt: { lte: new Date() },
+    },
+    select: { id: true },
+  })
+
+  return pending !== null
+}
+
 /**
  * Attaches the pending membership matching `token` to the signed-in user.
  * Idempotent when it is already attached to them; throws when the token
  * does not match a pending (unclaimed) membership, including when someone
- * else has already claimed it.
+ * else has already claimed it or the invitation has expired.
  */
 export const acceptInvitation: MutationResolvers['acceptInvitation'] = async ({
   token,
@@ -238,7 +273,11 @@ export const acceptInvitation: MutationResolvers['acceptInvitation'] = async ({
   const claim = await claimInvitation(token, userId)
 
   if (!claim) {
-    throw new ValidationError('This invitation is invalid or has expired.')
+    throw new ValidationError(
+      (await isExpiredInvitation(token))
+        ? 'This invitation has expired. Ask for a new one.'
+        : 'This invitation is invalid or has already been used.',
+    )
   }
 
   return db.organization.findUniqueOrThrow({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3548",
+  "version": "8.0.0-canary.3550",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.10",
     "@babel/types": "7.29.11",
-    "@cedarjs/api-server": "8.0.0-canary.3548",
-    "@cedarjs/babel-config": "8.0.0-canary.3548",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3548",
-    "@cedarjs/internal": "8.0.0-canary.3548",
-    "@cedarjs/prerender": "8.0.0-canary.3548",
-    "@cedarjs/project-config": "8.0.0-canary.3548",
-    "@cedarjs/structure": "8.0.0-canary.3548",
-    "@cedarjs/telemetry": "8.0.0-canary.3548",
-    "@cedarjs/utils": "8.0.0-canary.3548",
-    "@cedarjs/vite": "8.0.0-canary.3548",
-    "@cedarjs/web-server": "8.0.0-canary.3548",
+    "@cedarjs/api-server": "8.0.0-canary.3550",
+    "@cedarjs/babel-config": "8.0.0-canary.3550",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3550",
+    "@cedarjs/internal": "8.0.0-canary.3550",
+    "@cedarjs/prerender": "8.0.0-canary.3550",
+    "@cedarjs/project-config": "8.0.0-canary.3550",
+    "@cedarjs/structure": "8.0.0-canary.3550",
+    "@cedarjs/telemetry": "8.0.0-canary.3550",
+    "@cedarjs/utils": "8.0.0-canary.3550",
+    "@cedarjs/vite": "8.0.0-canary.3550",
+    "@cedarjs/web-server": "8.0.0-canary.3550",
     "@listr2/prompt-adapter-enquirer": "4.4.3",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.12.0",
@@ -93,7 +93,7 @@
     "yargs": "18.2.0"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3548",
+    "@cedarjs/framework-tools": "8.0.0-canary.3550",
     "@prisma/dmmf": "7.10.1",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",