@shipfox/api-workspaces 5.0.0 → 6.0.0

package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
 $ shipfox-swc
-Successfully compiled: 47 files with swc (250.48ms)
+Successfully compiled: 48 files with swc (373.58ms)

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @shipfox/api-workspaces
 
+## 6.0.0
+
+### Minor Changes
+
+- 6bdf24b: Adds idempotent workspace invitation reconciliation for retry-safe external acceptance flows.
+- 326f4c0: Exposes Workspaces inter-module operations and moves Auth and OAuth providers onto injected clients.
+- 1820feb: Adds Slack Settings installation and callback recovery while returning stable workspace access errors.
+
+### Patch Changes
+
+- 7366f04: Adds a configured shared mailer that owns SMTP delivery settings. `@shipfox/api-auth` and `@shipfox/api-workspaces` drop their own mailer environment variables and factory logic and use the shared `mailer` from `@shipfox/node-mailer` instead.
+- c2db8c3: Adds workspace member invitation and join lifecycle events to the workspaces outbox.
+- f73da5d: Enforces bounded API context imports and routes inter-module consumers through producer contracts.
+- Updated dependencies [b70f920]
+- Updated dependencies [7366f04]
+- Updated dependencies [54ce48b]
+- Updated dependencies [c0162b0]
+- Updated dependencies [7ac43a4]
+- Updated dependencies [a01e917]
+- Updated dependencies [1b79cda]
+- Updated dependencies [c2db8c3]
+- Updated dependencies [8bdc149]
+- Updated dependencies [3810996]
+- Updated dependencies [b00ed29]
+- Updated dependencies [8aa7cd3]
+- Updated dependencies [326f4c0]
+- Updated dependencies [4a91956]
+- Updated dependencies [81f9544]
+  - @shipfox/node-tokens@0.3.0
+  - @shipfox/node-mailer@0.2.0
+  - @shipfox/node-module@0.4.0
+  - @shipfox/node-drizzle@0.3.2
+  - @shipfox/node-outbox@0.2.4
+  - @shipfox/api-workspaces-dto@6.0.0
+  - @shipfox/api-auth-context@6.0.0
+  - @shipfox/node-fastify@0.2.4
+  - @shipfox/api-common-dto@6.0.0
+  - @shipfox/inter-module@0.2.0
+
 ## 5.0.0
 
 ### Patch Changes

package/README.md

@@ -16,7 +16,7 @@ pnpm add @shipfox/api-workspaces
 ```
 
 Set `CLIENT_BASE_URL` to the public client URL. Invite emails use this URL for
-their accept links. Set up the shared mailer when invite email must be sent.
+their accept links. Configure `@shipfox/node-mailer` when invite email must be sent.
 
 ## Usage
 
@@ -39,7 +39,7 @@ const membership = await ensureMembership({
 | --- | --- | --- |
 | `CLIENT_BASE_URL` | `http://localhost:5173` | Base URL used in workspace invitation links. |
 
-The package also uses the shared mailer configuration when it sends invitation email.
+Invitation email uses the shared `@shipfox/node-mailer` configuration.
 
 ## Routes / API / Data Model
 

package/dist/config.d.ts

@@ -1,12 +1,4 @@
-import { type Mailer } from '@shipfox/node-mailer';
 export declare const config: Readonly<{
     CLIENT_BASE_URL: string;
-    MAILER_TRANSPORT: "console" | "smtp";
-    MAILER_FROM: string;
-    SMTP_HOST: string | undefined;
-    SMTP_PORT: number;
-    SMTP_USER: string | undefined;
-    SMTP_PASSWORD: string | undefined;
 } & import("@shipfox/config").CleanedEnvAccessors>;
-export declare const mailer: Mailer;
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAwC,KAAK,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAExF,eAAO,MAAM,MAAM;;;;;;;;kDA8BjB,CAAC;AAiBH,eAAO,MAAM,MAAM,QAAiB,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM;;kDAKjB,CAAC"}

package/dist/config.js

@@ -1,58 +1,9 @@
-import { createConfig, num, str } from '@shipfox/config';
-import { createConsoleMailer, createSmtpMailer } from '@shipfox/node-mailer';
+import { createConfig, str } from '@shipfox/config';
 export const config = createConfig({
     CLIENT_BASE_URL: str({
         desc: 'Base URL of the client app. Used to build links in workspace invitation emails.',
         default: 'http://localhost:5173'
-    }),
-    MAILER_TRANSPORT: str({
-        desc: 'How emails are delivered. Use console to print them to the log, or smtp to send them through an SMTP server.',
-        choices: [
-            'console',
-            'smtp'
-        ],
-        default: 'console'
-    }),
-    MAILER_FROM: str({
-        desc: 'Sender address shown on outgoing emails.',
-        default: 'noreply@shipfox.local'
-    }),
-    SMTP_HOST: str({
-        desc: 'Hostname of the SMTP server. Required when MAILER_TRANSPORT is smtp.',
-        default: undefined
-    }),
-    SMTP_PORT: num({
-        desc: 'Port of the SMTP server.',
-        default: 587
-    }),
-    SMTP_USER: str({
-        desc: 'Username for SMTP authentication. Leave it unset if the server needs no login.',
-        default: undefined
-    }),
-    SMTP_PASSWORD: str({
-        desc: 'Password for SMTP authentication. Leave it unset if the server needs no login.',
-        default: undefined
     })
 });
