@friggframework/core 2.0.0--canary.667.f74cf3b.0 → 2.0.0--canary.710.7cfcf12.0

package/modules/use-cases/test-module-auth.js

@@ -1,7 +1,4 @@
 const { Module } = require('../module');
-const {
-    findModuleDefinitionForEntity,
-} = require('../utils/find-module-definition');
 
 class TestModuleAuth {
     /**
@@ -48,10 +45,11 @@ class TestModuleAuth {
         }
 
         const entityType = entity.moduleName;
-        const moduleDefinition = findModuleDefinitionForEntity(
-            this.moduleDefinitions,
-            entity
-        );
+        const moduleDefinition = this.moduleDefinitions.find((def) => {
+            const modelName =
+                Module.getEntityModelFromDefinition(def).modelName;
+            return entityType === modelName;
+        });
 
         if (!moduleDefinition) {
             throw new Error(

package/modules/utils/map-module-dto.js

@@ -1,3 +1,5 @@
+const { toCredentialId } = require('./to-credential-id');
+
 /**
  * @param {import('../module').Module} moduleInstance
  * Convert a Module domain instance to a plain DTO suitable for JSON responses.
@@ -10,9 +12,9 @@ function mapModuleClassToModuleDTO(moduleInstance) {
         name: moduleInstance.name,
         userId: moduleInstance.userId,
         entity: moduleInstance.entity,
-        credentialId: moduleInstance.credential?._id?.toString(),
-        type: moduleInstance.getName()
+        credentialId: toCredentialId(moduleInstance.credential),
+        type: moduleInstance.getName(),
     };
 }
 
-module.exports = { mapModuleClassToModuleDTO }; 
+module.exports = { mapModuleClassToModuleDTO };

package/modules/utils/to-credential-id.js

@@ -0,0 +1,14 @@
+/**
+ * Resolve the credential id from an entity's or module's `credential`, which
+ * repositories return as the decrypted credential object (or a bare id).
+ * @param {Object|string|number|null|undefined} credential
+ * @returns {string|null}
+ */
+function toCredentialId(credential) {
+    if (credential && typeof credential === 'object') {
+        return credential.id?.toString() ?? null;
+    }
+    return credential?.toString() ?? null;
+}
+
+module.exports = { toCredentialId };

package/package.json

@@ -1,12 +1,13 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.667.f74cf3b.0",
+    "version": "2.0.0--canary.710.7cfcf12.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
         "@aws-sdk/client-lambda": "^3.714.0",
         "@aws-sdk/client-s3": "^3.588.0",
+        "@aws-sdk/client-scheduler": "^3.588.0",
         "@aws-sdk/client-sqs": "^3.588.0",
         "@aws-sdk/client-ssm": "^3.588.0",
         "@aws-sdk/s3-request-presigner": "^3.588.0",
@@ -47,9 +48,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.667.f74cf3b.0",
-        "@friggframework/prettier-config": "2.0.0--canary.667.f74cf3b.0",
-        "@friggframework/test": "2.0.0--canary.667.f74cf3b.0",
+        "@friggframework/eslint-config": "2.0.0--canary.710.7cfcf12.0",
+        "@friggframework/prettier-config": "2.0.0--canary.710.7cfcf12.0",
+        "@friggframework/test": "2.0.0--canary.710.7cfcf12.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -67,6 +68,7 @@
     "scripts": {
         "lint:fix": "prettier --write --loglevel error . && eslint . --fix",
         "test": "jest --passWithNoTests # TODO",
+        "test:db": "jest --config jest.db.config.js --runInBand",
         "prisma:generate:mongo": "npx prisma generate --schema ./prisma-mongodb/schema.prisma",
         "prisma:generate:postgres": "npx prisma generate --schema ./prisma-postgresql/schema.prisma",
         "prisma:generate": "npm run prisma:generate:mongo && npm run prisma:generate:postgres",
@@ -89,5 +91,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "f74cf3b1f04195508cb0ee6d4086b1cb2d70d913"
+    "gitHead": "7cfcf1267a412053163b99b7f9a123f7e4e1bde3"
 }

package/queues/queuer-util.js

@@ -97,16 +97,17 @@ const QueuerUtil = {
                 Id: uuid(),
                 MessageBody: JSON.stringify(entry),
             });
-            // Sends 10, then purges the buffer
+            // Sends 10, then starts a fresh buffer. Each command gets its own
+            // array: clearing the shared buffer in place would also empty the
+            // Entries of a command that was already sent.
             if (buffer.length === batchSize) {
+                const batch = buffer.splice(0, buffer.length);
                 const command = new SendMessageBatchCommand({
-                    Entries: buffer,
+                    Entries: batch,
                     QueueUrl: queueUrl,
                 });
                 const result = await sqs.send(command);
-                inspectBatchResult(result, queueUrl, buffer);
-                // Purge the buffer
-                buffer.splice(0, buffer.length);
+                inspectBatchResult(result, queueUrl, batch);
             }
         }
 

package/user/tests/doubles/test-user-repository.js

