@friggframework/core 1.2.2 → 1.3.0--canary.325.7243e56.0

package/CHANGELOG.md

@@ -1,29 +1,3 @@
-# v1.2.2 (Fri Aug 09 2024)
-
-#### 🐛 Bug Fix
-
-- Add support for secrets loading from SECRET_ARN [#327](https://github.com/friggframework/frigg/pull/327) ([@seanspeaks](https://github.com/seanspeaks))
-- Adding support for secrets loading ([@seanspeaks](https://github.com/seanspeaks))
-
-#### Authors: 1
-
-- Sean Matthews ([@seanspeaks](https://github.com/seanspeaks))
-
----
-
-# v1.2.1 (Thu Aug 08 2024)
-
-#### 🐛 Bug Fix
-
-- Fix bug during local running [#326](https://github.com/friggframework/frigg/pull/326) ([@seanspeaks](https://github.com/seanspeaks))
-- Adding toJSON so that the descriminator decorator will be evaluated/added to the mongoose model (currently undefined on initialization and first invocation) ([@seanspeaks](https://github.com/seanspeaks))
-
-#### Authors: 1
-
-- Sean Matthews ([@seanspeaks](https://github.com/seanspeaks))
-
----
-
 # v1.2.0 (Tue Aug 06 2024)
 
 :tada: This release contains work from a new contributor! :tada:

package/core/create-handler.js

@@ -3,7 +3,6 @@ require('source-map-support').install();
 
 const { connectToDatabase } = require('../database/mongo');
 const { initDebugLog, flushDebugLog } = require('../logs');
-const { secretsToEnv } = require('./secrets-to-env');
 
 const createHandler = (optionByName = {}) => {
     const {
@@ -21,15 +20,6 @@ const createHandler = (optionByName = {}) => {
         try {
             initDebugLog(eventName, event);
 
-            const requestMethod = event.httpMethod;
-            const requestPath = event.path;
-            if (requestMethod && requestPath) {
-                console.info(`${requestMethod} ${requestPath}`);
-            }
-
-            // If enabled (i.e. if SECRET_ARN is set in process.env) Fetch secrets from AWS Secrets Manager, and set them as environment variables.
-            await secretsToEnv();
-
             // Helps mongoose reuse the connection.  Lowers response times.
             context.callbackWaitsForEmptyEventLoop = false;
 

package/integrations/integration-base.js

@@ -27,9 +27,7 @@ class IntegrationBase {
     }
 
     //psuedo delegate for backwards compatability
-    async receiveNotification(notifier, delegateString, object = null) {
-
-    }
+    async receiveNotification(notifier, delegateString, object = null) {}
 
     async notify(delegateString, object = null) {
         if (!this.delegateTypes.includes(delegateString)) {
@@ -37,11 +35,7 @@ class IntegrationBase {
                 `delegateString:${delegateString} is not defined in delegateTypes`
             );
         }
-        return this.receiveNotification(
-                this,
-                delegateString,
-                object
-        );
+        return this.receiveNotification(this, delegateString, object);
     }
 
     async validateConfig() {
@@ -130,8 +124,6 @@ class IntegrationBase {
         return this.userActions;
     }
 
-
-
     /**
      * CHILDREN CAN OVERRIDE THESE CONFIGURATION METHODS
      */
@@ -141,10 +133,9 @@ class IntegrationBase {
         return this.record;
     }
 
-    async onUpdate(params) {
-    }
+    async onUpdate(params) {}
 
-    async onDelete(params) { }
+    async onDelete(params) {}
 
     async getConfigOptions() {
         const options = {
@@ -158,8 +149,8 @@ class IntegrationBase {
         const options = {
             jsonSchema: {},
             uiSchema: {},
-        }
-        return options
+        };
+        return options;
     }
 
     async getUserActions() {
@@ -170,16 +161,16 @@ class IntegrationBase {
         const options = {
             jsonSchema: {},
             uiSchema: {},
-        }
-        return options
+        };
+        return options;
     }
 
     async refreshActionOptions(params) {
         const options = {
             jsonSchema: {},
             uiSchema: {},
-        }
-        return options
+        };
+        return options;
     }
 }
 

package/module-plugin/module-factory.js

@@ -1,10 +1,12 @@
-const { Entity } = require('./entity');
+const { Entity } = require("./entity");
 const { Auther } = require('./auther');
 
 class ModuleFactory {
     constructor(...params) {
         this.moduleDefinitions = params;
-        this.moduleTypes = this.moduleDefinitions.map((def) => def.moduleName);
+        this.moduleTypes = this.moduleDefinitions.map(
+            (def) => def.moduleName
+        );
     }
 
     async getEntitiesForUser(userId) {
@@ -12,7 +14,7 @@ class ModuleFactory {
         for (const moduleDefinition of this.moduleDefinitions) {
             const moduleInstance = await Auther.getInstance({
                 userId,
-                definition: moduleDefinition,
+                definition: moduleDefinition
             });
             const list = await moduleInstance.getEntitiesForUserId(userId);
             results.push(...list);
@@ -25,36 +27,33 @@ class ModuleFactory {
     }
 
     getModuleDefinitionFromTypeName(typeName) {
-        return;
+        return
     }
 
+
     async getModuleInstanceFromEntityId(entityId, userId) {
         const entity = await Entity.findById(entityId);
         const moduleDefinition = this.moduleDefinitions.find(
-            (def) =>
-                entity.toJSON()['__t'] ===
-                Auther.getEntityModelFromDefinition(def).modelName
-        );
+            (def) => entity['__t'] === Auther.getEntityModelFromDefinition(def).modelName
+        )
         if (!moduleDefinition) {
-            throw new Error(
-                'Module definition not found for entity type: ' + entity['__t']
-            );
+            throw new Error('Module definition not found for entity type: ' + entity['__t']);
         }
         return await Auther.getInstance({
             userId,
             entityId,
-            definition: moduleDefinition,
+            definition: moduleDefinition
         });
     }
 
-    async getInstanceFromTypeName(typeName, userId) {
-        const moduleDefinition = this.moduleDefinitions.find(
+     async getInstanceFromTypeName(typeName, userId) {
+        const moduleDefinition =this.moduleDefinitions.find(
             (def) => def.getName() === typeName
         );
-        return await Auther.getInstance({
-            userId,
-            definition: moduleDefinition,
-        });
+         return await Auther.getInstance({
+             userId,
+             definition: moduleDefinition
+         });
     }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "1.2.2",
+  "version": "1.3.0--canary.325.7243e56.0",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "aws-sdk": "^2.1200.0",
@@ -15,9 +15,9 @@
     "node-fetch": "^2.6.7"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "^1.2.2",
-    "@friggframework/prettier-config": "^1.2.2",
-    "@friggframework/test": "^1.2.2",
+    "@friggframework/eslint-config": "1.3.0--canary.325.7243e56.0",
+    "@friggframework/prettier-config": "1.3.0--canary.325.7243e56.0",
+    "@friggframework/test": "1.3.0--canary.325.7243e56.0",
     "@types/lodash": "^4.14.191",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -48,5 +48,5 @@
   },
   "homepage": "https://github.com/friggframework/frigg#readme",
   "description": "",
-  "gitHead": "8c33a41d9cf6de867bbb6a308aea32c7e7d05691"
+  "gitHead": "7243e56239ceb34e90337e47a34bc14d533fad26"
 }

package/core/secrets-to-env.js

@@ -1,61 +0,0 @@
-const getSecretValue = async () => {
-    console.log('Fetching secrets...');
-
-    const httpPort = process.env.PARAMETERS_SECRETS_EXTENSION_HTTP_PORT || 2773;
-    const url = `http://localhost:${httpPort}/secretsmanager/get?secretId=${encodeURIComponent(
-        process.env.SECRET_ARN
-    )}`;
-    const options = {
-        headers: {
-            'X-Aws-Parameters-Secrets-Token': process.env.AWS_SESSION_TOKEN,
-        },
-        method: 'GET',
-    };
-
-    const response = await fetch(url, options);
-
-    if (!response.ok) {
-        const json = await response.json().catch((err) => err.message);
-        console.error('Invalid response - response:', JSON.stringify(response));
-        console.error('Invalid response - json:', json);
-        throw new Error(`Invalid ${response.status} response`);
-    }
-
-    const result = await response.json();
-
-    if (!result) {
-        throw new Error('Error getting secret', result);
-    }
-
-    return JSON.parse(result.SecretString);
-};
-
-const transformSecrets = (secrets) => {
-    Object.keys(secrets).forEach((key) => {
-        process.env[key] = secrets[key];
-    });
-};
-
-/**
- * Middleware that gets the secrets from Lambda layer and transform into environment variables.
- *
- */
-const secretsToEnv = async () => {
-    if (!process.env.SECRET_ARN) {
-        return;
-    }
-    console.log('Secrets to env');
-
-    try {
-        const secrets = await getSecretValue();
-        transformSecrets(secrets);
-
-        return secrets;
-    } catch (err) {
-        throw err;
-    }
-};
-
-module.exports = {
-    secretsToEnv,
-};