@friggframework/core 1.1.4--canary.301.ea53eb9.0 → 1.1.4--canary.301.19256e3.0

package/integrations/integration-router.js

@@ -89,11 +89,6 @@ function setIntegrationRoutes(router, factory, getUserId) {
             );
             await integration.onCreate();
 
-            // filtered set for results
-            const response = await IntegrationHelper.getFormattedIntegration(
-                integration.record
-            );
-
             res.status(201).json(
                 await IntegrationHelper.getFormattedIntegration(integration.record)
             );
@@ -116,11 +111,9 @@ function setIntegrationRoutes(router, factory, getUserId) {
             );
             await integration.onUpdate(params);
 
-            const response = await IntegrationHelper.getFormattedIntegration(
-                integration.record
+            res.json(
+                await IntegrationHelper.getFormattedIntegration(integration.record)
             );
-
-            res.json(response);
         })
     );
 
@@ -144,8 +137,7 @@ function setIntegrationRoutes(router, factory, getUserId) {
                 params.integrationId
             );
 
-            res.status(201);
-            res.json({});
+            res.status(201).json({});
         })
     );
 
@@ -156,8 +148,7 @@ function setIntegrationRoutes(router, factory, getUserId) {
             ]);
             const integration =
                 await integrationFactory.getInstanceFromIntegrationId(params);
-            const results = await integration.getConfigOptions();
-            res.json(results);
+            res.json(await integration.getConfigOptions());
         })
     );
 
@@ -168,10 +159,10 @@ function setIntegrationRoutes(router, factory, getUserId) {
             ]);
             const integration =
                 await integrationFactory.getInstanceFromIntegrationId(params);
-            const results = await integration.refreshConfigOptions(
-                req.body
+
+            res.json(
+                await integration.refreshConfigOptions(req.body)
             );
-            res.json(results);
         })
     );
 
@@ -183,11 +174,10 @@ function setIntegrationRoutes(router, factory, getUserId) {
             ]);
             const integration =
                 await integrationFactory.getInstanceFromIntegrationId(params);
-            const results = await integration.getActionOptions(
-                params.actionId
+
+            res.json(
+                await integration.getActionOptions(params.actionId)
             );
-            // We could perhaps augment router with dynamic options? Haven't decided yet, but here may be the place
-            res.json(results);
         })
     );
 
@@ -199,12 +189,10 @@ function setIntegrationRoutes(router, factory, getUserId) {
             ]);
             const integration =
                 await integrationFactory.getInstanceFromIntegrationId(params);
-            const results = await integration.refreshActionOptions(
-                params.actionId,
-                req.body
+
+            res.json(
+                await integration.refreshActionOptions(params.actionId, req.body)
             );
-            // We could perhaps augment router with dynamic options? Haven't decided yet, but here may be the place
-            res.json(results);
         })
     );
 
@@ -216,14 +204,12 @@ function setIntegrationRoutes(router, factory, getUserId) {
             ]);
             const integration =
                 await integrationFactory.getInstanceFromIntegrationId(params);
-            const results = await integration.notify(
-                params.actionId,
-                req.body
+
+            res.json(
+                await integration.notify(params.actionId, req.body)
             );
-            // We could perhaps augment router with dynamic options? Haven't decided yet, but here may be the place
-            res.json(results);
         })
-    )
+    );
 
     router.route('/api/integrations/:integrationId').get(
         catchAsyncError(async (req, res) => {
@@ -300,6 +286,7 @@ function setEntityRoutes(router, factory, getUserId) {
                     `Error: EntityManager of type ${params.entityType} requires a valid url`
                 );
             }
+
             res.json(await module.getAuthorizationRequirements());
         })
     );
@@ -310,15 +297,44 @@ function setEntityRoutes(router, factory, getUserId) {
                 'entityType',
                 'data',
             ]);
-            console.log('post authorize', params);
             const module = await getModuleInstance(req, params.entityType);
-            console.log('post authorize module', module);
-            const results = await module.processAuthorizationCallback({
-                userId: getUserId(req),
-                data: params.data,
-            });
 
-            res.json(results);
+            res.json(
+                await module.processAuthorizationCallback({
+                    userId: getUserId(req),
+                    data: params.data,
+                })
+            );
+        })
+    );
+
+    router.route('/api/entity').post(
+        catchAsyncError(async (req, res) => {
+            const params = checkRequiredParams(req.body, [
+                'entityType',
+                'data',
+            ]);
+            checkRequiredParams(req.body.data, ['credential_id']);
+
+            // May want to pass along the user ID as well so credential ID's can't be fished???
+            const credential = await IntegrationHelper.getCredentialById(
+                params.data.credential_id
+            );
+
+            if (!credential) {
+                throw Boom.badRequest('Invalid credential ID');
+            }
+
+            const module = await getModuleInstance(req, params.entityType);
+            const entityDetails = await module.getEntityDetails(
+                module.api,
+                null,
+                null,
+                getUserId(req)
+            )
+            res.json(
+                await module.findOrCreateEntity(entityDetails)
+            );
         })
     );
 
@@ -384,6 +400,7 @@ function setEntityRoutes(router, factory, getUserId) {
             if (!module) {
                 throw Boom.notFound();
             }
+
             res.json(module.entity);
         })
     );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "1.1.4--canary.301.ea53eb9.0",
+  "version": "1.1.4--canary.301.19256e3.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.1.4--canary.301.ea53eb9.0",
-    "@friggframework/prettier-config": "1.1.4--canary.301.ea53eb9.0",
-    "@friggframework/test": "1.1.4--canary.301.ea53eb9.0",
+    "@friggframework/eslint-config": "1.1.4--canary.301.19256e3.0",
+    "@friggframework/prettier-config": "1.1.4--canary.301.19256e3.0",
+    "@friggframework/test": "1.1.4--canary.301.19256e3.0",
     "@types/lodash": "^4.14.191",
     "@typescript-eslint/eslint-plugin": "^5.55.0",
     "chai": "^4.3.6",
@@ -49,5 +49,5 @@
   },
   "homepage": "https://github.com/friggframework/frigg#readme",
   "description": "",
-  "gitHead": "ea53eb9d4e5a63194a541d84a2f02d22a17f1175"
+  "gitHead": "19256e3241d018af6bfdd03f52521bc69621af28"
 }