@@ -23,7 +23,7 @@ class TestUserRepository {
 
     async createToken(userId, rawToken, minutes = 120) {
         const token = `token-for-${userId}-for-${minutes}-mins`;
-        this.tokens.set(token, { user: userId, rawToken });
+        this.tokens.set(token, { id: token, userId, rawToken });
         return token;
     }
 

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

@@ -40,8 +40,13 @@ class GetUserFromBearerToken {
             throw Boom.unauthorized('Session Token Not Found');
         }
 
+        const tokenUserId = sessionToken.userId;
+        if (!tokenUserId) {
+            throw Boom.unauthorized('Session Token Has No User');
+        }
+
         if (this.userConfig.primary === 'organization') {
-            const organizationUserData = await this.userRepository.findOrganizationUserById(sessionToken.user);
+            const organizationUserData = await this.userRepository.findOrganizationUserById(tokenUserId);
 
             if (!organizationUserData) {
                 throw Boom.unauthorized('Organization User Not Found');
@@ -57,7 +62,7 @@ class GetUserFromBearerToken {
             );
         }
 
-        const individualUserData = await this.userRepository.findIndividualUserById(sessionToken.user);
+        const individualUserData = await this.userRepository.findIndividualUserById(tokenUserId);
 
         if (!individualUserData) {
             throw Boom.unauthorized('Individual User Not Found');

package/modules/use-cases/create-entity-from-credential.js

@@ -1,105 +0,0 @@
-const Boom = require('@hapi/boom');
-const { Module } = require('../module');
-
-const sameId = (a, b) =>
-    a !== undefined &&
-    a !== null &&
-    b !== undefined &&
-    b !== null &&
-    String(a) === String(b);
-
-/**
- * Creates (or finds) the entity for a credential the caller already holds:
- * the v1 `POST /api/entity`.
- *
- * The module is built with the stored credential loaded, so the API can call
- * the provider and a token refresh during `getEntityDetails` updates that
- * credential. Persistence reuses `ProcessAuthorizationCallback.findOrCreateEntity`,
- * the same find-or-create (and credential repointing) the authorization flow
- * uses, so the two paths cannot drift.
- */
-class CreateEntityFromCredential {
-    /**
-     * @param {Object} params
-     * @param {import('./process-authorization-callback').ProcessAuthorizationCallback} params.processAuthorizationCallback
-     * @param {Object} params.credentialRepository
-     * @param {Array<Object>} params.moduleDefinitions
-     * @param {Function} [params.createModule] - builds a Module; injectable for tests
-     */
-    constructor({
-        processAuthorizationCallback,
-        credentialRepository,
-        moduleDefinitions,
-        createModule,
-    }) {
-        this.processAuthorizationCallback = processAuthorizationCallback;
-        this.credentialRepository = credentialRepository;
-        this.moduleDefinitions = moduleDefinitions || [];
-        this.createModule = createModule || ((params) => new Module(params));
-    }
-
-    /**
-     * @param {Object} params
-     * @param {Object} params.user - authenticated User
-     * @param {string} params.entityType
-     * @param {string} params.credentialId
-     * @returns {Promise<Object>} the persisted entity
-     */
-    async execute({ user, entityType, credentialId }) {
-        const userId = user?.getId?.();
-        if (userId === undefined || userId === null) {
-            throw Boom.unauthorized('No authenticated user');
-        }
-
-        const definition = this.moduleDefinitions.find(
-            (def) => def && def.moduleName === entityType
-        );
-        if (!definition) {
-            throw Boom.badRequest(`Unknown entity type ${entityType}`, {
-                code: 'ENTITY_TYPE_NOT_FOUND',
-            });
-        }
-
-        const credential =
-            await this.credentialRepository.findCredentialById(credentialId);
-        // A missing credential and someone else's get the same answer, so
-        // credential ids cannot be probed.
-        if (!credential || !sameId(credential.userId, userId)) {
-            throw Boom.badRequest('Invalid credential ID', {
-                code: 'INVALID_CREDENTIAL',
-            });
-        }
-
-        // The repository returns the tokens flat; a Module reads them from
-        // `credential.data`.
-        const { id, userId: ownerId, externalId, authIsValid, ...data } =
-            credential;
-        const module = this.createModule({
-            userId,
-            definition,
-            entity: {
-                credential: { id, userId: ownerId, externalId, authIsValid, data },
-            },
-        });
-
-        const entityDetails =
-            await definition.requiredAuthMethods.getEntityDetails(
-                module.api,
-                null,
-                null,
-                userId
-            );
-        Object.assign(
-            entityDetails.details,
-            module.apiParamsFromEntity(module.api)
-        );
-
-        return this.processAuthorizationCallback.findOrCreateEntity(
-            entityDetails,
-            definition.moduleName,
-            credential.id
-        );
-    }
-}
-
-module.exports = { CreateEntityFromCredential };

package/modules/utils/find-module-definition.js

@@ -1,23 +0,0 @@
-/**
- * The API module definition a stored entity belongs to.
- *
- * Entities are persisted with `moduleName` set to the definition's
- * `moduleName` (see ProcessAuthorizationCallback.findOrCreateEntity). A
- * definition's legacy `modelName` is accepted as well, for entities written
- * before the two were the same.
- *
- * @param {Array<Object>} moduleDefinitions
- * @param {Object} entity - entity record with a `moduleName`
- * @returns {Object|undefined}
- */
-function findModuleDefinitionForEntity(moduleDefinitions, entity) {
-    const entityType = entity?.moduleName;
-    if (!entityType) return undefined;
-    return (moduleDefinitions || []).find(
-        (def) =>
-            def &&
-            (def.moduleName === entityType || def.modelName === entityType)
-    );
-}
-
-module.exports = { findModuleDefinitionForEntity };