@friggframework/core 2.0.0--canary.548.c8ae0ca.0 → 2.0.0--canary.545.c40eca4.0

package/user/use-cases/authenticate-user.js

@@ -2,12 +2,12 @@ const Boom = require('@hapi/boom');
 
 /**
  * Use case for authenticating a user using multiple authentication strategies.
- * 
+ *
  * Supports three authentication modes in priority order:
  * 1. Shared Secret (backend-to-backend with x-frigg-api-key + x-frigg headers)
  * 2. Adopter JWT (custom JWT authentication)
  * 3. Frigg Native Token (bearer token from /user/login)
- * 
+ *
  * x-frigg-appUserId and x-frigg-appOrgId headers are automatically supported
  * for user identification with any auth mode. When present with JWT or Frigg
  * tokens, they are validated to match the authenticated user.
@@ -123,5 +123,3 @@ class AuthenticateUser {
 }
 
 module.exports = { AuthenticateUser };
-
-

package/user/use-cases/authenticate-with-shared-secret.js

@@ -33,7 +33,7 @@ class AuthenticateWithSharedSecret {
         if (!expectedSecret) {
             throw Boom.badImplementation(
                 'FRIGG_API_KEY environment variable is not configured. ' +
-                'Set FRIGG_API_KEY to enable shared secret authentication.'
+                    'Set FRIGG_API_KEY to enable shared secret authentication.'
             );
         }
 

package/user/use-cases/create-individual-user.js

@@ -39,13 +39,14 @@ class CreateIndividualUser {
         const appUserId = get(params, 'appUserId', null);
         const organizationUserId = get(params, 'organizationUserId', null);
 
-        const individualUserData = await this.userRepository.createIndividualUser({
-            email,
-            username,
-            hashword,
-            appUserId,
-            organizationUser: organizationUserId,
-        });
+        const individualUserData =
+            await this.userRepository.createIndividualUser({
+                email,
+                username,
+                hashword,
+                appUserId,
+                organizationUser: organizationUserId,
+            });
 
         return new User(
             individualUserData,

package/user/use-cases/create-organization-user.js

@@ -44,4 +44,4 @@ class CreateOrganizationUser {
     }
 }
 
-module.exports = { CreateOrganizationUser }; 
+module.exports = { CreateOrganizationUser };

package/user/use-cases/create-token-for-user-id.js

@@ -27,4 +27,4 @@ class CreateTokenForUserId {
     }
 }
 
-module.exports = { CreateTokenForUserId }; 
+module.exports = { CreateTokenForUserId };

package/user/use-cases/delete-user.js

@@ -0,0 +1,47 @@
+const { get } = require('../../assertions');
+const Boom = require('@hapi/boom');
+
+/**
+ * Use case for deleting a user.
+ * @class DeleteUser
+ */
+class DeleteUser {
+    /**
+     * Creates a new DeleteUser instance.
+     * @param {Object} params - Configuration parameters.
+     * @param {import('../repositories/user-repository-interface').UserRepositoryInterface} params.userRepository - Repository for user data operations.
+     */
+    constructor({ userRepository }) {
+        this.userRepository = userRepository;
+    }
+
+    /**
+     * Executes the use case.
+     * @async
+     * @param {string} userId - The ID of the user to delete.
+     * @returns {Promise<boolean>} True if user was deleted successfully.
+     * @throws {Boom} If userId is not provided or user not found.
+     */
+    async execute(userId) {
+        if (!userId) {
+            throw Boom.badRequest('userId is required');
+        }
+
+        // First check if user exists
+        const user = await this.userRepository.findUserById(userId);
+        if (!user) {
+            throw Boom.notFound(`User with id ${userId} not found`);
+        }
+
+        // Delete the user
+        const deleted = await this.userRepository.deleteUser(userId);
+
+        if (!deleted) {
+            throw Boom.internal(`Failed to delete user with id ${userId}`);
+        }
+
+        return true;
+    }
+}
+
+module.exports = { DeleteUser };

