@friggframework/core 2.0.0--canary.726.131e2b3.0 → 2.0.0--canary.727.f8fcc58.0

package/handlers/app-handler-helpers.js

@@ -9,6 +9,17 @@ const serverlessHttp = require('serverless-http');
 
 const log = getLogger('frigg.http');
 
+const isHttpErrorStatus = (statusCode) =>
+    Number.isInteger(statusCode) && statusCode >= 400 && statusCode <= 599;
+
+const toBoom = (err) => {
+    if (err.isBoom) return err;
+    if (err.isClientSafe === true && isHttpErrorStatus(err.statusCode)) {
+        return Boom.boomify(err, { statusCode: err.statusCode });
+    }
+    return Boom.boomify(err);
+};
+
 const createApp = (applyMiddleware) => {
     const app = express();
 
@@ -27,7 +38,7 @@ const createApp = (applyMiddleware) => {
 
     // The express boundary: send the error response and log it one time.
     app.use((err, req, res, next) => {
-        const boomError = err.isBoom ? err : Boom.boomify(err);
+        const boomError = toBoom(err);
         const {
             output: { statusCode = 500 },
         } = boomError;

package/integrations/integration-base.js

@@ -557,17 +557,30 @@ class IntegrationBase {
                 }
             }
         }
-        const dynamicUserActions = await this.loadDynamicUserActions();
-        const filteredDynamicActions = actionType
-            ? Object.fromEntries(
-                  Object.entries(dynamicUserActions).filter(
-                      ([_, event]) => event.userActionType === actionType
-                  )
-              )
-            : dynamicUserActions;
+        const dynamicUserActions = await this._loadDynamicUserActionEvents();
+        const filteredDynamicActions = Object.fromEntries(
+            Object.entries(dynamicUserActions).filter(
+                ([_, event]) =>
+                    event.type === constantsToBeMigrated.types.USER_ACTION &&
+                    (!actionType || event.userActionType === actionType)
+            )
+        );
         return { ...userActions, ...filteredDynamicActions };
     }
 
+    async _loadDynamicUserActionEvents() {
+        const dynamicUserActions = await this.loadDynamicUserActions();
+        return Object.fromEntries(
+            Object.entries(dynamicUserActions).map(([key, event]) => [
+                key,
+                {
+                    ...event,
+                    type: event.type ?? constantsToBeMigrated.types.USER_ACTION,
+                },
+            ])
+        );
+    }
+
     async getActionOptions(actionId, data) {
         const options = {
             jsonSchema: {},
@@ -847,7 +860,8 @@ class IntegrationBase {
 
     async initialize() {
         try {
-            const additionalUserActions = await this.loadDynamicUserActions();
+            const additionalUserActions =
+                await this._loadDynamicUserActionEvents();
             this.events = { ...this.events, ...additionalUserActions };
         } catch (e) {
             this.addError(e);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.726.131e2b3.0",
+    "version": "2.0.0--canary.727.f8fcc58.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -11,7 +11,7 @@
         "@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.726.131e2b3.0",
+        "@friggframework/schemas": "2.0.0--canary.727.f8fcc58.0",
         "@hapi/boom": "^10.0.1",
         "@opentelemetry/api": "^1.9.1",
         "@opentelemetry/context-async-hooks": "^2.9.0",
@@ -49,9 +49,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.726.131e2b3.0",
-        "@friggframework/prettier-config": "2.0.0--canary.726.131e2b3.0",
-        "@friggframework/test": "2.0.0--canary.726.131e2b3.0",
+        "@friggframework/eslint-config": "2.0.0--canary.727.f8fcc58.0",
+        "@friggframework/prettier-config": "2.0.0--canary.727.f8fcc58.0",
+        "@friggframework/test": "2.0.0--canary.727.f8fcc58.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -92,5 +92,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "131e2b30f186de52170e32a5fa6948e568445593"
+    "gitHead": "f8fcc5824935a85a95c9997bc52ca1c6e973b91c"
 }

package/token/repositories/token-repository-documentdb.js

@@ -119,7 +119,19 @@ class TokenRepositoryDocumentDB extends TokenRepositoryInterface {
 
     getJSONTokenFromBase64BufferToken(buffer) {
         const tokenStr = Buffer.from(buffer.trim(), 'base64').toString('ascii');
-        return JSON.parse(tokenStr);
+        let jsonToken;
+        try {
+            jsonToken = JSON.parse(tokenStr);
+        } catch {
+            jsonToken = null;
+        }
+        if (
+            !['string', 'number'].includes(typeof jsonToken?.id) ||
+            typeof jsonToken?.token !== 'string'
+        ) {
+            throw new ClientSafeError('Invalid Token: Token is malformed', 401);
+        }
+        return jsonToken;
     }
 
     _mapToken(record) {

package/token/repositories/token-repository-mongo.js

@@ -212,7 +212,19 @@ class TokenRepositoryMongo extends TokenRepositoryInterface {
      */
     getJSONTokenFromBase64BufferToken(buffer) {
         const tokenStr = Buffer.from(buffer.trim(), 'base64').toString('ascii');
-        return JSON.parse(tokenStr);
+        let jsonToken;
+        try {
+            jsonToken = JSON.parse(tokenStr);
+        } catch {
+            jsonToken = null;
+        }
+        if (
+            !['string', 'number'].includes(typeof jsonToken?.id) ||
+            typeof jsonToken?.token !== 'string'
+        ) {
+            throw new ClientSafeError('Invalid Token: Token is malformed', 401);
+        }
+        return jsonToken;
     }
 }
 

package/token/repositories/token-repository-postgres.js

@@ -257,7 +257,19 @@ class TokenRepositoryPostgres extends TokenRepositoryInterface {
      */
     getJSONTokenFromBase64BufferToken(buffer) {
         const tokenStr = Buffer.from(buffer.trim(), 'base64').toString('ascii');
-        return JSON.parse(tokenStr);
+        let jsonToken;
+        try {
+            jsonToken = JSON.parse(tokenStr);
+        } catch {
+            jsonToken = null;
+        }
+        if (
+            !['string', 'number'].includes(typeof jsonToken?.id) ||
+            typeof jsonToken?.token !== 'string'
+        ) {
+            throw new ClientSafeError('Invalid Token: Token is malformed', 401);
+        }
+        return jsonToken;
     }
 }