@friggframework/core 2.0.0--canary.702.ef0dc8c.0 → 2.0.0--canary.710.7cfcf12.0

package/package.json

@@ -1,18 +1,16 @@
 {
     "name": "@friggframework/core",
-    "description": "",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.702.ef0dc8c.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.1153.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",
-        "@friggframework/schemas": "2.0.0--canary.702.ef0dc8c.0",
         "@hapi/boom": "^10.0.1",
         "@opentelemetry/api": "^1.9.1",
         "@opentelemetry/context-async-hooks": "^2.9.0",
@@ -50,9 +48,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.702.ef0dc8c.0",
-        "@friggframework/prettier-config": "2.0.0--canary.702.ef0dc8c.0",
-        "@friggframework/test": "2.0.0--canary.702.ef0dc8c.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",
@@ -70,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",
@@ -88,8 +87,9 @@
         "url": "https://github.com/friggframework/frigg/issues"
     },
     "homepage": "https://github.com/friggframework/frigg#readme",
+    "description": "",
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ef0dc8cb6c6f56048a61b6759faad7322046925d"
+    "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');