@friggframework/core 2.0.0-next.3 → 2.0.0-next.30

package/module-plugin/auther.js

@@ -25,15 +25,14 @@
 // 1. Add definition of expected params to API Class (or could just be credential?)
 // 2.
 
-
 const { Delegate } = require('../core');
 const { get } = require('../assertions');
 const _ = require('lodash');
-const {flushDebugLog} = require('../logs');
+const { flushDebugLog } = require('../logs');
 const { Credential } = require('./credential');
 const { Entity } = require('./entity');
 const { mongoose } = require('../database/mongoose');
-const {ModuleConstants} = require("./ModuleConstants");
+const { ModuleConstants } = require('./ModuleConstants');
 
 class Auther extends Delegate {
     static validateDefinition(definition) {
@@ -55,21 +54,35 @@ class Auther extends Delegate {
         if (!definition.requiredAuthMethods) {
             throw new Error('Auther definition requires requiredAuthMethods');
         } else {
-            if (definition.API.requesterType === ModuleConstants.authType.oauth2 &&
-                !definition.requiredAuthMethods.getToken) {
-                throw new Error('Auther definition requires requiredAuthMethods.getToken');
+            if (
+                definition.API.requesterType ===
+                    ModuleConstants.authType.oauth2 &&
+                !definition.requiredAuthMethods.getToken
+            ) {
+                throw new Error(
+                    'Auther definition requires requiredAuthMethods.getToken'
+                );
             }
             if (!definition.requiredAuthMethods.getEntityDetails) {
-                throw new Error('Auther definition requires requiredAuthMethods.getEntityDetails');
+                throw new Error(
+                    'Auther definition requires requiredAuthMethods.getEntityDetails'
+                );
             }
             if (!definition.requiredAuthMethods.getCredentialDetails) {
-                throw new Error('Auther definition requires requiredAuthMethods.getCredentialDetails');
+                throw new Error(
+                    'Auther definition requires requiredAuthMethods.getCredentialDetails'
+                );
             }
             if (!definition.requiredAuthMethods.apiPropertiesToPersist) {
-                throw new Error('Auther definition requires requiredAuthMethods.apiPropertiesToPersist');
-            } else if (definition.Credential){
-                for (const prop of definition.requiredAuthMethods.apiPropertiesToPersist?.credential) {
-                    if (!definition.Credential.schema.paths.hasOwnProperty(prop)) {
+                throw new Error(
+                    'Auther definition requires requiredAuthMethods.apiPropertiesToPersist'
+                );
+            } else if (definition.Credential) {
+                for (const prop of definition.requiredAuthMethods
+                    .apiPropertiesToPersist?.credential) {
+                    if (
+                        !definition.Credential.schema.paths.hasOwnProperty(prop)
+                    ) {
                         throw new Error(
                             `Auther definition requires Credential schema to have property ${prop}`
                         );
@@ -77,7 +90,9 @@ class Auther extends Delegate {
                 }
             }
             if (!definition.requiredAuthMethods.testAuthRequest) {
-                throw new Error('Auther definition requires requiredAuthMethods.testAuth');
+                throw new Error(
+                    'Auther definition requires requiredAuthMethods.testAuth'
+                );
             }
         }
     }
@@ -97,14 +112,17 @@ class Auther extends Delegate {
         this.name = definition.moduleName;
         this.modelName = definition.modelName;
         this.apiClass = definition.API;
-        this.CredentialModel = definition.Credential || this.getCredentialModel();
+        this.CredentialModel =
+            definition.Credential || this.getCredentialModel();
         this.EntityModel = definition.Entity || this.getEntityModel();
     }
 
     static async getInstance(params) {
         const instance = new this(params);
         if (params.entityId) {
-            instance.entity = await instance.EntityModel.findById(params.entityId);
+            instance.entity = await instance.EntityModel.findById(
+                params.entityId
+            );
             instance.credential = await instance.CredentialModel.findById(
                 instance.entity.credential
             );
@@ -132,7 +150,7 @@ class Auther extends Delegate {
     }
 
     static getEntityModelFromDefinition(definition) {
-        const partialModule = new this({definition});
+        const partialModule = new this({ definition });
         return partialModule.getEntityModel();
     }
 
@@ -151,30 +169,38 @@ class Auther extends Delegate {
     getEntityModel() {
         if (!this.EntityModel) {
             const prefix = this.modelName ?? _.upperFirst(this.getName());
-            const arrayToDefaultObject = (array, defaultValue) => _.mapValues(_.keyBy(array), () => defaultValue);
-            const schema = new mongoose.Schema(arrayToDefaultObject(this.apiPropertiesToPersist.entity, {
-                type: mongoose.Schema.Types.Mixed,
-                trim: true,
-            }));
+            const arrayToDefaultObject = (array, defaultValue) =>
+                _.mapValues(_.keyBy(array), () => defaultValue);
+            const schema = new mongoose.Schema(
+                arrayToDefaultObject(this.apiPropertiesToPersist.entity, {
+                    type: mongoose.Schema.Types.Mixed,
+                    trim: true,
+                })
+            );
             const name = `${prefix}Entity`;
             this.EntityModel =
-                Entity.discriminators?.[name] || Entity.discriminator(name, schema);
+                Entity.discriminators?.[name] ||
+                Entity.discriminator(name, schema);
         }
         return this.EntityModel;
     }
 
     getCredentialModel() {
         if (!this.CredentialModel) {
-            const arrayToDefaultObject = (array, defaultValue) => _.mapValues(_.keyBy(array), () => defaultValue);
-            const schema = new mongoose.Schema(arrayToDefaultObject(this.apiPropertiesToPersist.credential, {
-                type: mongoose.Schema.Types.Mixed,
-                trim: true,
-                lhEncrypt: true
-            }));
+            const arrayToDefaultObject = (array, defaultValue) =>
+                _.mapValues(_.keyBy(array), () => defaultValue);
+            const schema = new mongoose.Schema(
+                arrayToDefaultObject(this.apiPropertiesToPersist.credential, {
+                    type: mongoose.Schema.Types.Mixed,
+                    trim: true,
+                    lhEncrypt: true,
+                })
+            );
             const prefix = this.modelName ?? _.upperFirst(this.getName());
             const name = `${prefix}Credential`;
             this.CredentialModel =
-                Credential.discriminators?.[name] || Credential.discriminator(name, schema);
+                Credential.discriminators?.[name] ||
+                Credential.discriminator(name, schema);
         }
         return this.CredentialModel;
     }
@@ -197,7 +223,10 @@ class Auther extends Delegate {
     async validateAuthorizationRequirements() {
         const requirements = await this.getAuthorizationRequirements();
         let valid = true;
-        if (['oauth1', 'oauth2'].includes(requirements.type) && !requirements.url) {
+        if (
+            ['oauth1', 'oauth2'].includes(requirements.type) &&
+            !requirements.url
+        ) {
             valid = false;
         }
         return valid;
@@ -238,20 +267,32 @@ class Auther extends Delegate {
             throw new Error('Authorization failed');
         }
         const entityDetails = await this.getEntityDetails(
-            this.api, params, tokenResponse, this.userId
+            this.api,
+            params,
+            tokenResponse,
+            this.userId
+        );
+        Object.assign(
+            entityDetails.details,
+            this.apiParamsFromEntity(this.api)
         );
-        Object.assign(entityDetails.details, this.apiParamsFromEntity(this.api));
         await this.findOrCreateEntity(entityDetails);
         return {
             credential_id: this.credential.id,
             entity_id: this.entity.id,
             type: this.getName(),
-        }
+        };
     }
 
     async onTokenUpdate() {
-        const credentialDetails = await this.getCredentialDetails(this.api, this.userId);
-        Object.assign(credentialDetails.details, this.apiParamsFromCredential(this.api));
+        const credentialDetails = await this.getCredentialDetails(
+            this.api,
+            this.userId
+        );
+        Object.assign(
+            credentialDetails.details,
+            this.apiParamsFromCredential(this.api)
+        );
         credentialDetails.details.auth_is_valid = true;
         await this.updateOrCreateCredential(credentialDetails);
     }
@@ -259,11 +300,9 @@ class Auther extends Delegate {
     async receiveNotification(notifier, delegateString, object = null) {
         if (delegateString === this.api.DLGT_TOKEN_UPDATE) {
             await this.onTokenUpdate();
-        }
-        else if (delegateString === this.api.DLGT_TOKEN_DEAUTHORIZED) {
+        } else if (delegateString === this.api.DLGT_TOKEN_DEAUTHORIZED) {
             await this.deauthorize();
-        }
-        else if (delegateString === this.api.DLGT_INVALID_AUTH) {
+        } else if (delegateString === this.api.DLGT_INVALID_AUTH) {
             await this.markCredentialsInvalid();
         }
     }
@@ -286,10 +325,10 @@ class Auther extends Delegate {
         const search = await this.EntityModel.find(identifiers);
         if (search.length > 1) {
             throw new Error(
-                'Multiple entities found with the same identifiers: ' + JSON.stringify(identifiers)
+                'Multiple entities found with the same identifiers: ' +
+                    JSON.stringify(identifiers)
             );
-        }
-        else if (search.length === 0) {
+        } else if (search.length === 0) {
             this.entity = await this.EntityModel.create({
                 credential: this.credential.id,
                 ...details,
@@ -308,25 +347,27 @@ class Auther extends Delegate {
         const identifiers = get(credentialDetails, 'identifiers');
         const details = get(credentialDetails, 'details');
 
-        if (!this.credential){
-            const credentialSearch = await this.CredentialModel.find(identifiers);
+        if (!this.credential) {
+            const credentialSearch = await this.CredentialModel.find(
+                identifiers
+            );
             if (credentialSearch.length > 1) {
-                throw new Error(`Multiple credentials found with same identifiers: ${identifiers}`);
-            }
-            else if (credentialSearch.length === 1) {
+                throw new Error(
+                    `Multiple credentials found with same identifiers: ${identifiers}`
+                );
+            } else if (credentialSearch.length === 1) {
                 // found exactly one credential with these identifiers
                 this.credential = credentialSearch[0];
-            }
-            else {
+            } else {
                 // found no credential with these identifiers (match none for insert)
-                this.credential = {$exists: false};
+                this.credential = { $exists: false };
             }
         }
         // update credential or create if none was found
         this.credential = await this.CredentialModel.findOneAndUpdate(
-            {_id: this.credential},
-            {$set: {...identifiers, ...details}},
-            {useFindAndModify: true, new: true, upsert: true}
+            { _id: this.credential },
+            { $set: { ...identifiers, ...details } },
+            { useFindAndModify: true, new: true, upsert: true }
         );
     }
 
@@ -340,7 +381,9 @@ class Auther extends Delegate {
     async deauthorize() {
         this.api = new this.apiClass();
         if (this.entity?.credential) {
-            await this.CredentialModel.deleteOne({ _id: this.entity.credential });
+            await this.CredentialModel.deleteOne({
+                _id: this.entity.credential,
+            });
             this.entity.credential = undefined;
             await this.entity.save();
         }

package/module-plugin/requester/requester.js

@@ -108,6 +108,7 @@ class Requester extends Delegate {
     }
 
     async _post(options, stringify = true) {
+        console.log('options', options);
         const fetchOptions = {
             method: 'POST',
             credentials: 'include',

package/package.json

@@ -1,24 +1,31 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.3",
+  "version": "2.0.0-next.30",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "aws-sdk": "^2.1200.0",
     "bcryptjs": "^2.4.3",
+    "body-parser": "^1.20.2",
     "common-tags": "^1.8.2",
-    "express": "^4.18.2",
+    "cors": "^2.8.5",
+    "dotenv": "^16.4.7",
+    "express": "^4.19.2",
     "express-async-handler": "^1.2.0",
-    "lodash": "^4.17.21",
+    "form-data": "^4.0.0",
+    "fs-extra": "^11.2.0",
+    "lodash": "4.17.21",
     "lodash.get": "^4.4.2",
     "mongoose": "6.11.6",
-    "node-fetch": "^2.6.7"
+    "node-fetch": "^2.6.7",
+    "serverless-http": "^2.7.0",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0-next.3",
-    "@friggframework/prettier-config": "2.0.0-next.3",
-    "@friggframework/test": "2.0.0-next.3",
-    "@types/lodash": "^4.14.191",
+    "@friggframework/eslint-config": "2.0.0-next.30",
+    "@friggframework/prettier-config": "2.0.0-next.30",
+    "@friggframework/test": "2.0.0-next.30",
+    "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
     "eslint": "^8.22.0",
@@ -26,9 +33,7 @@
     "eslint-plugin-n": "^17.10.2",
     "eslint-plugin-promise": "^7.0.0",
     "jest": "^29.7.0",
-    "jest-runner-groups": "^2.2.0",
-    "mongodb-memory-server": "^8.9.0",
-    "prettier": "^2.8.5",
+    "prettier": "^2.7.1",
     "sinon": "^16.1.1",
     "typescript": "^5.0.2"
   },
@@ -48,5 +53,5 @@
   },
   "homepage": "https://github.com/friggframework/frigg#readme",
   "description": "",
-  "gitHead": "431427564322cdb02a43b686af70b0fb30a17a8b"
+  "gitHead": "5c1c0838a8e2d0d77e557ce11d9ad0899c3f464d"
 }

package/utils/backend-path.js

@@ -0,0 +1,38 @@
+const fs = require('fs-extra');
+const path = require('node:path');
+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)) {
+        // In production environment, check for index.js in the same directory
+        const indexJs = path.join(currentDir, 'index.js');
+        if (fs.existsSync(indexJs)) {
+            return rootPackageJson;
+        }
+    }
+
+    // If not found at root or not in production, look for it in the backend directory
+    while (currentDir !== path.parse(currentDir).root) {
+        const packageJsonPath = path.join(currentDir, 'backend', PACKAGE_JSON);
+        if (fs.existsSync(packageJsonPath)) {
+            return packageJsonPath;
+        }
+        currentDir = path.dirname(currentDir);
+    }
+    return null;
+}
+
+function validateBackendPath(backendPath) {
+    if (!backendPath) {
+        throw new Error('Could not find a backend package.json file.');
+    }
+}
+
+module.exports = {
+    findNearestBackendPackageJson,
+    validateBackendPath,
+}; 

package/utils/index.js

@@ -0,0 +1,6 @@
+const { findNearestBackendPackageJson, validateBackendPath } = require('./backend-path');
+
+module.exports = {
+    findNearestBackendPackageJson,
+    validateBackendPath,
+};