@friggframework/core 2.0.0--canary.396.b9f7d5a.0 → 2.0.0--canary.396.d50d765.0

package/handlers/app-definition-loader.js

@@ -0,0 +1,38 @@
+const { findNearestBackendPackageJson } = require('@friggframework/core/utils');
+const path = require('node:path');
+const fs = require('fs-extra');
+
+/**
+ * Loads the App definition from the nearest backend package
+ * @function loadAppDefinition
+ * @description Searches for the nearest backend package.json, loads the corresponding index.js file,
+ * and extracts the application definition containing integrations and user configuration.
+ * @returns {{integrations: Array<object>, userConfig: object | null}} An object containing the application definition.
+ * @throws {Error} Throws error if backend package.json cannot be found.
+ * @throws {Error} Throws error if index.js file cannot be found in the backend directory.
+ * @example
+ * const { integrations, userConfig } = loadAppDefinition();
+ * console.log(`Found ${integrations.length} integrations`);
+ */
+function loadAppDefinition() {
+    const backendPath = findNearestBackendPackageJson();
+    if (!backendPath) {
+        throw new Error('Could not find backend package.json');
+    }
+
+    const backendDir = path.dirname(backendPath);
+    const backendFilePath = path.join(backendDir, 'index.js');
+    if (!fs.existsSync(backendFilePath)) {
+        throw new Error('Could not find index.js');
+    }
+
+    const backendJsFile = require(backendFilePath);
+    const appDefinition = backendJsFile.Definition;
+
+    const { integrations = [], user: userConfig = null } = appDefinition;
+    return { integrations, userConfig };
+}
+
+module.exports = {
+    loadAppDefinition,
+}; 

package/handlers/backend-utils.js

@@ -1,41 +1,6 @@
-const { findNearestBackendPackageJson } = require('@friggframework/core/utils');
-const path = require('node:path');
-const fs = require('fs-extra');
 const { Router } = require('express');
 const { Worker } = require('@friggframework/core');
 
-
-/**
- * Loads the App definition from the nearest backend package
- * @function loadAppDefinition
- * @description Searches for the nearest backend package.json, loads the corresponding index.js file,
- * and extracts the application definition containing integrations and user configuration.
- * @returns {{integrations: Array<object>, userConfig: object | null}} An object containing the application definition.
- * @throws {Error} Throws error if backend package.json cannot be found.
- * @throws {Error} Throws error if index.js file cannot be found in the backend directory.
- * @example
- * const { integrations, userConfig } = loadAppDefinition();
- * console.log(`Found ${integrations.length} integrations`);
- */
-function loadAppDefinition() {
-    const backendPath = findNearestBackendPackageJson();
-    if (!backendPath) {
-        throw new Error('Could not find backend package.json');
-    }
-
-    const backendDir = path.dirname(backendPath);
-    const backendFilePath = path.join(backendDir, 'index.js');
-    if (!fs.existsSync(backendFilePath)) {
-        throw new Error('Could not find index.js');
-    }
-
-    const backendJsFile = require(backendFilePath);
-    const appDefinition = backendJsFile.Definition;
-
-    const { integrations = [], user: userConfig = null } = appDefinition;
-    return { integrations, userConfig };
-}
-
 const loadRouterFromObject = (IntegrationClass, routerObject) => {
     const router = Router();
     const { path, method, event } = routerObject;
@@ -100,5 +65,4 @@ const createQueueWorker = (integrationClass, integrationFactory) => {
 module.exports = {
     loadRouterFromObject,
     createQueueWorker,
-    loadAppDefinition,
 };

package/handlers/routers/auth.js

@@ -2,7 +2,7 @@ const { createIntegrationRouter } = require('@friggframework/core');
 const { createAppHandler } = require('./../app-handler-helpers');
 const {
     loadAppDefinition,
-} = require('./../backend-utils');
+} = require('../app-definition-loader');
 const { UserRepository } = require('../../user/user-repository');
 const { IntegrationFactory } = require('../../integrations/integration-factory');
 const { GetUserFromBearerToken } = require('../../user/use-cases/get-user-from-bearer-token');

package/handlers/routers/integration-defined-routers.js

@@ -2,7 +2,7 @@ const { createAppHandler } = require('./../app-handler-helpers');
 const {
     loadAppDefinition,
     loadRouterFromObject,
-} = require('./../backend-utils');
+} = require('../app-definition-loader');
 const { Router } = require('express');
 const { IntegrationFactory } = require('../../integrations/integration-factory');
 

package/handlers/routers/user.js

@@ -10,7 +10,7 @@ const {
     CreateTokenForUserId,
 } = require('../../user/use-cases/create-token-for-user-id');
 const catchAsyncError = require('express-async-handler');
-const { loadAppDefinition } = require('../backend-utils');
+const { loadAppDefinition } = require('../app-definition-loader');
 
 const router = express();
 const { userConfig } = loadAppDefinition();

package/handlers/workers/integration-defined-workers.js

@@ -1,5 +1,5 @@
 const { createHandler } = require('@friggframework/core');
-const { loadAppDefinition, createQueueWorker } = require('../backend-utils');
+const { loadAppDefinition, createQueueWorker } = require('../app-definition-loader');
 const { IntegrationFactory } = require('../../integrations/integration-factory');
 
 const handlers = {};

package/integrations/integration-router.js