-function createMailer() {
-    if (config.MAILER_TRANSPORT === 'smtp') {
-        if (!config.SMTP_HOST) throw new Error('SMTP_HOST is required when MAILER_TRANSPORT=smtp');
-        return createSmtpMailer({
-            host: config.SMTP_HOST,
-            port: config.SMTP_PORT,
-            ...config.SMTP_USER ? {
-                user: config.SMTP_USER
-            } : {},
-            ...config.SMTP_PASSWORD ? {
-                password: config.SMTP_PASSWORD
-            } : {},
-            from: config.MAILER_FROM
-        });
-    }
-    return createConsoleMailer({
-        from: config.MAILER_FROM
-    });
-}
-export const mailer = createMailer();
 
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/config.ts"],"sourcesContent":["import {createConfig, num, str} from '@shipfox/config';\nimport {createConsoleMailer, createSmtpMailer, type Mailer} from '@shipfox/node-mailer';\n\nexport const config = createConfig({\n  CLIENT_BASE_URL: str({\n    desc: 'Base URL of the client app. Used to build links in workspace invitation emails.',\n    default: 'http://localhost:5173',\n  }),\n  MAILER_TRANSPORT: str({\n    desc: 'How emails are delivered. Use console to print them to the log, or smtp to send them through an SMTP server.',\n    choices: ['console', 'smtp'],\n    default: 'console',\n  }),\n  MAILER_FROM: str({\n    desc: 'Sender address shown on outgoing emails.',\n    default: 'noreply@shipfox.local',\n  }),\n  SMTP_HOST: str({\n    desc: 'Hostname of the SMTP server. Required when MAILER_TRANSPORT is smtp.',\n    default: undefined,\n  }),\n  SMTP_PORT: num({\n    desc: 'Port of the SMTP server.',\n    default: 587,\n  }),\n  SMTP_USER: str({\n    desc: 'Username for SMTP authentication. Leave it unset if the server needs no login.',\n    default: undefined,\n  }),\n  SMTP_PASSWORD: str({\n    desc: 'Password for SMTP authentication. Leave it unset if the server needs no login.',\n    default: undefined,\n  }),\n});\n\nfunction createMailer(): Mailer {\n  if (config.MAILER_TRANSPORT === 'smtp') {\n    if (!config.SMTP_HOST) throw new Error('SMTP_HOST is required when MAILER_TRANSPORT=smtp');\n    return createSmtpMailer({\n      host: config.SMTP_HOST,\n      port: config.SMTP_PORT,\n      ...(config.SMTP_USER ? {user: config.SMTP_USER} : {}),\n      ...(config.SMTP_PASSWORD ? {password: config.SMTP_PASSWORD} : {}),\n      from: config.MAILER_FROM,\n    });\n  }\n\n  return createConsoleMailer({from: config.MAILER_FROM});\n}\n\nexport const mailer = createMailer();\n"],"names":["createConfig","num","str","createConsoleMailer","createSmtpMailer","config","CLIENT_BASE_URL","desc","default","MAILER_TRANSPORT","choices","MAILER_FROM","SMTP_HOST","undefined","SMTP_PORT","SMTP_USER","SMTP_PASSWORD","createMailer","Error","host","port","user","password","from","mailer"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,GAAG,EAAEC,GAAG,QAAO,kBAAkB;AACvD,SAAQC,mBAAmB,EAAEC,gBAAgB,QAAoB,uBAAuB;AAExF,OAAO,MAAMC,SAASL,aAAa;IACjCM,iBAAiBJ,IAAI;QACnBK,MAAM;QACNC,SAAS;IACX;IACAC,kBAAkBP,IAAI;QACpBK,MAAM;QACNG,SAAS;YAAC;YAAW;SAAO;QAC5BF,SAAS;IACX;IACAG,aAAaT,IAAI;QACfK,MAAM;QACNC,SAAS;IACX;IACAI,WAAWV,IAAI;QACbK,MAAM;QACNC,SAASK;IACX;IACAC,WAAWb,IAAI;QACbM,MAAM;QACNC,SAAS;IACX;IACAO,WAAWb,IAAI;QACbK,MAAM;QACNC,SAASK;IACX;IACAG,eAAed,IAAI;QACjBK,MAAM;QACNC,SAASK;IACX;AACF,GAAG;AAEH,SAASI;IACP,IAAIZ,OAAOI,gBAAgB,KAAK,QAAQ;QACtC,IAAI,CAACJ,OAAOO,SAAS,EAAE,MAAM,IAAIM,MAAM;QACvC,OAAOd,iBAAiB;YACtBe,MAAMd,OAAOO,SAAS;YACtBQ,MAAMf,OAAOS,SAAS;YACtB,GAAIT,OAAOU,SAAS,GAAG;gBAACM,MAAMhB,OAAOU,SAAS;YAAA,IAAI,CAAC,CAAC;YACpD,GAAIV,OAAOW,aAAa,GAAG;gBAACM,UAAUjB,OAAOW,aAAa;YAAA,IAAI,CAAC,CAAC;YAChEO,MAAMlB,OAAOM,WAAW;QAC1B;IACF;IAEA,OAAOR,oBAAoB;QAACoB,MAAMlB,OAAOM,WAAW;IAAA;AACtD;AAEA,OAAO,MAAMa,SAASP,eAAe"}
+{"version":3,"sources":["../src/config.ts"],"sourcesContent":["import {createConfig, str} from '@shipfox/config';\n\nexport const config = createConfig({\n  CLIENT_BASE_URL: str({\n    desc: 'Base URL of the client app. Used to build links in workspace invitation emails.',\n    default: 'http://localhost:5173',\n  }),\n});\n"],"names":["createConfig","str","config","CLIENT_BASE_URL","desc","default"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,GAAG,QAAO,kBAAkB;AAElD,OAAO,MAAMC,SAASF,aAAa;IACjCG,iBAAiBF,IAAI;QACnBG,MAAM;QACNC,SAAS;IACX;AACF,GAAG"}

package/dist/core/entities/invitation.d.ts

@@ -4,6 +4,7 @@ export interface Invitation {
     email: string;
     hashedToken: string;
     expiresAt: Date;
+    revokedAt: Date | null;
     acceptedAt: Date | null;
     acceptedByUserId: string | null;
     invitedByUserId: string;

package/dist/core/entities/invitation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invitation.d.ts","sourceRoot":"","sources":["../../../src/core/entities/invitation.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,IAAI,CAAC;IAChB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB"}
+{"version":3,"file":"invitation.d.ts","sourceRoot":"","sources":["../../../src/core/entities/invitation.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB"}

package/dist/core/entities/invitation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/core/entities/invitation.ts"],"sourcesContent":["export interface Invitation {\n  id: string;\n  workspaceId: string;\n  email: string;\n  hashedToken: string;\n  expiresAt: Date;\n  acceptedAt: Date | null;\n  acceptedByUserId: string | null;\n  invitedByUserId: string;\n  invitedByDisplay: string | null;\n  createdAt: Date;\n  updatedAt: Date;\n}\n"],"names":[],"mappings":"AAAA,WAYC"}
+{"version":3,"sources":["../../../src/core/entities/invitation.ts"],"sourcesContent":["export interface Invitation {\n  id: string;\n  workspaceId: string;\n  email: string;\n  hashedToken: string;\n  expiresAt: Date;\n  revokedAt: Date | null;\n  acceptedAt: Date | null;\n  acceptedByUserId: string | null;\n  invitedByUserId: string;\n  invitedByDisplay: string | null;\n  createdAt: Date;\n  updatedAt: Date;\n}\n"],"names":[],"mappings":"AAAA,WAaC"}

package/dist/core/invitations.d.ts

@@ -1,6 +1,6 @@
 import type { UserContextMembership } from '@shipfox/api-auth-context';
-import { type AcceptInvitationResult } from '#db/invitations.js';
 import type { Invitation } from './entities/invitation.js';
+import type { Membership } from './entities/membership.js';
 export declare function createWorkspaceInvitation(params: {
     workspaceId: string;
     email: string;
@@ -28,6 +28,11 @@ export type PreviewInvitationResult = {
 } | {
     status: 'invalid';
 };
+export interface AcceptedWorkspaceInvitation {
+    invitation: Invitation;
+    membership: Membership;
+    alreadyMember: boolean;
+}
 export declare function previewInvitation(params: {
     token: string;
 }): Promise<PreviewInvitationResult>;
@@ -36,7 +41,21 @@ export declare function acceptWorkspaceInvitation(params: {
     userId: string;
     email: string;
     name?: string | null | undefined;
-}): Promise<AcceptInvitationResult>;
+}): Promise<AcceptedWorkspaceInvitation>;
+export type WorkspaceInvitationReconciliation = {
+    status: 'accepted' | 'already_accepted';
+    invitation: Invitation;
+    membership: Membership;
+    alreadyMember: boolean;
+} | {
+    status: 'invalid' | 'expired' | 'revoked' | 'consumed_by_another_user' | 'email_mismatch';
+};
+export declare function reconcileWorkspaceInvitationAcceptance(params: {
+    token: string;
+    userId: string;
+    email: string;
+    name?: string | null | undefined;
+}): Promise<WorkspaceInvitationReconciliation>;
 export declare function listWorkspaceInvitations(params: {
     workspaceId: string;
     requesterUserId: string;

package/dist/core/invitations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["../../src/core/invitations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAC;AAGrE,OAAO,EACL,KAAK,sBAAsB,EAO5B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAsBzD,wBAAsB,yBAAyB,CAAC,MAAM,EAAE;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,oBAAoB,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;CAC5D,GAAG,OAAO,CAAC,UAAU,CAAC,CAuBtB;AAED,wBAAsB,wBAAwB,CAAC,MAAM,EAAE;IACrD,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAElC;AAED,MAAM,MAAM,uBAAuB,GAC/B;IACE,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,SAAS,EAAE,IAAI,CAAC;CACjB,GACD;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,IAAI,CAAA;CAAC,GAC3D;IAAC,MAAM,EAAE,cAAc,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAC,GAC/C;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,CAAC;AAExB,wBAAsB,iBAAiB,CAAC,MAAM,EAAE;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAgCjG;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAClC,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA4BlC;AAED,wBAAsB,wBAAwB,CAAC,MAAM,EAAE;IACrD,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;CAC5D,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAQxB;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAC3D,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhB"}
+{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["../../src/core/invitations.ts"],"names":[],"mappings":"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"}

package/dist/core/invitations.js

@@ -1,6 +1,7 @@
+import { emailSchema } from '@shipfox/api-common-dto';
 import { generateOpaqueToken, hashOpaqueToken } from '@shipfox/node-tokens';
 import { config } from '#config.js';
-import { acceptInvitation, createInvitation, findInvitationById, findInvitationByToken, listOpenInvitationsByWorkspace, revokeInvitation } from '#db/invitations.js';
+import { createInvitation, findInvitationById, findInvitationByToken, listOpenInvitationsByWorkspace, reconcileInvitationAcceptance, revokeInvitation } from '#db/invitations.js';
 import { getWorkspaceById } from '#db/workspaces.js';
 import { InvitationEmailMismatchError, InvitationNotFoundError, InvitationWorkspaceMismatchError, TokenAlreadyUsedError, TokenExpiredError, TokenInvalidError } from './errors.js';
 import { requireWorkspaceMembership } from './workspaces.js';
@@ -13,6 +14,7 @@ function nonBlankOrFallback(value, fallback) {
     return trimmed ? trimmed : fallback;
 }
 export async function createWorkspaceInvitation(params) {
+    const email = emailSchema.parse(params.email);
     const { workspace } = await requireWorkspaceMembership({
         workspaceId: params.workspaceId,
         userId: params.invitedByUserId,
@@ -21,7 +23,7 @@ export async function createWorkspaceInvitation(params) {
     const rawToken = generateOpaqueToken('invitation');
     const invitation = await createInvitation({
         workspaceId: params.workspaceId,
-        email: params.email,
+        email,
         hashedToken: hashOpaqueToken(rawToken),
         expiresAt: daysFromNow(INVITATION_TTL_DAYS),
         invitedByUserId: params.invitedByUserId,
@@ -55,6 +57,11 @@ export async function previewInvitation(params) {
             status: 'invalid'
         };
     }
+    if (invitation.revokedAt !== null) {
+        return {
+            status: 'invalid'
+        };
+    }
     if (invitation.acceptedAt !== null) {
         return {
             status: 'already_used',
@@ -78,28 +85,58 @@ export async function previewInvitation(params) {
     };
 }
 export async function acceptWorkspaceInvitation(params) {
-    const invitation = await peekInvitationByRawToken({
-        token: params.token
+    const result = await reconcileWorkspaceInvitationAcceptance({
+        token: params.token,
+        email: params.email,
+        userId: params.userId,
+        name: params.name
     });
-    if (!invitation) {
-        throw new TokenInvalidError('Invitation token is invalid');
+    if (result.status === 'accepted') {
+        return {
+            invitation: result.invitation,
+            membership: result.membership,
+            alreadyMember: result.alreadyMember
+        };
     }
-    if (invitation.acceptedAt !== null) {
+    if (result.status === 'already_accepted' || result.status === 'consumed_by_another_user') {
         throw new TokenAlreadyUsedError();
     }
-    if (invitation.expiresAt.getTime() <= Date.now()) {
+    if (result.status === 'expired') {
         throw new TokenExpiredError();
     }
-    if (params.email !== invitation.email) {
+    if (result.status === 'email_mismatch') {
         throw new InvitationEmailMismatchError();
     }
-    const result = await acceptInvitation({
+    throw new TokenInvalidError(result.status === 'revoked' ? 'Invitation token has been revoked' : 'Invitation is invalid');
+}
+export async function reconcileWorkspaceInvitationAcceptance(params) {
+    const invitation = await peekInvitationByRawToken({
+        token: params.token
+    });
+    if (!invitation) return {
+        status: 'invalid'
+    };
+    const result = await reconcileInvitationAcceptance({
         invitationId: invitation.id,
         acceptedByUserId: params.userId,
+        email: emailSchema.parse(params.email),
         acceptedByUserName: params.name
     });
-    if (!result) {
-        throw new TokenInvalidError('Invitation is no longer valid');
+    if (result.status === 'accepted') {
+        return {
+            status: result.status,
+            invitation: result.invitation,
+            membership: result.membership,
+            alreadyMember: result.alreadyMember
+        };
+    }
+    if (result.status === 'already_accepted') {
+        return {
+            status: result.status,
+            invitation: result.invitation,
+            membership: result.membership,
+            alreadyMember: true
+        };
     }
     return result;
 }

package/dist/core/invitations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/core/invitations.ts"],"sourcesContent":["import type {UserContextMembership} from '@shipfox/api-auth-context';\nimport {generateOpaqueToken, hashOpaqueToken} from '@shipfox/node-tokens';\nimport {config} from '#config.js';\nimport {\n  type AcceptInvitationResult,\n  acceptInvitation,\n  createInvitation,\n  findInvitationById,\n  findInvitationByToken,\n  listOpenInvitationsByWorkspace,\n  revokeInvitation,\n} from '#db/invitations.js';\nimport {getWorkspaceById} from '#db/workspaces.js';\nimport type {Invitation} from './entities/invitation.js';\nimport {\n  InvitationEmailMismatchError,\n  InvitationNotFoundError,\n  InvitationWorkspaceMismatchError,\n  TokenAlreadyUsedError,\n  TokenExpiredError,\n  TokenInvalidError,\n} from './errors.js';\nimport {requireWorkspaceMembership} from './workspaces.js';\n\nconst INVITATION_TTL_DAYS = 7;\n\nfunction daysFromNow(days: number): Date {\n  return new Date(Date.now() + days * 24 * 60 * 60 * 1000);\n}\n\nfunction nonBlankOrFallback(value: string | null | undefined, fallback: string): string {\n  const trimmed = value?.trim();\n  return trimmed ? trimmed : fallback;\n}\n\nexport async function createWorkspaceInvitation(params: {\n  workspaceId: string;\n  email: string;\n  invitedByUserId: string;\n  invitedByDisplay?: string | null;\n  invitedByMemberships: ReadonlyArray<UserContextMembership>;\n}): Promise<Invitation> {\n  const {workspace} = await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.invitedByUserId,\n    memberships: params.invitedByMemberships,\n  });\n\n  const rawToken = generateOpaqueToken('invitation');\n  const invitation = await createInvitation({\n    workspaceId: params.workspaceId,\n    email: params.email,\n    hashedToken: hashOpaqueToken(rawToken),\n    expiresAt: daysFromNow(INVITATION_TTL_DAYS),\n    invitedByUserId: params.invitedByUserId,\n    invitedByDisplay: params.invitedByDisplay ?? null,\n    sendEmail: {\n      workspaceName: nonBlankOrFallback(workspace.name, 'your workspace'),\n      inviterName: nonBlankOrFallback(params.invitedByDisplay, 'A teammate'),\n      inviteLink: `${config.CLIENT_BASE_URL}/invitations/accept?token=${rawToken}`,\n    },\n  });\n\n  return invitation;\n}\n\nexport async function peekInvitationByRawToken(params: {\n  token: string;\n}): Promise<Invitation | undefined> {\n  return await findInvitationByToken({hashedToken: hashOpaqueToken(params.token)});\n}\n\nexport type PreviewInvitationResult =\n  | {\n      status: 'pending';\n      workspaceId: string;\n      workspaceName: string;\n      email: string;\n      invitedByDisplay: string | null;\n      expiresAt: Date;\n    }\n  | {status: 'expired'; workspaceName: string; expiresAt: Date}\n  | {status: 'already_used'; workspaceName: string}\n  | {status: 'invalid'};\n\nexport async function previewInvitation(params: {token: string}): Promise<PreviewInvitationResult> {\n  const invitation = await peekInvitationByRawToken({token: params.token});\n  if (!invitation) {\n    return {status: 'invalid'};\n  }\n\n  const workspace = await getWorkspaceById(invitation.workspaceId);\n  if (!workspace) {\n    // Workspace cascade-deleted — the invitation row is orphaned. Treat as invalid.\n    return {status: 'invalid'};\n  }\n\n  if (invitation.acceptedAt !== null) {\n    return {status: 'already_used', workspaceName: workspace.name};\n  }\n\n  if (invitation.expiresAt.getTime() <= Date.now()) {\n    return {\n      status: 'expired',\n      workspaceName: workspace.name,\n      expiresAt: invitation.expiresAt,\n    };\n  }\n\n  return {\n    status: 'pending',\n    workspaceId: workspace.id,\n    workspaceName: workspace.name,\n    email: invitation.email,\n    invitedByDisplay: invitation.invitedByDisplay,\n    expiresAt: invitation.expiresAt,\n  };\n}\n\nexport async function acceptWorkspaceInvitation(params: {\n  token: string;\n  userId: string;\n  email: string;\n  name?: string | null | undefined;\n}): Promise<AcceptInvitationResult> {\n  const invitation = await peekInvitationByRawToken({token: params.token});\n  if (!invitation) {\n    throw new TokenInvalidError('Invitation token is invalid');\n  }\n\n  if (invitation.acceptedAt !== null) {\n    throw new TokenAlreadyUsedError();\n  }\n\n  if (invitation.expiresAt.getTime() <= Date.now()) {\n    throw new TokenExpiredError();\n  }\n\n  if (params.email !== invitation.email) {\n    throw new InvitationEmailMismatchError();\n  }\n\n  const result = await acceptInvitation({\n    invitationId: invitation.id,\n    acceptedByUserId: params.userId,\n    acceptedByUserName: params.name,\n  });\n  if (!result) {\n    throw new TokenInvalidError('Invitation is no longer valid');\n  }\n\n  return result;\n}\n\nexport async function listWorkspaceInvitations(params: {\n  workspaceId: string;\n  requesterUserId: string;\n  requesterMemberships: ReadonlyArray<UserContextMembership>;\n}): Promise<Invitation[]> {\n  await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.requesterUserId,\n    memberships: params.requesterMemberships,\n  });\n\n  return listOpenInvitationsByWorkspace({workspaceId: params.workspaceId});\n}\n\nexport async function revokeWorkspaceInvitation(params: {\n  workspaceId: string;\n  requesterUserId: string;\n  requesterMemberships: ReadonlyArray<UserContextMembership>;\n  invitationId: string;\n}): Promise<void> {\n  await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.requesterUserId,\n    memberships: params.requesterMemberships,\n  });\n\n  const invitation = await findInvitationById({id: params.invitationId});\n  if (!invitation) {\n    throw new InvitationNotFoundError(params.invitationId);\n  }\n\n  if (invitation.workspaceId !== params.workspaceId) {\n    throw new InvitationWorkspaceMismatchError();\n  }\n\n  await revokeInvitation({invitationId: params.invitationId});\n}\n"],"names":["generateOpaqueToken","hashOpaqueToken","config","acceptInvitation","createInvitation","findInvitationById","findInvitationByToken","listOpenInvitationsByWorkspace","revokeInvitation","getWorkspaceById","InvitationEmailMismatchError","InvitationNotFoundError","InvitationWorkspaceMismatchError","TokenAlreadyUsedError","TokenExpiredError","TokenInvalidError","requireWorkspaceMembership","INVITATION_TTL_DAYS","daysFromNow","days","Date","now","nonBlankOrFallback","value","fallback","trimmed","trim","createWorkspaceInvitation","params","workspace","workspaceId","userId","invitedByUserId","memberships","invitedByMemberships","rawToken","invitation","email","hashedToken","expiresAt","invitedByDisplay","sendEmail","workspaceName","name","inviterName","inviteLink","CLIENT_BASE_URL","peekInvitationByRawToken","token","previewInvitation","status","acceptedAt","getTime","id","acceptWorkspaceInvitation","result","invitationId","acceptedByUserId","acceptedByUserName","listWorkspaceInvitations","requesterUserId","requesterMemberships","revokeWorkspaceInvitation"],"mappings":"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"}
+{"version":3,"sources":["../../src/core/invitations.ts"],"sourcesContent":["import type {UserContextMembership} from '@shipfox/api-auth-context';\nimport {emailSchema} from '@shipfox/api-common-dto';\nimport {generateOpaqueToken, hashOpaqueToken} from '@shipfox/node-tokens';\nimport {config} from '#config.js';\nimport {\n  createInvitation,\n  findInvitationById,\n  findInvitationByToken,\n  listOpenInvitationsByWorkspace,\n  reconcileInvitationAcceptance,\n  revokeInvitation,\n} from '#db/invitations.js';\nimport {getWorkspaceById} from '#db/workspaces.js';\nimport type {Invitation} from './entities/invitation.js';\nimport type {Membership} from './entities/membership.js';\nimport {\n  InvitationEmailMismatchError,\n  InvitationNotFoundError,\n  InvitationWorkspaceMismatchError,\n  TokenAlreadyUsedError,\n  TokenExpiredError,\n  TokenInvalidError,\n} from './errors.js';\nimport {requireWorkspaceMembership} from './workspaces.js';\n\nconst INVITATION_TTL_DAYS = 7;\n\nfunction daysFromNow(days: number): Date {\n  return new Date(Date.now() + days * 24 * 60 * 60 * 1000);\n}\n\nfunction nonBlankOrFallback(value: string | null | undefined, fallback: string): string {\n  const trimmed = value?.trim();\n  return trimmed ? trimmed : fallback;\n}\n\nexport async function createWorkspaceInvitation(params: {\n  workspaceId: string;\n  email: string;\n  invitedByUserId: string;\n  invitedByDisplay?: string | null;\n  invitedByMemberships: ReadonlyArray<UserContextMembership>;\n}): Promise<Invitation> {\n  const email = emailSchema.parse(params.email);\n  const {workspace} = await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.invitedByUserId,\n    memberships: params.invitedByMemberships,\n  });\n\n  const rawToken = generateOpaqueToken('invitation');\n  const invitation = await createInvitation({\n    workspaceId: params.workspaceId,\n    email,\n    hashedToken: hashOpaqueToken(rawToken),\n    expiresAt: daysFromNow(INVITATION_TTL_DAYS),\n    invitedByUserId: params.invitedByUserId,\n    invitedByDisplay: params.invitedByDisplay ?? null,\n    sendEmail: {\n      workspaceName: nonBlankOrFallback(workspace.name, 'your workspace'),\n      inviterName: nonBlankOrFallback(params.invitedByDisplay, 'A teammate'),\n      inviteLink: `${config.CLIENT_BASE_URL}/invitations/accept?token=${rawToken}`,\n    },\n  });\n\n  return invitation;\n}\n\nexport async function peekInvitationByRawToken(params: {\n  token: string;\n}): Promise<Invitation | undefined> {\n  return await findInvitationByToken({hashedToken: hashOpaqueToken(params.token)});\n}\n\nexport type PreviewInvitationResult =\n  | {\n      status: 'pending';\n      workspaceId: string;\n      workspaceName: string;\n      email: string;\n      invitedByDisplay: string | null;\n      expiresAt: Date;\n    }\n  | {status: 'expired'; workspaceName: string; expiresAt: Date}\n  | {status: 'already_used'; workspaceName: string}\n  | {status: 'invalid'};\n\nexport interface AcceptedWorkspaceInvitation {\n  invitation: Invitation;\n  membership: Membership;\n  alreadyMember: boolean;\n}\n\nexport async function previewInvitation(params: {token: string}): Promise<PreviewInvitationResult> {\n  const invitation = await peekInvitationByRawToken({token: params.token});\n  if (!invitation) {\n    return {status: 'invalid'};\n  }\n\n  const workspace = await getWorkspaceById(invitation.workspaceId);\n  if (!workspace) {\n    // Workspace cascade-deleted — the invitation row is orphaned. Treat as invalid.\n    return {status: 'invalid'};\n  }\n\n  if (invitation.revokedAt !== null) {\n    return {status: 'invalid'};\n  }\n\n  if (invitation.acceptedAt !== null) {\n    return {status: 'already_used', workspaceName: workspace.name};\n  }\n\n  if (invitation.expiresAt.getTime() <= Date.now()) {\n    return {\n      status: 'expired',\n      workspaceName: workspace.name,\n      expiresAt: invitation.expiresAt,\n    };\n  }\n\n  return {\n    status: 'pending',\n    workspaceId: workspace.id,\n    workspaceName: workspace.name,\n    email: invitation.email,\n    invitedByDisplay: invitation.invitedByDisplay,\n    expiresAt: invitation.expiresAt,\n  };\n}\n\nexport async function acceptWorkspaceInvitation(params: {\n  token: string;\n  userId: string;\n  email: string;\n  name?: string | null | undefined;\n}): Promise<AcceptedWorkspaceInvitation> {\n  const result = await reconcileWorkspaceInvitationAcceptance({\n    token: params.token,\n    email: params.email,\n    userId: params.userId,\n    name: params.name,\n  });\n  if (result.status === 'accepted') {\n    return {\n      invitation: result.invitation,\n      membership: result.membership,\n      alreadyMember: result.alreadyMember,\n    };\n  }\n  if (result.status === 'already_accepted' || result.status === 'consumed_by_another_user') {\n    throw new TokenAlreadyUsedError();\n  }\n  if (result.status === 'expired') {\n    throw new TokenExpiredError();\n  }\n  if (result.status === 'email_mismatch') {\n    throw new InvitationEmailMismatchError();\n  }\n  throw new TokenInvalidError(\n    result.status === 'revoked' ? 'Invitation token has been revoked' : 'Invitation is invalid',\n  );\n}\n\nexport type WorkspaceInvitationReconciliation =\n  | {\n      status: 'accepted' | 'already_accepted';\n      invitation: Invitation;\n      membership: Membership;\n      alreadyMember: boolean;\n    }\n  | {\n      status: 'invalid' | 'expired' | 'revoked' | 'consumed_by_another_user' | 'email_mismatch';\n    };\n\nexport async function reconcileWorkspaceInvitationAcceptance(params: {\n  token: string;\n  userId: string;\n  email: string;\n  name?: string | null | undefined;\n}): Promise<WorkspaceInvitationReconciliation> {\n  const invitation = await peekInvitationByRawToken({token: params.token});\n  if (!invitation) return {status: 'invalid'};\n\n  const result = await reconcileInvitationAcceptance({\n    invitationId: invitation.id,\n    acceptedByUserId: params.userId,\n    email: emailSchema.parse(params.email),\n    acceptedByUserName: params.name,\n  });\n  if (result.status === 'accepted') {\n    return {\n      status: result.status,\n      invitation: result.invitation,\n      membership: result.membership,\n      alreadyMember: result.alreadyMember,\n    };\n  }\n  if (result.status === 'already_accepted') {\n    return {\n      status: result.status,\n      invitation: result.invitation,\n      membership: result.membership,\n      alreadyMember: true,\n    };\n  }\n  return result;\n}\n\nexport async function listWorkspaceInvitations(params: {\n  workspaceId: string;\n  requesterUserId: string;\n  requesterMemberships: ReadonlyArray<UserContextMembership>;\n}): Promise<Invitation[]> {\n  await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.requesterUserId,\n    memberships: params.requesterMemberships,\n  });\n\n  return listOpenInvitationsByWorkspace({workspaceId: params.workspaceId});\n}\n\nexport async function revokeWorkspaceInvitation(params: {\n  workspaceId: string;\n  requesterUserId: string;\n  requesterMemberships: ReadonlyArray<UserContextMembership>;\n  invitationId: string;\n}): Promise<void> {\n  await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.requesterUserId,\n    memberships: params.requesterMemberships,\n  });\n\n  const invitation = await findInvitationById({id: params.invitationId});\n  if (!invitation) {\n    throw new InvitationNotFoundError(params.invitationId);\n  }\n\n  if (invitation.workspaceId !== params.workspaceId) {\n    throw new InvitationWorkspaceMismatchError();\n  }\n\n  await revokeInvitation({invitationId: params.invitationId});\n}\n"],"names":["emailSchema","generateOpaqueToken","hashOpaqueToken","config","createInvitation","findInvitationById","findInvitationByToken","listOpenInvitationsByWorkspace","reconcileInvitationAcceptance","revokeInvitation","getWorkspaceById","InvitationEmailMismatchError","InvitationNotFoundError","InvitationWorkspaceMismatchError","TokenAlreadyUsedError","TokenExpiredError","TokenInvalidError","requireWorkspaceMembership","INVITATION_TTL_DAYS","daysFromNow","days","Date","now","nonBlankOrFallback","value","fallback","trimmed","trim","createWorkspaceInvitation","params","email","parse","workspace","workspaceId","userId","invitedByUserId","memberships","invitedByMemberships","rawToken","invitation","hashedToken","expiresAt","invitedByDisplay","sendEmail","workspaceName","name","inviterName","inviteLink","CLIENT_BASE_URL","peekInvitationByRawToken","token","previewInvitation","status","revokedAt","acceptedAt","getTime","id","acceptWorkspaceInvitation","result","reconcileWorkspaceInvitationAcceptance","membership","alreadyMember","invitationId","acceptedByUserId","acceptedByUserName","listWorkspaceInvitations","requesterUserId","requesterMemberships","revokeWorkspaceInvitation"],"mappings":"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"}

package/dist/core/workspaces.d.ts

@@ -1,5 +1,5 @@
 import type { UserContextMembership } from '@shipfox/api-auth-context';
-import type { WorkspaceRole } from '@shipfox/api-workspaces-dto';
+import { type WorkspaceRole } from '@shipfox/api-workspaces-dto';
 import { type MembershipWithUser, type MembershipWithWorkspace } from '#db/memberships.js';
 import type { Workspace } from './entities/workspace.js';
 export interface RequireWorkspaceMembershipParams {

package/dist/core/workspaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../../src/core/workspaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAE7B,MAAM,oBAAoB,CAAC;AAI5B,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AASvD,MAAM,WAAW,gCAAgC;IAC/C,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,gCAAgC;IAC/C,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gCAAgC,CAAC,CAe3C;AAED,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACtC,GAAG,OAAO,CAAC,SAAS,CAAC,CAYrB;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAOpF;AAED,wBAAsB,4BAA4B,CAAC,MAAM,EAAE;IACzD,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAErC;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;CAC5D,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAQhC;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAC3D,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhB"}
+{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../../src/core/workspaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAEL,KAAK,aAAa,EAEnB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAE7B,MAAM,oBAAoB,CAAC;AAK5B,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AASvD,MAAM,WAAW,gCAAgC;IAC/C,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,gCAAgC;IAC/C,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gCAAgC,CAAC,CAe3C;AAED,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACtC,GAAG,OAAO,CAAC,SAAS,CAAC,CAuBrB;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAOpF;AAED,wBAAsB,4BAA4B,CAAC,MAAM,EAAE;IACzD,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAErC;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;CAC5D,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAQhC;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAC3D,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhB"}

package/dist/core/workspaces.js

@@ -1,6 +1,9 @@
+import { WORKSPACES_WORKSPACE_CREATED } from '@shipfox/api-workspaces-dto';
+import { writeOutboxEvent } from '@shipfox/node-outbox';
 import { db } from '#db/db.js';
 import { findMembership, listMembershipsByUser, listMembershipsByWorkspace, removeMembership } from '#db/memberships.js';
 import { memberships } from '#db/schema/memberships.js';
+import { workspacesOutbox } from '#db/schema/outbox.js';
 import { toWorkspace, workspaces } from '#db/schema/workspaces.js';
 import { getWorkspaceById } from '#db/workspaces.js';
 import { MembershipNotFoundError, MembershipRequiredError, SelfRemovalNotAllowedError, WorkspaceInactiveError, WorkspaceNotFoundError } from './errors.js';
@@ -35,7 +38,16 @@ export async function createWorkspaceForUser(params) {
             userName: params.userName ?? null,
             workspaceId: workspaceRow.id
         });
-        return toWorkspace(workspaceRow);
+        const workspace = toWorkspace(workspaceRow);
+        await writeOutboxEvent(tx, workspacesOutbox, {
+            type: WORKSPACES_WORKSPACE_CREATED,
+            payload: {
+                workspaceId: workspace.id,
+                name: workspace.name,
+                creatorUserId: params.userId
+            }
+        });
+        return workspace;
     });
 }
 export async function getWorkspace(params) {

package/dist/core/workspaces.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/core/workspaces.ts"],"sourcesContent":["import type {UserContextMembership} from '@shipfox/api-auth-context';\nimport type {WorkspaceRole} from '@shipfox/api-workspaces-dto';\nimport {db} from '#db/db.js';\nimport {\n  findMembership,\n  listMembershipsByUser,\n  listMembershipsByWorkspace,\n  type MembershipWithUser,\n  type MembershipWithWorkspace,\n  removeMembership,\n} from '#db/memberships.js';\nimport {memberships} from '#db/schema/memberships.js';\nimport {toWorkspace, workspaces} from '#db/schema/workspaces.js';\nimport {getWorkspaceById} from '#db/workspaces.js';\nimport type {Workspace} from './entities/workspace.js';\nimport {\n  MembershipNotFoundError,\n  MembershipRequiredError,\n  SelfRemovalNotAllowedError,\n  WorkspaceInactiveError,\n  WorkspaceNotFoundError,\n} from './errors.js';\n\nexport interface RequireWorkspaceMembershipParams {\n  workspaceId: string;\n  userId: string;\n  memberships: ReadonlyArray<UserContextMembership>;\n}\n\nexport interface RequireWorkspaceMembershipResult {\n  workspace: Workspace;\n  workspaceId: string;\n  userId: string;\n  role: WorkspaceRole;\n}\n\nexport async function requireWorkspaceMembership(\n  params: RequireWorkspaceMembershipParams,\n): Promise<RequireWorkspaceMembershipResult> {\n  const membership = params.memberships.find((m) => m.workspaceId === params.workspaceId);\n  if (!membership) {\n    throw new MembershipRequiredError(params.workspaceId);\n  }\n\n  const workspace = await getWorkspaceById(params.workspaceId);\n  if (!workspace) {\n    throw new WorkspaceNotFoundError(params.workspaceId);\n  }\n  if (workspace.status !== 'active') {\n    throw new WorkspaceInactiveError(params.workspaceId);\n  }\n\n  return {workspace, workspaceId: workspace.id, userId: params.userId, role: membership.role};\n}\n\nexport async function createWorkspaceForUser(params: {\n  name: string;\n  userId: string;\n  userEmail?: string | undefined;\n  userName?: string | null | undefined;\n}): Promise<Workspace> {\n  return await db().transaction(async (tx) => {\n    const [workspaceRow] = await tx.insert(workspaces).values({name: params.name}).returning();\n    if (!workspaceRow) throw new Error('Insert returned no rows');\n    await tx.insert(memberships).values({\n      userId: params.userId,\n      userEmail: params.userEmail ?? `user-${params.userId}@example.local`,\n      userName: params.userName ?? null,\n      workspaceId: workspaceRow.id,\n    });\n    return toWorkspace(workspaceRow);\n  });\n}\n\nexport async function getWorkspace(params: {workspaceId: string}): Promise<Workspace> {\n  const workspace = await getWorkspaceById(params.workspaceId);\n  if (!workspace) {\n    throw new WorkspaceNotFoundError(params.workspaceId);\n  }\n\n  return workspace;\n}\n\nexport async function listUserWorkspaceMemberships(params: {\n  userId: string;\n}): Promise<MembershipWithWorkspace[]> {\n  return await listMembershipsByUser({userId: params.userId});\n}\n\nexport async function listWorkspaceMembers(params: {\n  workspaceId: string;\n  requesterUserId: string;\n  requesterMemberships: ReadonlyArray<UserContextMembership>;\n}): Promise<MembershipWithUser[]> {\n  await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.requesterUserId,\n    memberships: params.requesterMemberships,\n  });\n\n  return listMembershipsByWorkspace({workspaceId: params.workspaceId});\n}\n\nexport async function removeWorkspaceMember(params: {\n  workspaceId: string;\n  requesterUserId: string;\n  requesterMemberships: ReadonlyArray<UserContextMembership>;\n  userId: string;\n}): Promise<void> {\n  await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.requesterUserId,\n    memberships: params.requesterMemberships,\n  });\n\n  if (params.userId === params.requesterUserId) {\n    throw new SelfRemovalNotAllowedError();\n  }\n\n  const target = await findMembership({userId: params.userId, workspaceId: params.workspaceId});\n  if (!target) {\n    throw new MembershipNotFoundError(params.userId, params.workspaceId);\n  }\n\n  await removeMembership({userId: params.userId, workspaceId: params.workspaceId});\n}\n"],"names":["db","findMembership","listMembershipsByUser","listMembershipsByWorkspace","removeMembership","memberships","toWorkspace","workspaces","getWorkspaceById","MembershipNotFoundError","MembershipRequiredError","SelfRemovalNotAllowedError","WorkspaceInactiveError","WorkspaceNotFoundError","requireWorkspaceMembership","params","membership","find","m","workspaceId","workspace","status","id","userId","role","createWorkspaceForUser","transaction","tx","workspaceRow","insert","values","name","returning","Error","userEmail","userName","getWorkspace","listUserWorkspaceMemberships","listWorkspaceMembers","requesterUserId","requesterMemberships","removeWorkspaceMember","target"],"mappings":"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"}
+{"version":3,"sources":["../../src/core/workspaces.ts"],"sourcesContent":["import type {UserContextMembership} from '@shipfox/api-auth-context';\nimport {\n  WORKSPACES_WORKSPACE_CREATED,\n  type WorkspaceRole,\n  type WorkspacesEventMap,\n} from '@shipfox/api-workspaces-dto';\nimport {writeOutboxEvent} from '@shipfox/node-outbox';\nimport {db} from '#db/db.js';\nimport {\n  findMembership,\n  listMembershipsByUser,\n  listMembershipsByWorkspace,\n  type MembershipWithUser,\n  type MembershipWithWorkspace,\n  removeMembership,\n} from '#db/memberships.js';\nimport {memberships} from '#db/schema/memberships.js';\nimport {workspacesOutbox} from '#db/schema/outbox.js';\nimport {toWorkspace, workspaces} from '#db/schema/workspaces.js';\nimport {getWorkspaceById} from '#db/workspaces.js';\nimport type {Workspace} from './entities/workspace.js';\nimport {\n  MembershipNotFoundError,\n  MembershipRequiredError,\n  SelfRemovalNotAllowedError,\n  WorkspaceInactiveError,\n  WorkspaceNotFoundError,\n} from './errors.js';\n\nexport interface RequireWorkspaceMembershipParams {\n  workspaceId: string;\n  userId: string;\n  memberships: ReadonlyArray<UserContextMembership>;\n}\n\nexport interface RequireWorkspaceMembershipResult {\n  workspace: Workspace;\n  workspaceId: string;\n  userId: string;\n  role: WorkspaceRole;\n}\n\nexport async function requireWorkspaceMembership(\n  params: RequireWorkspaceMembershipParams,\n): Promise<RequireWorkspaceMembershipResult> {\n  const membership = params.memberships.find((m) => m.workspaceId === params.workspaceId);\n  if (!membership) {\n    throw new MembershipRequiredError(params.workspaceId);\n  }\n\n  const workspace = await getWorkspaceById(params.workspaceId);\n  if (!workspace) {\n    throw new WorkspaceNotFoundError(params.workspaceId);\n  }\n  if (workspace.status !== 'active') {\n    throw new WorkspaceInactiveError(params.workspaceId);\n  }\n\n  return {workspace, workspaceId: workspace.id, userId: params.userId, role: membership.role};\n}\n\nexport async function createWorkspaceForUser(params: {\n  name: string;\n  userId: string;\n  userEmail?: string | undefined;\n  userName?: string | null | undefined;\n}): Promise<Workspace> {\n  return await db().transaction(async (tx) => {\n    const [workspaceRow] = await tx.insert(workspaces).values({name: params.name}).returning();\n    if (!workspaceRow) throw new Error('Insert returned no rows');\n    await tx.insert(memberships).values({\n      userId: params.userId,\n      userEmail: params.userEmail ?? `user-${params.userId}@example.local`,\n      userName: params.userName ?? null,\n      workspaceId: workspaceRow.id,\n    });\n    const workspace = toWorkspace(workspaceRow);\n\n    await writeOutboxEvent<WorkspacesEventMap>(tx, workspacesOutbox, {\n      type: WORKSPACES_WORKSPACE_CREATED,\n      payload: {\n        workspaceId: workspace.id,\n        name: workspace.name,\n        creatorUserId: params.userId,\n      },\n    });\n\n    return workspace;\n  });\n}\n\nexport async function getWorkspace(params: {workspaceId: string}): Promise<Workspace> {\n  const workspace = await getWorkspaceById(params.workspaceId);\n  if (!workspace) {\n    throw new WorkspaceNotFoundError(params.workspaceId);\n  }\n\n  return workspace;\n}\n\nexport async function listUserWorkspaceMemberships(params: {\n  userId: string;\n}): Promise<MembershipWithWorkspace[]> {\n  return await listMembershipsByUser({userId: params.userId});\n}\n\nexport async function listWorkspaceMembers(params: {\n  workspaceId: string;\n  requesterUserId: string;\n  requesterMemberships: ReadonlyArray<UserContextMembership>;\n}): Promise<MembershipWithUser[]> {\n  await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.requesterUserId,\n    memberships: params.requesterMemberships,\n  });\n\n  return listMembershipsByWorkspace({workspaceId: params.workspaceId});\n}\n\nexport async function removeWorkspaceMember(params: {\n  workspaceId: string;\n  requesterUserId: string;\n  requesterMemberships: ReadonlyArray<UserContextMembership>;\n  userId: string;\n}): Promise<void> {\n  await requireWorkspaceMembership({\n    workspaceId: params.workspaceId,\n    userId: params.requesterUserId,\n    memberships: params.requesterMemberships,\n  });\n\n  if (params.userId === params.requesterUserId) {\n    throw new SelfRemovalNotAllowedError();\n  }\n\n  const target = await findMembership({userId: params.userId, workspaceId: params.workspaceId});\n  if (!target) {\n    throw new MembershipNotFoundError(params.userId, params.workspaceId);\n  }\n\n  await removeMembership({userId: params.userId, workspaceId: params.workspaceId});\n}\n"],"names":["WORKSPACES_WORKSPACE_CREATED","writeOutboxEvent","db","findMembership","listMembershipsByUser","listMembershipsByWorkspace","removeMembership","memberships","workspacesOutbox","toWorkspace","workspaces","getWorkspaceById","MembershipNotFoundError","MembershipRequiredError","SelfRemovalNotAllowedError","WorkspaceInactiveError","WorkspaceNotFoundError","requireWorkspaceMembership","params","membership","find","m","workspaceId","workspace","status","id","userId","role","createWorkspaceForUser","transaction","tx","workspaceRow","insert","values","name","returning","Error","userEmail","userName","type","payload","creatorUserId","getWorkspace","listUserWorkspaceMemberships","listWorkspaceMembers","requesterUserId","requesterMemberships","removeWorkspaceMember","target"],"mappings":"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"}

package/dist/db/db.d.ts

@@ -324,6 +324,23 @@ export declare const schema: {
                 identity: undefined;
                 generated: undefined;
             }, {}, {}>;
+            revokedAt: import("drizzle-orm/pg-core").PgColumn<{
+                name: "revoked_at";
+                tableName: "invitations";
+                dataType: "date";
+                columnType: "PgTimestamp";
+                data: Date;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: undefined;
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
             acceptedAt: import("drizzle-orm/pg-core").PgColumn<{
                 name: "accepted_at";
                 tableName: "invitations";
@@ -949,6 +966,23 @@ export declare function db(): NodePgDatabase<{
                 identity: undefined;
                 generated: undefined;
             }, {}, {}>;
+            revokedAt: import("drizzle-orm/pg-core").PgColumn<{
+                name: "revoked_at";
+                tableName: "invitations";
+                dataType: "date";
+                columnType: "PgTimestamp";
+                data: Date;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: undefined;
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
             acceptedAt: import("drizzle-orm/pg-core").PgColumn<{
                 name: "accepted_at";
                 tableName: "invitations";

package/dist/db/db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/db/db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAOnE,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKlB,CAAC;AAIF,wBAAgB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAGjB;AAED,wBAAgB,OAAO,IAAI,IAAI,CAE9B"}
+{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/db/db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAOnE,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKlB,CAAC;AAIF,wBAAgB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAGjB;AAED,wBAAgB,OAAO,IAAI,IAAI,CAE9B"}

package/dist/db/index.d.ts

@@ -1,6 +1,6 @@
 export { closeDb, db, schema } from './db.js';
-export type { AcceptInvitationParams, AcceptInvitationResult, CreateInvitationParams, } from './invitations.js';
-export { acceptInvitation, createInvitation, findInvitationByToken, listOpenInvitationsByWorkspace, revokeInvitation, } from './invitations.js';
+export type { CreateInvitationParams } from './invitations.js';
+export { createInvitation, findInvitationByToken, listOpenInvitationsByWorkspace, revokeInvitation, } from './invitations.js';
 export type { CreateMembershipParams, MembershipWithUser, MembershipWithWorkspace, RemoveMembershipParams, } from './memberships.js';
 export { createMembership, findMembership, listMembershipsByUser, listMembershipsByWorkspace, removeMembership, } from './memberships.js';
 export { workspacesOutbox } from './schema/outbox.js';

package/dist/db/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAC,MAAM,SAAS,CAAC;AAC5C,YAAY,EACV,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,8BAA8B,EAC9B,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,sBAAsB,EACtB,kBAAkB,EAClB,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,YAAY,EACV,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,iBAAiB,CAAC;AAEzB,eAAO,MAAM,cAAc,QAAoE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAC,MAAM,SAAS,CAAC;AAC5C,YAAY,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,8BAA8B,EAC9B,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,sBAAsB,EACtB,kBAAkB,EAClB,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,YAAY,EACV,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,iBAAiB,CAAC;AAEzB,eAAO,MAAM,cAAc,QAAoE,CAAC"}

package/dist/db/index.js

@@ -1,7 +1,7 @@
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 export { closeDb, db, schema } from './db.js';
-export { acceptInvitation, createInvitation, findInvitationByToken, listOpenInvitationsByWorkspace, revokeInvitation } from './invitations.js';
+export { createInvitation, findInvitationByToken, listOpenInvitationsByWorkspace, revokeInvitation } from './invitations.js';
 export { createMembership, findMembership, listMembershipsByUser, listMembershipsByWorkspace, removeMembership } from './memberships.js';
 export { workspacesOutbox } from './schema/outbox.js';
 export { createWorkspace, getWorkspaceById, getWorkspaceServiceMetrics, updateWorkspace } from './workspaces.js';

package/dist/db/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/db/index.ts"],"sourcesContent":["import {dirname, resolve} from 'node:path';\nimport {fileURLToPath} from 'node:url';\n\nexport {closeDb, db, schema} from './db.js';\nexport type {\n  AcceptInvitationParams,\n  AcceptInvitationResult,\n  CreateInvitationParams,\n} from './invitations.js';\nexport {\n  acceptInvitation,\n  createInvitation,\n  findInvitationByToken,\n  listOpenInvitationsByWorkspace,\n  revokeInvitation,\n} from './invitations.js';\nexport type {\n  CreateMembershipParams,\n  MembershipWithUser,\n  MembershipWithWorkspace,\n  RemoveMembershipParams,\n} from './memberships.js';\nexport {\n  createMembership,\n  findMembership,\n  listMembershipsByUser,\n  listMembershipsByWorkspace,\n  removeMembership,\n} from './memberships.js';\nexport {workspacesOutbox} from './schema/outbox.js';\nexport type {\n  CreateWorkspaceParams,\n  UpdateWorkspaceParams,\n  WorkspaceServiceMetrics,\n} from './workspaces.js';\nexport {\n  createWorkspace,\n  getWorkspaceById,\n  getWorkspaceServiceMetrics,\n  updateWorkspace,\n} from './workspaces.js';\n\nexport const migrationsPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../drizzle');\n"],"names":["dirname","resolve","fileURLToPath","closeDb","db","schema","acceptInvitation","createInvitation","findInvitationByToken","listOpenInvitationsByWorkspace","revokeInvitation","createMembership","findMembership","listMembershipsByUser","listMembershipsByWorkspace","removeMembership","workspacesOutbox","createWorkspace","getWorkspaceById","getWorkspaceServiceMetrics","updateWorkspace","migrationsPath","url"],"mappings":"AAAA,SAAQA,OAAO,EAAEC,OAAO,QAAO,YAAY;AAC3C,SAAQC,aAAa,QAAO,WAAW;AAEvC,SAAQC,OAAO,EAAEC,EAAE,EAAEC,MAAM,QAAO,UAAU;AAM5C,SACEC,gBAAgB,EAChBC,gBAAgB,EAChBC,qBAAqB,EACrBC,8BAA8B,EAC9BC,gBAAgB,QACX,mBAAmB;AAO1B,SACEC,gBAAgB,EAChBC,cAAc,EACdC,qBAAqB,EACrBC,0BAA0B,EAC1BC,gBAAgB,QACX,mBAAmB;AAC1B,SAAQC,gBAAgB,QAAO,qBAAqB;AAMpD,SACEC,eAAe,EACfC,gBAAgB,EAChBC,0BAA0B,EAC1BC,eAAe,QACV,kBAAkB;AAEzB,OAAO,MAAMC,iBAAiBpB,QAAQD,QAAQE,cAAc,YAAYoB,GAAG,IAAI,iBAAiB"}
+{"version":3,"sources":["../../src/db/index.ts"],"sourcesContent":["import {dirname, resolve} from 'node:path';\nimport {fileURLToPath} from 'node:url';\n\nexport {closeDb, db, schema} from './db.js';\nexport type {CreateInvitationParams} from './invitations.js';\nexport {\n  createInvitation,\n  findInvitationByToken,\n  listOpenInvitationsByWorkspace,\n  revokeInvitation,\n} from './invitations.js';\nexport type {\n  CreateMembershipParams,\n  MembershipWithUser,\n  MembershipWithWorkspace,\n  RemoveMembershipParams,\n} from './memberships.js';\nexport {\n  createMembership,\n  findMembership,\n  listMembershipsByUser,\n  listMembershipsByWorkspace,\n  removeMembership,\n} from './memberships.js';\nexport {workspacesOutbox} from './schema/outbox.js';\nexport type {\n  CreateWorkspaceParams,\n  UpdateWorkspaceParams,\n  WorkspaceServiceMetrics,\n} from './workspaces.js';\nexport {\n  createWorkspace,\n  getWorkspaceById,\n  getWorkspaceServiceMetrics,\n  updateWorkspace,\n} from './workspaces.js';\n\nexport const migrationsPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../drizzle');\n"],"names":["dirname","resolve","fileURLToPath","closeDb","db","schema","createInvitation","findInvitationByToken","listOpenInvitationsByWorkspace","revokeInvitation","createMembership","findMembership","listMembershipsByUser","listMembershipsByWorkspace","removeMembership","workspacesOutbox","createWorkspace","getWorkspaceById","getWorkspaceServiceMetrics","updateWorkspace","migrationsPath","url"],"mappings":"AAAA,SAAQA,OAAO,EAAEC,OAAO,QAAO,YAAY;AAC3C,SAAQC,aAAa,QAAO,WAAW;AAEvC,SAAQC,OAAO,EAAEC,EAAE,EAAEC,MAAM,QAAO,UAAU;AAE5C,SACEC,gBAAgB,EAChBC,qBAAqB,EACrBC,8BAA8B,EAC9BC,gBAAgB,QACX,mBAAmB;AAO1B,SACEC,gBAAgB,EAChBC,cAAc,EACdC,qBAAqB,EACrBC,0BAA0B,EAC1BC,gBAAgB,QACX,mBAAmB;AAC1B,SAAQC,gBAAgB,QAAO,qBAAqB;AAMpD,SACEC,eAAe,EACfC,gBAAgB,EAChBC,0BAA0B,EAC1BC,eAAe,QACV,kBAAkB;AAEzB,OAAO,MAAMC,iBAAiBnB,QAAQD,QAAQE,cAAc,YAAYmB,GAAG,IAAI,iBAAiB"}

package/dist/db/invitations.d.ts

@@ -32,16 +32,23 @@ export declare function listOpenInvitationsByWorkspace(params: {
 export declare function revokeInvitation(params: {
     invitationId: string;
 }): Promise<void>;
-export interface AcceptInvitationParams {
-    invitationId: string;
-    acceptedByUserId: string;
-    acceptedByUserName?: string | null | undefined;
-}
-export interface AcceptInvitationResult {
+export type ReconcileInvitationAcceptanceResult = {
+    status: 'accepted';
     invitation: Invitation;
     membership: Membership;
     alreadyMember: boolean;
-}
-export declare function acceptInvitation(params: AcceptInvitationParams): Promise<AcceptInvitationResult | undefined>;
+} | {
+    status: 'already_accepted';
+    invitation: Invitation;
+    membership: Membership;
+} | {
+    status: 'invalid' | 'expired' | 'revoked' | 'consumed_by_another_user' | 'email_mismatch';
+};
+export declare function reconcileInvitationAcceptance(params: {
+    invitationId: string;
+    acceptedByUserId: string;
+    email: string;
+    acceptedByUserName?: string | null | undefined;
+}): Promise<ReconcileInvitationAcceptanceResult>;
 export {};
 //# sourceMappingURL=invitations.d.ts.map