@shipfox/api-integration-jira 5.0.0 → 7.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/api-integration-jira",
   "license": "MIT",
-  "version": "5.0.0",
+  "version": "7.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -24,25 +24,23 @@
   "dependencies": {
     "drizzle-orm": "^0.45.2",
     "ky": "^2.0.0",
-    "@shipfox/api-auth-context": "5.0.0",
-    "@shipfox/api-integration-core-dto": "5.0.0",
-    "@shipfox/api-integration-jira-dto": "5.0.0",
-    "@shipfox/api-workspaces": "5.0.0",
+    "@shipfox/api-auth-context": "6.0.0",
+    "@shipfox/api-integration-core-dto": "6.0.0",
+    "@shipfox/api-integration-jira-dto": "6.0.0",
+    "@shipfox/api-workspaces": "7.0.1",
     "@shipfox/config": "1.2.2",
-    "@shipfox/node-drizzle": "0.3.1",
-    "@shipfox/node-fastify": "0.2.3",
+    "@shipfox/node-drizzle": "0.3.2",
+    "@shipfox/node-fastify": "0.2.4",
     "@shipfox/node-opentelemetry": "0.5.2",
     "@shipfox/node-postgres": "0.4.2"
   },
-  "peerDependencies": {
-    "@shipfox/api-secrets": "5.0.0"
-  },
   "devDependencies": {
     "@types/pg": "^8.15.5",
     "drizzle-kit": "^0.31.10",
     "fastify": "^5.3.3",
     "fishery": "^2.4.0",
     "@shipfox/biome": "1.8.2",
+    "@shipfox/depcruise": "1.0.2",
     "@shipfox/swc": "1.2.6",
     "@shipfox/ts-config": "1.3.8",
     "@shipfox/typescript": "1.1.7",
@@ -52,6 +50,7 @@
     "build": "shipfox-swc",
     "check": "shipfox-biome-check",
     "check:fix": "shipfox-biome-check --write",
+    "depcruise": "shipfox-depcruise",
     "test": "shipfox-vitest-run",
     "test:watch": "shipfox-vitest-watch",
     "type": "shipfox-tsc-check",

package/src/core/tokens.test.ts

@@ -8,8 +8,8 @@ import {
 
 let secrets: JiraSecretsStore;
 
-beforeAll(async () => {
-  secrets = await import('@shipfox/api-secrets');
+beforeEach(() => {
+  secrets = createInMemorySecretsStore();
 });
 
 function createConnectionContext() {
@@ -35,6 +35,20 @@ function storedToken(input: {
   });
 }
 
+function createInMemorySecretsStore(): JiraSecretsStore {
+  const values = new Map<string, string>();
+  const id = (params: {workspaceId: string; namespace: string; key: string}) =>
+    `${params.workspaceId}\0${params.namespace}\0${params.key}`;
+  return {
+    getSecret: async (params) => values.get(id(params)) ?? null,
+    setSecrets: async (params) => {
+      await Promise.resolve();
+      for (const [key, value] of Object.entries(params.values))
+        values.set(id({...params, key}), value);
+    },
+  };
+}
+
 describe('createJiraTokenStore.storeTokens', () => {
   it('stores access and refresh tokens in the Jira system namespace', async () => {
     const {workspaceId, connectionId, store} = createConnectionContext();

package/src/presentation/routes/install.ts

@@ -12,7 +12,6 @@ import {
   jiraCallbackQuerySchema,
   jiraCallbackResponseSchema,
 } from '@shipfox/api-integration-jira-dto';
-import {requireWorkspaceMembership} from '@shipfox/api-workspaces';
 import {defineRoute, type RouteGroup} from '@shipfox/node-fastify';
 import type {JiraApiClient} from '#api/client.js';
 import {config} from '#config.js';
@@ -41,11 +40,18 @@ export interface CreateJiraIntegrationRoutesOptions {
   ): Promise<IntegrationConnection<'jira'>>;
   disconnectJiraInstallation(input: {connectionId: string}): Promise<void>;
   connectionCapabilities: IntegrationCapability[];
+  requireActiveWorkspaceMembership?: (input: {
+    workspaceId: string;
+    userId: string;
+    memberships: ReadonlyArray<import('@shipfox/api-auth-context').UserContextMembership>;
+  }) => Promise<unknown>;
 }
 
 export function createJiraIntegrationRoutes(
   options: CreateJiraIntegrationRoutesOptions,
 ): RouteGroup {
+  const requireMembership =
+    options.requireActiveWorkspaceMembership ?? unavailableWorkspaceMembershipCheck;
   const installRoute = defineRoute({
     method: 'POST',
     path: '/install',
@@ -87,7 +93,7 @@ export function createJiraIntegrationRoutes(
           errorDescription: query.error_description,
           sessionUserId: actor.userId,
           sessionMemberships: actor.memberships,
-          requireWorkspaceMembership,
+          requireWorkspaceMembership: requireMembership,
         });
       const result = await handleJiraCallback({
         ...options,
@@ -95,7 +101,7 @@ export function createJiraIntegrationRoutes(
         state: query.state,
         sessionUserId: actor.userId,
         sessionMemberships: actor.memberships,
-        requireWorkspaceMembership,
+        requireWorkspaceMembership: requireMembership,
       });
       return 'sites' in result
         ? {
@@ -127,7 +133,7 @@ export function createJiraIntegrationRoutes(
         state: request.body.state,
         sessionUserId: actor.userId,
         sessionMemberships: actor.memberships,
-        requireWorkspaceMembership,
+        requireWorkspaceMembership: requireMembership,
       });
       return toIntegrationConnectionDto(connection, {capabilities: options.connectionCapabilities});
     },
@@ -138,6 +144,14 @@ export function createJiraIntegrationRoutes(
   };
 }
 
+function unavailableWorkspaceMembershipCheck(_input: {
+  workspaceId: string;
+  userId: string;
+  memberships: ReadonlyArray<import('@shipfox/api-auth-context').UserContextMembership>;
+}): Promise<never> {
+  return Promise.reject(new Error('Workspaces inter-module client is not configured'));
+}
+
 function isJiraOAuthErrorCallback(query: JiraCallbackQueryDto): query is JiraCallbackQueryDto & {
   error: string;
   error_description?: string | undefined;

package/test/globalSetup.ts

@@ -8,15 +8,6 @@ export async function setup() {
   createPostgresClient();
 
   await runMigrations(db(), migrationsPath, '__drizzle_migrations_integrations_jira');
-  const {secretsModule} = await import('@shipfox/api-secrets');
-  if (!secretsModule.database || Array.isArray(secretsModule.database)) {
-    throw new Error('Secrets module database is not configured');
-  }
-  await runMigrations(
-    secretsModule.database.db(),
-    secretsModule.database.migrationsPath,
-    '__drizzle_migrations_secrets',
-  );
 
   closeDb();
   await closePostgresClient();