@friggframework/core 2.0.0--canary.461.651659d.0 → 2.0.0--canary.461.d74bc46.0

package/database/prisma.js

@@ -22,7 +22,7 @@ function getEncryptionConfig() {
     if (!hasKMS && !hasAES) {
         logger.warn(
             'No encryption keys configured (KMS_KEY_ARN or AES_KEY_ID). ' +
-                'Field-level encryption disabled. Set STAGE=production and configure keys to enable.'
+            'Field-level encryption disabled. Set STAGE=production and configure keys to enable.'
         );
         return { enabled: false };
     }
@@ -75,7 +75,7 @@ function loadCustomEncryptionSchema() {
 
 const prismaClientSingleton = () => {
     let PrismaClient;
-    
+
     // Helper to try loading Prisma client from multiple locations
     const loadPrismaClient = (dbType) => {
         const paths = [
@@ -84,7 +84,7 @@ const prismaClientSingleton = () => {
             // Local development location (relative to core package)
             `../generated/prisma-${dbType}`,
         ];
-        
+
         for (const path of paths) {
             try {
                 return require(path).PrismaClient;
@@ -92,7 +92,7 @@ const prismaClientSingleton = () => {
                 // Continue to next path
             }
         }
-        
+
         throw new Error(
             `Cannot find Prisma client for ${dbType}. Tried paths: ${paths.join(', ')}`
         );

package/handlers/routers/health.js

@@ -39,10 +39,10 @@ let moduleFactory, integrationClasses;
 try {
     const appDef = loadAppDefinition();
     integrationClasses = appDef.integrations || [];
-    
+
     const moduleRepository = createModuleRepository();
     const moduleDefinitions = getModulesDefinitionFromIntegrationClasses(integrationClasses);
-    
+
     moduleFactory = new ModuleFactory({
         moduleRepository,
         moduleDefinitions,

package/index.js

@@ -33,6 +33,15 @@ const {
     UserRepositoryMongo,
     UserRepositoryPostgres,
 } = require('./user/repositories/user-repository-factory');
+const {
+    GetUserFromXFriggHeaders,
+} = require('./user/use-cases/get-user-from-x-frigg-headers');
+const {
+    GetUserFromAdopterJwt,
+} = require('./user/use-cases/get-user-from-adopter-jwt');
+const {
+    AuthenticateUser,
+} = require('./user/use-cases/authenticate-user');
 
 const {
     CredentialRepository,
@@ -123,6 +132,9 @@ module.exports = {
     createUserRepository,
     UserRepositoryMongo,
     UserRepositoryPostgres,
+    GetUserFromXFriggHeaders,
+    GetUserFromAdopterJwt,
+    AuthenticateUser,
     CredentialRepository,
     ModuleRepository,
     IntegrationMappingRepository,

package/integrations/integration-router.js

@@ -56,6 +56,15 @@ const {
 const {
     GetUserFromBearerToken,
 } = require('../user/use-cases/get-user-from-bearer-token');
+const {
+    GetUserFromXFriggHeaders,
+} = require('../user/use-cases/get-user-from-x-frigg-headers');
+const {
+    GetUserFromAdopterJwt,
+} = require('../user/use-cases/get-user-from-adopter-jwt');
+const {
+    AuthenticateUser,
+} = require('../user/use-cases/authenticate-user');
 const {
     ProcessAuthorizationCallback,
 } = require('../modules/use-cases/process-authorization-callback');
@@ -73,6 +82,23 @@ function createIntegrationRouter() {
         userConfig,
     });
 
+    const getUserFromXFriggHeaders = new GetUserFromXFriggHeaders({
+        userRepository,
+        userConfig,
+    });
+
+    const getUserFromAdopterJwt = new GetUserFromAdopterJwt({
+        userRepository,
+        userConfig,
+    });
+
+    const authenticateUser = new AuthenticateUser({
+        getUserFromBearerToken,
+        getUserFromXFriggHeaders,
+        getUserFromAdopterJwt,
+        userConfig,
+    });
+
     const moduleFactory = new ModuleFactory({
         moduleRepository,
         moduleDefinitions:
@@ -165,7 +191,7 @@ function createIntegrationRouter() {
 
     const router = express();
 
-    setIntegrationRoutes(router, getUserFromBearerToken, {
+    setIntegrationRoutes(router, authenticateUser, {
         createIntegration,
         deleteIntegrationForUser,
         getIntegrationsForUser,
@@ -174,7 +200,7 @@ function createIntegrationRouter() {
         updateIntegration,
         getPossibleIntegrations,
     });
-    setEntityRoutes(router, getUserFromBearerToken, {
+    setEntityRoutes(router, authenticateUser, {
         getCredentialForUser,
         getModuleInstanceFromType,
         getEntityOptionsByType,
@@ -201,10 +227,8 @@ function checkRequiredParams(params, requiredKeys) {
 
     if (missingKeys.length > 0) {
         throw Boom.badRequest(
-            `Missing Parameter${
-                missingKeys.length === 1 ? '' : 's'
-            }: ${missingKeys.join(', ')} ${
-                missingKeys.length === 1 ? 'is' : 'are'
+            `Missing Parameter${missingKeys.length === 1 ? '' : 's'
+            }: ${missingKeys.join(', ')} ${missingKeys.length === 1 ? 'is' : 'are'
             } required.`
         );
     }
@@ -214,10 +238,10 @@ function checkRequiredParams(params, requiredKeys) {
 /**
  * Sets up integration-related routes on the provided Express router
  * @param {express.Router} router - Express router instance to add routes to
- * @param {import('../user/use-cases/get-user-from-bearer-token').GetUserFromBearerToken} getUserFromBearerToken - Use case for retrieving a user from a bearer token
+ * @param {import('../user/use-cases/authenticate-user').AuthenticateUser} authenticateUser - Use case for multi-mode user authentication
  * @param {Object} useCases - use cases for integration management
  */
-function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
+function setIntegrationRoutes(router, authenticateUser, useCases) {
     const {
         createIntegration,
         deleteIntegrationForUser,
@@ -229,9 +253,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
     } = useCases;
     router.route('/api/integrations').get(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const integrations = await getIntegrationsForUser.execute(userId);
             const results = {
@@ -248,9 +270,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/integrations').post(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const params = checkRequiredParams(req.body, [
                 'entities',
@@ -271,9 +291,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/integrations/:integrationId').patch(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const params = checkRequiredParams(req.body, ['config']);
 
@@ -288,9 +306,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/integrations/:integrationId').delete(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const params = checkRequiredParams(req.params, ['integrationId']);
             await deleteIntegrationForUser.execute(
                 params.integrationId,
@@ -302,9 +318,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/integrations/:integrationId/config/options').get(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const params = checkRequiredParams(req.params, ['integrationId']);
             const integration = await getIntegrationInstance.execute(
                 params.integrationId,
@@ -318,9 +332,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
         .route('/api/integrations/:integrationId/config/options/refresh')
         .post(
             catchAsyncError(async (req, res) => {
-                const user = await getUserFromBearerToken.execute(
-                    req.headers.authorization
-                );
+                const user = await authenticateUser.execute(req);
                 const params = checkRequiredParams(req.params, [
                     'integrationId',
                 ]);
@@ -336,9 +348,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
         );
     router.route('/api/integrations/:integrationId/actions').all(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const params = checkRequiredParams(req.params, ['integrationId']);
             const integration = await getIntegrationInstance.execute(
                 params.integrationId,
@@ -352,9 +362,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
         .route('/api/integrations/:integrationId/actions/:actionId/options')
         .all(
             catchAsyncError(async (req, res) => {
-                const user = await getUserFromBearerToken.execute(
-                    req.headers.authorization
-                );
+                const user = await authenticateUser.execute(req);
                 const params = checkRequiredParams(req.params, [
                     'integrationId',
                     'actionId',
@@ -379,9 +387,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
         )
         .post(
             catchAsyncError(async (req, res) => {
-                const user = await getUserFromBearerToken.execute(
-                    req.headers.authorization
-                );
+                const user = await authenticateUser.execute(req);
                 const params = checkRequiredParams(req.params, [
                     'integrationId',
                     'actionId',
@@ -402,9 +408,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/integrations/:integrationId/actions/:actionId').post(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const params = checkRequiredParams(req.params, [
                 'integrationId',
                 'actionId',
@@ -419,9 +423,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/integrations/:integrationId').get(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
 
             if (!user) {
                 throw Boom.forbidden('User not found');
@@ -446,9 +448,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/integrations/:integrationId/test-auth').get(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const params = checkRequiredParams(req.params, ['integrationId']);
             const instance = await getIntegrationInstance.execute(
                 params.integrationId,
@@ -478,9 +478,9 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
 /**
  * Sets up entity-related routes for the integration router
  * @param {Object} router - Express router instance
- * @param {import('../user/use-cases/get-user-from-bearer-token').GetUserFromBearerToken} getUserFromBearerToken - Use case for retrieving a user from a bearer token
+ * @param {import('../user/use-cases/authenticate-user').AuthenticateUser} authenticateUser - Use case for multi-mode user authentication
  */
-function setEntityRoutes(router, getUserFromBearerToken, useCases) {
+function setEntityRoutes(router, authenticateUser, useCases) {
     const {
         getCredentialForUser,
         getModuleInstanceFromType,
@@ -494,9 +494,7 @@ function setEntityRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/authorize').get(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const params = checkRequiredParams(req.query, ['entityType']);
             const module = await getModuleInstanceFromType.execute(
@@ -517,9 +515,7 @@ function setEntityRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/authorize').post(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const params = checkRequiredParams(req.body, [
                 'entityType',
@@ -538,9 +534,7 @@ function setEntityRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/entity').post(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const params = checkRequiredParams(req.body, [
                 'entityType',
@@ -575,9 +569,7 @@ function setEntityRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/entity/options/:credentialId').get(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             // TODO May want to pass along the user ID as well so credential ID's can't be fished???
             // TODO **flagging this for review** -MW
@@ -601,9 +593,7 @@ function setEntityRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/entities/:entityId/test-auth').get(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const params = checkRequiredParams(req.params, ['entityId']);
             const testAuthResponse = await testModuleAuth.execute(
@@ -630,9 +620,7 @@ function setEntityRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/entities/:entityId').get(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const params = checkRequiredParams(req.params, ['entityId']);
             const module = await getModule.execute(params.entityId, userId);
@@ -643,9 +631,7 @@ function setEntityRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/entities/:entityId/options').post(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const params = checkRequiredParams(req.params, ['entityId']);
 
@@ -660,9 +646,7 @@ function setEntityRoutes(router, getUserFromBearerToken, useCases) {
 
     router.route('/api/entities/:entityId/options/refresh').post(
         catchAsyncError(async (req, res) => {
-            const user = await getUserFromBearerToken.execute(
-                req.headers.authorization
-            );
+            const user = await authenticateUser.execute(req);
             const userId = user.getId();
             const params = checkRequiredParams(req.params, ['entityId']);
             const updatedOptions = await refreshEntityOptions.execute(