@@ -12,38 +12,9 @@ const { GetCredentialForUser } = require('../credential/use-cases/get-credential
 const { CreateIntegration } = require('./use-cases/create-integration');
 const { ModuleService } = require('../module-plugin/module-service');
 const { ModuleRepository } = require('../module-plugin/module-repository');
-const { loadAppDefinition } = require('../handlers/backend-utils');
-
-
-const { integrations } = loadAppDefinition();
-const moduleRepository = new ModuleRepository();
-const integrationRepository = new IntegrationRepository();
-const credentialRepository = new CredentialRepository();
-const moduleService = new ModuleService({ moduleRepository, moduleDefinitions: { ...getModules() } });
-const deleteIntegrationForUser = new DeleteIntegrationForUser({ integrationRepository });
-const getIntegrationForUser = new GetIntegrationForUser({ integrationRepository });
-const getIntegrationsForUser = new GetIntegrationsForUser({ integrationRepository });
-const getCredentialForUser = new GetCredentialForUser({ credentialRepository });
-const createIntegration = new CreateIntegration({
-    integrationRepository,
-    integrationClasses: integrations,
-    moduleService,
-});
-
-// todo: move this into a utils file
-const getModules = () => {
-    return [
-        ...new Set(
-            integrations
-                .map((integration) =>
-                    Object.values(integration.Definition.modules).map(
-                        (module) => module.definition
-                    )
-                )
-                .flat()
-        ),
-    ];
-}
+const {
+    loadAppDefinition,
+} = require('../handlers/app-definition-loader');
 
 // todo: dont send moduleFactory and integrationFactory as a factory object, instead send them as separate params.
 // todo: this could be a use case class
@@ -58,12 +29,59 @@ const getModules = () => {
  * @returns {express.Router} Configured Express router with integration and entity routes
  */
 function createIntegrationRouter(params) {
+    const { integrations } = loadAppDefinition();
+    const moduleRepository = new ModuleRepository();
+    const integrationRepository = new IntegrationRepository();
+    const credentialRepository = new CredentialRepository();
+
+    // todo: move this into a utils file
+    const getModules = () => {
+        return [
+            ...new Set(
+                integrations
+                    .map((integration) =>
+                        Object.values(integration.Definition.modules).map(
+                            (module) => module.definition
+                        )
+                    )
+                    .flat()
+            ),
+        ];
+    };
+    const moduleService = new ModuleService({
+        moduleRepository,
+        moduleDefinitions: getModules(),
+    });
+    const deleteIntegrationForUser = new DeleteIntegrationForUser({
+        integrationRepository,
+    });
+    const getIntegrationForUser = new GetIntegrationForUser({
+        integrationRepository,
+    });
+    const getIntegrationsForUser = new GetIntegrationsForUser({
+        integrationRepository,
+    });
+    const getCredentialForUser = new GetCredentialForUser({
+        credentialRepository,
+    });
+    const createIntegration = new CreateIntegration({
+        integrationRepository,
+        integrationClasses: integrations,
+        moduleService,
+    });
+
     const router = get(params, 'router', express());
     const factory = get(params, 'factory');
     const getUserFromBearerToken = get(params, 'getUserFromBearerToken');
 
-    setIntegrationRoutes(router, factory, getUserFromBearerToken);
-    setEntityRoutes(router, factory, getUserFromBearerToken);
+    setIntegrationRoutes(router, factory, getUserFromBearerToken, {
+        createIntegration,
+        deleteIntegrationForUser,
+        getIntegrationsForUser,
+    });
+    setEntityRoutes(router, factory, getUserFromBearerToken, {
+        getCredentialForUser,
+    });
     return router;
 }
 
@@ -97,8 +115,13 @@ function checkRequiredParams(params, requiredKeys) {
  * @param {Object} factory.integrationFactory - Factory for creating and managing integrations
  * @param {import('../user/use-cases/get-user-from-bearer-token').GetUserFromBearerToken} getUserFromBearerToken - Use case for retrieving a user from a bearer token
  */
-function setIntegrationRoutes(router, factory, getUserFromBearerToken) {
+function setIntegrationRoutes(router, factory, getUserFromBearerToken, useCases) {
     const { moduleFactory, integrationFactory } = factory;
+    const {
+        createIntegration,
+        deleteIntegrationForUser,
+        getIntegrationsForUser,
+    } = useCases;
 
     router.route('/api/integrations').get(
         catchAsyncError(async (req, res) => {
@@ -402,8 +425,9 @@ function setIntegrationRoutes(router, factory, getUserFromBearerToken) {
  * @param {Object} factory - Factory object containing moduleFactory
  * @param {import('../user/use-cases/get-user-from-bearer-token').GetUserFromBearerToken} getUserFromBearerToken - Use case for retrieving a user from a bearer token
  */
-function setEntityRoutes(router, factory, getUserFromBearerToken) {
+function setEntityRoutes(router, factory, getUserFromBearerToken, useCases) {
     const { moduleFactory } = factory;
+    const { getCredentialForUser } = useCases;
     const getModuleInstance = async (userId, entityType) => {
         if (!moduleFactory.checkIsValidType(entityType)) {
             throw Boom.badRequest(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.396.b9f7d5a.0",
+  "version": "2.0.0--canary.396.d50d765.0",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "aws-sdk": "^2.1200.0",
@@ -22,9 +22,9 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.396.b9f7d5a.0",
-    "@friggframework/prettier-config": "2.0.0--canary.396.b9f7d5a.0",
-    "@friggframework/test": "2.0.0--canary.396.b9f7d5a.0",
+    "@friggframework/eslint-config": "2.0.0--canary.396.d50d765.0",
+    "@friggframework/prettier-config": "2.0.0--canary.396.d50d765.0",
+    "@friggframework/test": "2.0.0--canary.396.d50d765.0",
     "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -53,5 +53,5 @@
   },
   "homepage": "https://github.com/friggframework/frigg#readme",
   "description": "",
-  "gitHead": "b9f7d5af4da61a0775ab275e823dbb63247be3b6"
+  "gitHead": "d50d765cf88cd18a604ded97837926ad2ab0bc87"
 }