@friggframework/core 2.0.0--canary.522.cbd3d5a.0 → 2.0.0--canary.517.35ee143.0

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

@@ -76,11 +76,10 @@ class GetUserFromXFriggHeaders {
                 }
 
                 // Auto-link the users
-                individualUserData =
-                    await this.userRepository.linkIndividualToOrganization(
-                        individualUserData.id,
-                        organizationUserData.id
-                    );
+                individualUserData = await this.userRepository.linkIndividualToOrganization(
+                    individualUserData.id,
+                    organizationUserData.id
+                );
             }
         }
 
@@ -90,13 +89,12 @@ 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 (
@@ -111,11 +109,10 @@ 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,5 +1,7 @@
 const Boom = require('@hapi/boom');
-const { RequiredPropertyError } = require('../../errors');
+const {
+    RequiredPropertyError,
+} = require('../../errors');
 const { User } = require('../user');
 
 /**
@@ -91,11 +93,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`);
@@ -113,10 +115,8 @@ 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,14 +14,7 @@ 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;
@@ -116,19 +109,12 @@ 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;
         }
 
@@ -136,4 +122,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,7 +1,4 @@
-const {
-    findNearestBackendPackageJson,
-    validateBackendPath,
-} = require('./backend-path');
+const { findNearestBackendPackageJson, validateBackendPath } = require('./backend-path');
 
 module.exports = {
     findNearestBackendPackageJson,

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

@@ -29,21 +29,13 @@ 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 };
     }
@@ -74,10 +66,7 @@ class WebsocketConnectionRepositoryDocumentDB extends WebsocketConnectionReposit
                     });
                     await apigwManagementApi.send(command);
                 } catch (error) {
-                    if (
-                        error.statusCode === 410 ||
-                        error.$metadata?.httpStatusCode === 410
-                    ) {
+                    if (error.statusCode === 410 || error.$metadata?.httpStatusCode === 410) {
                         console.log(`Stale connection ${conn.connectionId}`);
                         await deleteMany(this.prisma, 'WebsocketConnection', {
                             connectionId: conn.connectionId,
@@ -91,18 +80,14 @@ 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;
     }
 
@@ -130,3 +115,5 @@ class WebsocketConnectionRepositoryDocumentDB extends WebsocketConnectionReposit
 }
 
 module.exports = { WebsocketConnectionRepositoryDocumentDB };
+
+

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

@@ -77,10 +77,9 @@ class WebsocketConnectionRepositoryMongo extends WebsocketConnectionRepositoryIn
             return connections.map((conn) => ({
                 connectionId: conn.connectionId,
                 send: async (data) => {
-                    const apigwManagementApi =
-                        new ApiGatewayManagementApiClient({
-                            endpoint: process.env.WEBSOCKET_API_ENDPOINT,
-                        });
+                    const apigwManagementApi = new ApiGatewayManagementApiClient({
+                        endpoint: process.env.WEBSOCKET_API_ENDPOINT,
+                    });
 
                     try {
                         const command = new PostToConnectionCommand({
@@ -89,10 +88,7 @@ class WebsocketConnectionRepositoryMongo extends WebsocketConnectionRepositoryIn
                         });
                         await apigwManagementApi.send(command);
                     } catch (error) {
-                        if (
-                            error.statusCode === 410 ||
-                            error.$metadata?.httpStatusCode === 410
-                        ) {
+                        if (error.statusCode === 410 || error.$metadata?.httpStatusCode === 410) {
                             console.log(
                                 `Stale connection ${conn.connectionId}`
                             );

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

@@ -111,10 +111,9 @@ class WebsocketConnectionRepositoryPostgres extends WebsocketConnectionRepositor
             return connections.map((conn) => ({
                 connectionId: conn.connectionId,
                 send: async (data) => {
-                    const apigwManagementApi =
-                        new ApiGatewayManagementApiClient({
-                            endpoint: process.env.WEBSOCKET_API_ENDPOINT,
-                        });
+                    const apigwManagementApi = new ApiGatewayManagementApiClient({
+                        endpoint: process.env.WEBSOCKET_API_ENDPOINT,
+                    });
 
                     try {
                         const command = new PostToConnectionCommand({
@@ -123,10 +122,7 @@ class WebsocketConnectionRepositoryPostgres extends WebsocketConnectionRepositor
                         });
                         await apigwManagementApi.send(command);
                     } catch (error) {
-                        if (
-                            error.statusCode === 410 ||
-                            error.$metadata?.httpStatusCode === 410
-                        ) {
+                        if (error.statusCode === 410 || error.$metadata?.httpStatusCode === 410) {
                             console.log(
                                 `Stale connection ${conn.connectionId}`
                             );

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

@@ -82,10 +82,9 @@ class WebsocketConnectionRepository extends WebsocketConnectionRepositoryInterfa
             return connections.map((conn) => ({
                 connectionId: conn.connectionId,
                 send: async (data) => {
-                    const apigwManagementApi =
-                        new ApiGatewayManagementApiClient({
-                            endpoint: process.env.WEBSOCKET_API_ENDPOINT,
-                        });
+                    const apigwManagementApi = new ApiGatewayManagementApiClient({
+                        endpoint: process.env.WEBSOCKET_API_ENDPOINT,
+                    });
 
                     try {
                         const command = new PostToConnectionCommand({
@@ -94,10 +93,7 @@ class WebsocketConnectionRepository extends WebsocketConnectionRepositoryInterfa
                         });
                         await apigwManagementApi.send(command);
                     } catch (error) {
-                        if (
-                            error.statusCode === 410 ||
-                            error.$metadata?.httpStatusCode === 410
-                        ) {
+                        if (error.statusCode === 410 || error.$metadata?.httpStatusCode === 410) {
                             console.log(
                                 `Stale connection ${conn.connectionId}`
                             );

package/admin-scripts/repositories/admin-api-key-repository-interface.js

@@ -1,121 +0,0 @@
-/**
- * Admin API Key Repository Interface
- * Abstract base class defining the contract for admin API key persistence adapters
- *
- * This follows the Port in Hexagonal Architecture:
- * - Domain layer depends on this abstraction
- * - Concrete adapters implement this interface
- * - Use cases receive repositories via dependency injection
- *
- * Admin API keys provide authentication for script execution and management endpoints.
- * Keys are bcrypt-hashed for security and support scoping and expiration.
- *
- * @abstract
- */
-class AdminApiKeyRepositoryInterface {
-    /**
-     * Create a new admin API key
-     *
-     * @param {Object} params - API key creation parameters
-     * @param {string} params.name - Human-readable name for the key
-     * @param {string} params.keyHash - bcrypt hash of the raw key
-     * @param {string} params.keyLast4 - Last 4 characters of key (for display)
-     * @param {string[]} params.scopes - Array of permission scopes (e.g., ['scripts:execute', 'scripts:read'])
-     * @param {Date} [params.expiresAt] - Optional expiration date
-     * @param {string} [params.createdBy] - Optional identifier of creator (user/admin)
-     * @returns {Promise<Object>} The created API key record
-     * @abstract
-     */
-    async createApiKey({
-        name,
-        keyHash,
-        keyLast4,
-        scopes,
-        expiresAt,
-        createdBy,
-    }) {
-        throw new Error('Method createApiKey must be implemented by subclass');
-    }
-
-    /**
-     * Find an API key by its bcrypt hash
-     * Used during authentication to validate incoming keys
-     *
-     * @param {string} keyHash - The bcrypt hash to search for
-     * @returns {Promise<Object|null>} The API key record or null if not found
-     * @abstract
-     */
-    async findApiKeyByHash(keyHash) {
-        throw new Error(
-            'Method findApiKeyByHash must be implemented by subclass'
-        );
-    }
-
-    /**
-     * Find an API key by its ID
-     *
-     * @param {string|number} id - The API key ID
-     * @returns {Promise<Object|null>} The API key record or null if not found
-     * @abstract
-     */
-    async findApiKeyById(id) {
-        throw new Error(
-            'Method findApiKeyById must be implemented by subclass'
-        );
-    }
-
-    /**
-     * Find all active (non-expired, non-deactivated) API keys
-     * Used during authentication to check all valid keys
-     *
-     * @returns {Promise<Array>} Array of active API key records
-     * @abstract
-     */
-    async findActiveApiKeys() {
-        throw new Error(
-            'Method findActiveApiKeys must be implemented by subclass'
-        );
-    }
-
-    /**
-     * Update the lastUsedAt timestamp for an API key
-     * Called after successful authentication
-     *
-     * @param {string|number} id - The API key ID
-     * @returns {Promise<Object>} Updated API key record
-     * @abstract
-     */
-    async updateApiKeyLastUsed(id) {
-        throw new Error(
-            'Method updateApiKeyLastUsed must be implemented by subclass'
-        );
-    }
-
-    /**
-     * Deactivate an API key (soft delete)
-     * Sets isActive to false, preventing further use
-     *
-     * @param {string|number} id - The API key ID
-     * @returns {Promise<Object>} Updated API key record
-     * @abstract
-     */
-    async deactivateApiKey(id) {
-        throw new Error(
-            'Method deactivateApiKey must be implemented by subclass'
-        );
-    }
-
-    /**
-     * Delete an API key (hard delete)
-     * Permanently removes the key from the database
-     *
-     * @param {string|number} id - The API key ID
-     * @returns {Promise<Object>} Deletion result
-     * @abstract
-     */
-    async deleteApiKey(id) {
-        throw new Error('Method deleteApiKey must be implemented by subclass');
-    }
-}
-
-module.exports = { AdminApiKeyRepositoryInterface };

package/admin-scripts/repositories/admin-api-key-repository-mongo.js

@@ -1,155 +0,0 @@
-const { prisma } = require('../../database/prisma');
-const {
-    AdminApiKeyRepositoryInterface,
-} = require('./admin-api-key-repository-interface');
-
-/**
- * MongoDB Admin API Key Repository Adapter
- * Handles admin API key persistence using Prisma with MongoDB
- *
- * MongoDB-specific characteristics:
- * - IDs are strings with @db.ObjectId
- * - Supports bcrypt hashed keys
- * - Scopes stored as String[] array
- */
-class AdminApiKeyRepositoryMongo extends AdminApiKeyRepositoryInterface {
-    constructor() {
-        super();
-        this.prisma = prisma;
-    }
-
-    /**
-     * Create a new admin API key
-     *
-     * @param {Object} params - API key creation parameters
-     * @param {string} params.name - Human-readable name for the key
-     * @param {string} params.keyHash - bcrypt hash of the raw key
-     * @param {string} params.keyLast4 - Last 4 characters of key (for display)
-     * @param {string[]} params.scopes - Array of permission scopes
-     * @param {Date} [params.expiresAt] - Optional expiration date
-     * @param {string} [params.createdBy] - Optional identifier of creator
-     * @returns {Promise<Object>} The created API key record
-     */
-    async createApiKey({
-        name,
-        keyHash,
-        keyLast4,
-        scopes,
-        expiresAt,
-        createdBy,
-    }) {
-        const apiKey = await this.prisma.adminApiKey.create({
-            data: {
-                name,
-                keyHash,
-                keyLast4,
-                scopes,
-                expiresAt,
-                createdBy,
-            },
-        });
-
-        return apiKey;
-    }
-
-    /**
-     * Find an API key by its bcrypt hash
-     * Used during authentication to validate incoming keys
-     *
-     * @param {string} keyHash - The bcrypt hash to search for
-     * @returns {Promise<Object|null>} The API key record or null if not found
-     */
-    async findApiKeyByHash(keyHash) {
-        const apiKey = await this.prisma.adminApiKey.findUnique({
-            where: { keyHash },
-        });
-
-        return apiKey;
-    }
-
-    /**
-     * Find an API key by its ID
-     *
-     * @param {string} id - The API key ID (MongoDB ObjectId as string)
-     * @returns {Promise<Object|null>} The API key record or null if not found
-     */
-    async findApiKeyById(id) {
-        const apiKey = await this.prisma.adminApiKey.findUnique({
-            where: { id },
-        });
-
-        return apiKey;
-    }
-
-    /**
-     * Find all active (non-expired, non-deactivated) API keys
-     * Used during authentication to check all valid keys
-     *
-     * @returns {Promise<Array>} Array of active API key records
-     */
-    async findActiveApiKeys() {
-        const now = new Date();
-        const apiKeys = await this.prisma.adminApiKey.findMany({
-            where: {
-                isActive: true,
-                OR: [{ expiresAt: null }, { expiresAt: { gt: now } }],
-            },
-        });
-
-        return apiKeys;
-    }
-
-    /**
-     * Update the lastUsedAt timestamp for an API key
-     * Called after successful authentication
-     *
-     * @param {string} id - The API key ID
-     * @returns {Promise<Object>} Updated API key record
-     */
-    async updateApiKeyLastUsed(id) {
-        const apiKey = await this.prisma.adminApiKey.update({
-            where: { id },
-            data: {
-                lastUsedAt: new Date(),
-            },
-        });
-
-        return apiKey;
-    }
-
-    /**
-     * Deactivate an API key (soft delete)
-     * Sets isActive to false, preventing further use
-     *
-     * @param {string} id - The API key ID
-     * @returns {Promise<Object>} Updated API key record
-     */
-    async deactivateApiKey(id) {
-        const apiKey = await this.prisma.adminApiKey.update({
-            where: { id },
-            data: {
-                isActive: false,
-            },
-        });
-
-        return apiKey;
-    }
-
-    /**
-     * Delete an API key (hard delete)
-     * Permanently removes the key from the database
-     *
-     * @param {string} id - The API key ID
-     * @returns {Promise<Object>} Deletion result
-     */
-    async deleteApiKey(id) {
-        await this.prisma.adminApiKey.delete({
-            where: { id },
-        });
-
-        // Return Mongoose-compatible result
-        return { acknowledged: true, deletedCount: 1 };
-    }
-}
-
-module.exports = { AdminApiKeyRepositoryMongo };