package/user/use-cases/get-user-from-adopter-jwt.js

@@ -145,5 +145,3 @@ class GetUserFromAdopterJwt {
 }
 
 module.exports = { GetUserFromAdopterJwt };
-
-

package/user/use-cases/get-user-from-bearer-token.js

@@ -41,7 +41,10 @@ class GetUserFromBearerToken {
         }
 
         if (this.userConfig.primary === 'organization') {
-            const organizationUserData = await this.userRepository.findOrganizationUserById(sessionToken.user);
+            const organizationUserData =
+                await this.userRepository.findOrganizationUserById(
+                    sessionToken.user
+                );
 
             if (!organizationUserData) {
                 throw Boom.unauthorized('Organization User Not Found');
@@ -57,7 +60,8 @@ class GetUserFromBearerToken {
             );
         }
 
-        const individualUserData = await this.userRepository.findIndividualUserById(sessionToken.user);
+        const individualUserData =
+            await this.userRepository.findIndividualUserById(sessionToken.user);
 
         if (!individualUserData) {
             throw Boom.unauthorized('Individual User Not Found');
@@ -74,4 +78,4 @@ class GetUserFromBearerToken {
     }
 }
 
-module.exports = { GetUserFromBearerToken }; 
+module.exports = { GetUserFromBearerToken };

package/user/use-cases/get-user-from-x-frigg-headers.js

@@ -76,10 +76,11 @@ class GetUserFromXFriggHeaders {
                 }
 
                 // Auto-link the users
-                individualUserData = await this.userRepository.linkIndividualToOrganization(
-                    individualUserData.id,
-                    organizationUserData.id
-                );
+                individualUserData =
+                    await this.userRepository.linkIndividualToOrganization(
+                        individualUserData.id,
+                        organizationUserData.id
+                    );
             }
         }
 
