@friggframework/core 2.0.0--canary.393.f4a61c1.0 → 2.0.0--canary.395.d07514c.0

package/handlers/app-handler-helpers.js

@@ -3,7 +3,6 @@ const express = require('express');
 const bodyParser = require('body-parser');
 const cors = require('cors');
 const Boom = require('@hapi/boom');
-const loadUserManager = require('./routers/middleware/loadUser');
 const serverlessHttp = require('serverless-http');
 
 const createApp = (applyMiddleware) => {
@@ -20,8 +19,6 @@ const createApp = (applyMiddleware) => {
         })
     );
 
-    app.use(loadUserManager);
-
     if (applyMiddleware) applyMiddleware(app);
 
     // Handle sending error response and logging server errors to console

package/handlers/backend-utils.js

@@ -1,24 +1,40 @@
-const { createFriggBackend, Worker } = require('@friggframework/core');
 const { findNearestBackendPackageJson } = require('@friggframework/core/utils');
 const path = require('node:path');
 const fs = require('fs-extra');
+const { Router } = require('express');
 
-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');
-}
+/**
+ * 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 backendJsFile = require(backendFilePath);
-const { Router } = require('express');
-const appDefinition = backendJsFile.Definition;
+    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 backend = createFriggBackend(appDefinition);
 const loadRouterFromObject = (IntegrationClass, routerObject) => {
     const router = Router();
     const { path, method, event } = routerObject;
@@ -30,7 +46,7 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
             const integration = new IntegrationClass({});
             await integration.loadModules();
             await integration.registerEventHandlers();
-            const result = await integration.send(event, {req, res, next});
+            const result = await integration.send(event, { req, res, next });
             res.json(result);
         } catch (error) {
             next(error);
@@ -39,6 +55,8 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
 
     return router;
 };
+
+//todo: this should be in a use case class
 const createQueueWorker = (integrationClass, integrationFactory) => {
     class QueueWorker extends Worker {
         async _run(params, context) {
@@ -79,7 +97,7 @@ const createQueueWorker = (integrationClass, integrationFactory) => {
 };
 
 module.exports = {
-    ...backend,
     loadRouterFromObject,
     createQueueWorker,
+    loadAppDefinition,
 };

package/handlers/routers/auth.js

@@ -1,26 +1,35 @@
 const { createIntegrationRouter } = require('@friggframework/core');
 const { createAppHandler } = require('./../app-handler-helpers');
-const { requireLoggedInUser } = require('./middleware/requireLoggedInUser');
 const {
-    moduleFactory,
-    integrationFactory,
-    IntegrationHelper,
+    loadAppDefinition,
 } = require('./../backend-utils');
+const { UserRepository } = require('../../user/user-repository');
+const { IntegrationFactory, IntegrationHelper } = require('../../integrations/integration-factory');
+const { GetUserFromBearerToken } = require('../../user/use-cases/get-user-from-bearer-token');
+
+const { integrations, userConfig } = loadAppDefinition();
+const integrationFactory = new IntegrationFactory(integrations);
+const userRepository = new UserRepository({ userConfig });
+const getUserFromBearerToken = new GetUserFromBearerToken({ userRepository });
 
 const router = createIntegrationRouter({
-    factory: { moduleFactory, integrationFactory, IntegrationHelper },
-    requireLoggedInUser,
-    getUserId: (req) => req.user.getUserId(),
+    factory: {
+        moduleFactory: integrationFactory.moduleFactory,
+        integrationFactory,
+        IntegrationHelper
+    },
+    getUserFromBearerToken,
 });
 
+//todo: what is this route doing here?
 router.route('/redirect/:appId').get((req, res) => {
     res.redirect(
-        `${process.env.FRONTEND_URI}/redirect/${
-            req.params.appId
+        `${process.env.FRONTEND_URI}/redirect/${req.params.appId
         }?${new URLSearchParams(req.query)}`
     );
 });
 
 const handler = createAppHandler('HTTP Event: Auth', router);
 
+// todo: I can not find where router is used, do we need to export it?
 module.exports = { handler, router };

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

@@ -1,15 +1,20 @@
 const { createAppHandler } = require('./../app-handler-helpers');
 const {
-    integrationFactory,
+    loadAppDefinition,
     loadRouterFromObject,
 } = require('./../backend-utils');
 const { Router } = require('express');
+const { IntegrationFactory } = require('../../integrations/integration-factory');
 
 const handlers = {};
+const { integrations } = loadAppDefinition();
+const integrationFactory = new IntegrationFactory(integrations);
+
+//todo: this should be in a use case class
 for (const IntegrationClass of integrationFactory.integrationClasses) {
     const router = Router();
     const basePath = `/api/${IntegrationClass.Definition.name}-integration`;
-    
+
     console.log(`\n│ Configuring routes for ${IntegrationClass.Definition.name} Integration:`);
 
     for (const routeDef of IntegrationClass.Definition.routes) {

package/handlers/routers/user.js

@@ -1,10 +1,29 @@
 const express = require('express');
 const { createAppHandler } = require('../app-handler-helpers');
 const { checkRequiredParams } = require('@friggframework/core');
-const { User } = require('../backend-utils');
+const { UserRepository } = require('../../user/user-repository');
+const {
+    CreateIndividualUser,
+} = require('../../user/use-cases/create-individual-user');
+const { LoginUser } = require('../../user/use-cases/login-user');
+const {
+    CreateTokenForUserId,
+} = require('../../user/use-cases/create-token-for-user-id');
 const catchAsyncError = require('express-async-handler');
+const { loadAppDefinition } = require('../backend-utils');
 
 const router = express();
+const { userConfig } = loadAppDefinition();
+const userRepository = new UserRepository({ userConfig });
+const createIndividualUser = new CreateIndividualUser({
+    userRepository,
+    userConfig,
+});
+const loginUser = new LoginUser({
+    userRepository,
+    userConfig,
+});
+const createTokenForUserId = new CreateTokenForUserId({ userRepository });
 
 // define the login endpoint
 router.route('/user/login').post(
@@ -13,8 +32,8 @@ router.route('/user/login').post(
             'username',
             'password',
         ]);
-        const user = await User.loginUser({ username, password });
-        const token = await user.createUserToken(120);
+        const user = await loginUser.execute({ username, password });
+        const token = await createTokenForUserId.execute(user.getId(), 120);
         res.status(201);
         res.json({ token });
     })
@@ -26,11 +45,12 @@ router.route('/user/create').post(
             'username',
             'password',
         ]);
-        const user = await User.createIndividualUser({
+
+        const user = await createIndividualUser.execute({
             username,
             password,
         });
-        const token = await user.createUserToken(120);
+        const token = await createTokenForUserId.execute(user.getId(), 120);
         res.status(201);
         res.json({ token });
     })

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

@@ -1,7 +1,11 @@
 const { createHandler } = require('@friggframework/core');
-const { integrationFactory, createQueueWorker } = require('../backend-utils');
+const { loadAppDefinition, createQueueWorker } = require('../backend-utils');
+const { IntegrationFactory } = require('../../integrations/integration-factory');
 
 const handlers = {};
+const { integrations } = loadAppDefinition();
+const integrationFactory = new IntegrationFactory(integrations);
+
 integrationFactory.integrationClasses.forEach((IntegrationClass) => {
     const defaultQueueWorker = createQueueWorker(IntegrationClass, integrationFactory);
 

package/index.js

@@ -42,7 +42,6 @@ const {
     IntegrationHelper,
     createIntegrationRouter,
     checkRequiredParams,
-    createFriggBackend,
 } = require('./integrations/index');
 const { TimeoutCatcher } = require('./lambda/index');
 const { debug, initDebugLog, flushDebugLog } = require('./logs/index');
@@ -113,7 +112,6 @@ module.exports = {
     IntegrationHelper,
     checkRequiredParams,
     createIntegrationRouter,
-    createFriggBackend,
 
     // lambda
     TimeoutCatcher,

package/integrations/index.js

@@ -4,7 +4,6 @@ const { Options } = require('./options');
 const { IntegrationMapping } = require('./integration-mapping');
 const { IntegrationFactory, IntegrationHelper } = require('./integration-factory');
 const { createIntegrationRouter, checkRequiredParams } = require('./integration-router');
-const { createFriggBackend } = require('./create-frigg-backend');
 
 module.exports = {
     IntegrationBase,
@@ -15,5 +14,4 @@ module.exports = {
     IntegrationHelper,
     createIntegrationRouter,
     checkRequiredParams,
-    createFriggBackend
 };

package/integrations/integration-factory.js

@@ -89,14 +89,13 @@ class IntegrationFactory {
         return moduleTypesAndKeys;
     }
 
-    async getInstanceFromIntegrationId(params) {
+    async getInstanceFromIntegrationId({ integrationId, userId }) {
         const integrationRecord = await IntegrationHelper.getIntegrationById(
-            params.integrationId
+            integrationId
         );
-        let { userId } = params;
         if (!integrationRecord) {
             throw new Error(
-                `No integration found by the ID of ${params.integrationId}`
+                `No integration found by the ID of ${integrationId}`
             );
         }
 
@@ -104,8 +103,7 @@ class IntegrationFactory {
             userId = integrationRecord.user._id.toString();
         } else if (userId.toString() !== integrationRecord.user.toString()) {
             throw new Error(
-                `Integration ${
-                    params.integrationId
+                `Integration ${params.integrationId
                 } does not belong to User ${userId}, ${integrationRecord.user.toString()}`
             );
         }
@@ -189,6 +187,7 @@ class IntegrationFactory {
     }
 }
 
+// todo: this should be split into use case classes
 const IntegrationHelper = {
     getFormattedIntegration: async function (integrationRecord) {
         const integrationObj = {