@@ -89,12 +90,13 @@ class GetUserFromXFriggHeaders {
             appUserId &&
             this.userConfig.individualUserRequired !== false
         ) {
-            individualUserData =
-                await this.userRepository.createIndividualUser({
+            individualUserData = await this.userRepository.createIndividualUser(
+                {
                     appUserId,
                     username: `app-user-${appUserId}`,
                     email: `${appUserId}@app.local`,
-                });
+                }
+            );
         }
 
         if (
@@ -109,10 +111,11 @@ class GetUserFromXFriggHeaders {
 
             // Link individual user to newly created org user if individual exists
             if (individualUserData && organizationUserData) {
-                individualUserData = await this.userRepository.linkIndividualToOrganization(
-                    individualUserData.id,
-                    organizationUserData.id
-                );
+                individualUserData =
+                    await this.userRepository.linkIndividualToOrganization(
+                        individualUserData.id,
+                        organizationUserData.id
+                    );
             }
         }
 

package/user/use-cases/login-user.js

@@ -1,7 +1,5 @@
 const Boom = require('@hapi/boom');
-const {
-    RequiredPropertyError,
-} = require('../../errors');
+const { RequiredPropertyError } = require('../../errors');
 const { User } = require('../user');
 
 /**
@@ -93,11 +91,11 @@ class LoginUser {
             }
         }
 
-
         if (this.userConfig.organizationUserRequired) {
-
             const organizationUserData =
-                await this.userRepository.findOrganizationUserByAppOrgId(appOrgId);
+                await this.userRepository.findOrganizationUserByAppOrgId(
+                    appOrgId
+                );
 
             if (!organizationUserData) {
                 throw Boom.unauthorized(`org user ${appOrgId} not found`);
@@ -115,8 +113,10 @@ class LoginUser {
             return organizationUser;
         }
 
-        throw new Error('User configuration must require either individualUserRequired or organizationUserRequired');
+        throw new Error(
+            'User configuration must require either individualUserRequired or organizationUserRequired'
+        );
     }
 }
 
-module.exports = { LoginUser }; 
+module.exports = { LoginUser };

package/user/user.js

@@ -14,7 +14,14 @@ class User {
      * @param {boolean} [individualUserRequired=true] - Whether the user is required to have an individual user.
      * @param {boolean} [organizationUserRequired=false] - Whether the user is required to have an organization user.
      */
-    constructor(individualUser = null, organizationUser = null, usePassword = false, primary = 'individual', individualUserRequired = true, organizationUserRequired = false) {
+    constructor(
+        individualUser = null,
+        organizationUser = null,
+        usePassword = false,
+        primary = 'individual',
+        individualUserRequired = true,
+        organizationUserRequired = false
+    ) {
         this.individualUser = individualUser;
         this.organizationUser = organizationUser;
         this.usePassword = usePassword;
@@ -109,12 +116,19 @@ class User {
         }
 
         // When primary is 'organization', also check linked individual user
-        if (this.config.primary === 'organization' && userIdStr === individualId) {
+        if (
+            this.config.primary === 'organization' &&
+            userIdStr === individualId
+        ) {
             return true;
         }
 
         // When primary is 'individual', also check linked organization user if required
-        if (this.config.primary === 'individual' && this.config.organizationUserRequired && userIdStr === organizationId) {
+        if (
+            this.config.primary === 'individual' &&
+            this.config.organizationUserRequired &&
+            userIdStr === organizationId
+        ) {
             return true;
         }
 
@@ -122,4 +136,4 @@ class User {
     }
 }
 
-module.exports = { User }; 
+module.exports = { User };

package/utils/backend-path.js

@@ -4,7 +4,7 @@ const PACKAGE_JSON = 'package.json';
 
 function findNearestBackendPackageJson() {
     let currentDir = process.cwd();
-    
+
     // First check if we're in production by looking for package.json in the current directory
     const rootPackageJson = path.join(currentDir, PACKAGE_JSON);
     if (fs.existsSync(rootPackageJson)) {
@@ -35,4 +35,4 @@ function validateBackendPath(backendPath) {
 module.exports = {
     findNearestBackendPackageJson,
     validateBackendPath,
-}; 
+};

package/utils/index.js

@@ -1,4 +1,7 @@
-const { findNearestBackendPackageJson, validateBackendPath } = require('./backend-path');
+const {
+    findNearestBackendPackageJson,
+    validateBackendPath,
+} = require('./backend-path');
 
 module.exports = {
     findNearestBackendPackageJson,

package/websocket/repositories/websocket-connection-repository-documentdb.js

@@ -1,8 +1,7 @@
 const { prisma } = require('../../database/prisma');
 const {
-    ApiGatewayManagementApiClient,
-    PostToConnectionCommand,
-} = require('@aws-sdk/client-apigatewaymanagementapi');
+    StaleConnectionError,
+} = require('../websocket-message-sender-interface');
 const {
     toObjectId,
     fromObjectId,
@@ -16,10 +15,19 @@ const {
     WebsocketConnectionRepositoryInterface,
 } = require('./websocket-connection-repository-interface');
 
+/**
+ * DocumentDB WebSocket Connection Repository Adapter
+ *
+ * BREAKING CHANGE (v3): A messageSender must be explicitly provided for
+ * WebSocket send functionality. For AWS API Gateway, pass
+ * `new ApiGatewayMessageSender()` from @friggframework/provider-aws.
+ * See docs/architecture-decisions/010-decouple-aws-from-core.md for migration guide.
+ */
 class WebsocketConnectionRepositoryDocumentDB extends WebsocketConnectionRepositoryInterface {
-    constructor() {
+    constructor(messageSender = null) {
         super();
         this.prisma = prisma;
+        this._messageSender = messageSender;
     }
 
     async createConnection(connectionId) {
@@ -29,13 +37,21 @@ class WebsocketConnectionRepositoryDocumentDB extends WebsocketConnectionReposit
             createdAt: now,
             updatedAt: now,
         };
-        const insertedId = await insertOne(this.prisma, 'WebsocketConnection', document);
-        const created = await findOne(this.prisma, 'WebsocketConnection', { _id: insertedId });
+        const insertedId = await insertOne(
+            this.prisma,
+            'WebsocketConnection',
+            document
+        );
+        const created = await findOne(this.prisma, 'WebsocketConnection', {
+            _id: insertedId,
+        });
         return this._mapConnection(created);
     }
 
     async deleteConnection(connectionId) {
-        const result = await deleteOne(this.prisma, 'WebsocketConnection', { connectionId });
+        const result = await deleteOne(this.prisma, 'WebsocketConnection', {
+            connectionId,
+        });
         const deleted = result?.n ?? 0;
         return { acknowledged: true, deletedCount: deleted };
     }
@@ -52,21 +68,28 @@ class WebsocketConnectionRepositoryDocumentDB extends WebsocketConnectionReposit
             { projection: { connectionId: 1 } }
         );
 
+        if (!this._messageSender) {
+            throw new Error(
+                'WebsocketConnectionRepositoryDocumentDB requires a messageSender for send functionality.\n' +
+                'Pass one via constructor, e.g.:\n' +
+                '  const { ApiGatewayMessageSender } = require("@friggframework/provider-aws");\n' +
+                '  new WebsocketConnectionRepositoryDocumentDB(new ApiGatewayMessageSender())\n' +
+                'See docs/architecture-decisions/010-decouple-aws-from-core.md for migration guide.'
+            );
+        }
+        const sender = this._messageSender;
+
         return connections.map((conn) => ({
             connectionId: conn.connectionId,
             send: async (data) => {
-                const apigwManagementApi = new ApiGatewayManagementApiClient({
-                    endpoint: process.env.WEBSOCKET_API_ENDPOINT,
-                });
-
                 try {
-                    const command = new PostToConnectionCommand({
-                        ConnectionId: conn.connectionId,
-                        Data: JSON.stringify(data),
-                    });
-                    await apigwManagementApi.send(command);
+                    await sender.send(
+                        conn.connectionId,
+                        data,
+                        process.env.WEBSOCKET_API_ENDPOINT
+                    );
                 } catch (error) {
-                    if (error.statusCode === 410 || error.$metadata?.httpStatusCode === 410) {
+                    if (error instanceof StaleConnectionError) {
                         console.log(`Stale connection ${conn.connectionId}`);
                         await deleteMany(this.prisma, 'WebsocketConnection', {
                             connectionId: conn.connectionId,
@@ -80,14 +103,18 @@ class WebsocketConnectionRepositoryDocumentDB extends WebsocketConnectionReposit
     }
 
     async findConnection(connectionId) {
-        const doc = await findOne(this.prisma, 'WebsocketConnection', { connectionId });
+        const doc = await findOne(this.prisma, 'WebsocketConnection', {
+            connectionId,
+        });
         return doc ? this._mapConnection(doc) : null;
     }
 
     async findConnectionById(id) {
         const objectId = toObjectId(id);
         if (!objectId) return null;
-        const doc = await findOne(this.prisma, 'WebsocketConnection', { _id: objectId });
+        const doc = await findOne(this.prisma, 'WebsocketConnection', {
+            _id: objectId,
+        });
         return doc ? this._mapConnection(doc) : null;
     }
 
@@ -115,5 +142,3 @@ class WebsocketConnectionRepositoryDocumentDB extends WebsocketConnectionReposit
 }
 
 module.exports = { WebsocketConnectionRepositoryDocumentDB };
-
-

package/websocket/repositories/websocket-connection-repository-factory.js

@@ -1,12 +1,6 @@
-const {
-    WebsocketConnectionRepositoryMongo,
-} = require('./websocket-connection-repository-mongo');
 const {
     WebsocketConnectionRepositoryPostgres,
 } = require('./websocket-connection-repository-postgres');
-const {
-    WebsocketConnectionRepositoryDocumentDB,
-} = require('./websocket-connection-repository-documentdb');
 const config = require('../../database/config');
 
 /**
@@ -20,12 +14,14 @@ function createWebsocketConnectionRepository() {
 
     switch (dbType) {
         case 'mongodb':
+            const { WebsocketConnectionRepositoryMongo } = require('./websocket-connection-repository-mongo');
             return new WebsocketConnectionRepositoryMongo();
 
         case 'postgresql':
             return new WebsocketConnectionRepositoryPostgres();
 
         case 'documentdb':
+            const { WebsocketConnectionRepositoryDocumentDB } = require('./websocket-connection-repository-documentdb');
             return new WebsocketConnectionRepositoryDocumentDB();
 
         default:
@@ -38,7 +34,7 @@ function createWebsocketConnectionRepository() {
 module.exports = {
     createWebsocketConnectionRepository,
     // Export adapters for direct testing
-    WebsocketConnectionRepositoryMongo,
+    get WebsocketConnectionRepositoryMongo() { return require('./websocket-connection-repository-mongo').WebsocketConnectionRepositoryMongo; },
     WebsocketConnectionRepositoryPostgres,
-    WebsocketConnectionRepositoryDocumentDB,
+    get WebsocketConnectionRepositoryDocumentDB() { return require('./websocket-connection-repository-documentdb').WebsocketConnectionRepositoryDocumentDB; },
 };

package/websocket/repositories/websocket-connection-repository-mongo.js

@@ -1,8 +1,7 @@
 const { prisma } = require('../../database/prisma');
 const {
-    ApiGatewayManagementApiClient,
-    PostToConnectionCommand,
-} = require('@aws-sdk/client-apigatewaymanagementapi');
+    StaleConnectionError,
+} = require('../websocket-message-sender-interface');
 const {
     WebsocketConnectionRepositoryInterface,
 } = require('./websocket-connection-repository-interface');
@@ -14,12 +13,17 @@ const {
  * MongoDB-specific characteristics:
  * - Uses String IDs (ObjectId)
  * - No ID conversion needed (IDs are already strings)
- * - AWS API Gateway Management API integration preserved
+ *
+ * BREAKING CHANGE (v3): A messageSender must be explicitly provided for
+ * WebSocket send functionality. For AWS API Gateway, pass
+ * `new ApiGatewayMessageSender()` from @friggframework/provider-aws.
+ * See docs/architecture-decisions/010-decouple-aws-from-core.md for migration guide.
  */
 class WebsocketConnectionRepositoryMongo extends WebsocketConnectionRepositoryInterface {
-    constructor() {
+    constructor(messageSender = null) {
         super();
         this.prisma = prisma;
+        this._messageSender = messageSender;
     }
 
     /**
@@ -74,25 +78,31 @@ class WebsocketConnectionRepositoryMongo extends WebsocketConnectionRepositoryIn
                 select: { connectionId: true },
             });
 
+            if (!this._messageSender) {
+                throw new Error(
+                    'WebsocketConnectionRepositoryMongo requires a messageSender for send functionality.\n' +
+                    'Pass one via constructor, e.g.:\n' +
+                    '  const { ApiGatewayMessageSender } = require("@friggframework/provider-aws");\n' +
+                    '  new WebsocketConnectionRepositoryMongo(new ApiGatewayMessageSender())\n' +
+                    'See docs/architecture-decisions/010-decouple-aws-from-core.md for migration guide.'
+                );
+            }
+            const sender = this._messageSender;
+
             return connections.map((conn) => ({
                 connectionId: conn.connectionId,
                 send: async (data) => {
-                    const apigwManagementApi = new ApiGatewayManagementApiClient({
-                        endpoint: process.env.WEBSOCKET_API_ENDPOINT,
-                    });
-
                     try {
-                        const command = new PostToConnectionCommand({
-                            ConnectionId: conn.connectionId,
-                            Data: JSON.stringify(data),
-                        });
-                        await apigwManagementApi.send(command);
+                        await sender.send(
+                            conn.connectionId,
+                            data,
+                            process.env.WEBSOCKET_API_ENDPOINT
+                        );
                     } catch (error) {
-                        if (error.statusCode === 410 || error.$metadata?.httpStatusCode === 410) {
+                        if (error instanceof StaleConnectionError) {
                             console.log(
                                 `Stale connection ${conn.connectionId}`
                             );
-                            // Delete stale connection
                             await this.prisma.websocketConnection.deleteMany({
                                 where: { connectionId: conn.connectionId },
                             });

package/websocket/repositories/websocket-connection-repository-postgres.js

@@ -1,8 +1,7 @@
 const { prisma } = require('../../database/prisma');
 const {
-    ApiGatewayManagementApiClient,
-    PostToConnectionCommand,
-} = require('@aws-sdk/client-apigatewaymanagementapi');
+    StaleConnectionError,
+} = require('../websocket-message-sender-interface');
 const {
     WebsocketConnectionRepositoryInterface,
 } = require('./websocket-connection-repository-interface');
@@ -15,11 +14,17 @@ const {
  * - Uses Int IDs with autoincrement
  * - Requires ID conversion: String (app layer) ↔ Int (database)
  * - All returned IDs are converted to strings for application layer consistency
+ *
+ * BREAKING CHANGE (v3): A messageSender must be explicitly provided for
+ * WebSocket send functionality. For AWS API Gateway, pass
+ * `new ApiGatewayMessageSender()` from @friggframework/provider-aws.
+ * See docs/architecture-decisions/010-decouple-aws-from-core.md for migration guide.
  */
 class WebsocketConnectionRepositoryPostgres extends WebsocketConnectionRepositoryInterface {
-    constructor() {
+    constructor(messageSender = null) {
         super();
         this.prisma = prisma;
+        this._messageSender = messageSender;
     }
 
     /**
@@ -108,25 +113,31 @@ class WebsocketConnectionRepositoryPostgres extends WebsocketConnectionRepositor
                 select: { connectionId: true },
             });
 
+            if (!this._messageSender) {
+                throw new Error(
+                    'WebsocketConnectionRepositoryPostgres requires a messageSender for send functionality.\n' +
+                    'Pass one via constructor, e.g.:\n' +
+                    '  const { ApiGatewayMessageSender } = require("@friggframework/provider-aws");\n' +
+                    '  new WebsocketConnectionRepositoryPostgres(new ApiGatewayMessageSender())\n' +
+                    'See docs/architecture-decisions/010-decouple-aws-from-core.md for migration guide.'
+                );
+            }
+            const sender = this._messageSender;
+
             return connections.map((conn) => ({
                 connectionId: conn.connectionId,
                 send: async (data) => {
-                    const apigwManagementApi = new ApiGatewayManagementApiClient({
-                        endpoint: process.env.WEBSOCKET_API_ENDPOINT,
-                    });
-
                     try {
-                        const command = new PostToConnectionCommand({
-                            ConnectionId: conn.connectionId,
-                            Data: JSON.stringify(data),
-                        });
-                        await apigwManagementApi.send(command);
+                        await sender.send(
+                            conn.connectionId,
+                            data,
+                            process.env.WEBSOCKET_API_ENDPOINT
+                        );
                     } catch (error) {
-                        if (error.statusCode === 410 || error.$metadata?.httpStatusCode === 410) {
+                        if (error instanceof StaleConnectionError) {
                             console.log(
                                 `Stale connection ${conn.connectionId}`
                             );
-                            // Delete stale connection
                             await this.prisma.websocketConnection.deleteMany({
                                 where: { connectionId: conn.connectionId },
                             });