@friggframework/core 2.0.0--canary.460.ef50528.0 → 2.0.0--canary.460.ad0a60d.0

package/handlers/backend-utils.js

@@ -132,13 +132,10 @@ const createQueueWorker = (integrationClass) => {
     class QueueWorker extends Worker {
         async _run(params, context) {
             try {
-                if (params.event === 'ON_WEBHOOK') {
-                    if (!params.data?.integrationId) {
-                        throw new Error(
-                            'integrationId is required in data for ON_WEBHOOK event'
-                        );
-                    }
-
+                if (
+                    params.event === 'ON_WEBHOOK' &&
+                    params.data?.integrationId
+                ) {
                     integrationInstance = await loadIntegrationForWebhook(
                         params.data.integrationId
                     );
@@ -148,7 +145,10 @@ const createQueueWorker = (integrationClass) => {
                         integrationClass
                     );
                 } else {
-                    // Instantiates a DRY integration class without database records
+                    // Instantiates a DRY integration class without database records.
+                    // There will be cases where we need to use helpers that the api modules can export.
+                    // Like for HubSpot, the answer is to do a reverse lookup for the integration by the entity external ID (HubSpot Portal ID),
+                    // and then you'll have the integration ID available to hydrate from.
                     integrationInstance = new integrationClass();
                 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.460.ef50528.0",
+  "version": "2.0.0--canary.460.ad0a60d.0",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "@prisma/client": "^6.16.3",
@@ -23,9 +23,9 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.460.ef50528.0",
-    "@friggframework/prettier-config": "2.0.0--canary.460.ef50528.0",
-    "@friggframework/test": "2.0.0--canary.460.ef50528.0",
+    "@friggframework/eslint-config": "2.0.0--canary.460.ad0a60d.0",
+    "@friggframework/prettier-config": "2.0.0--canary.460.ad0a60d.0",
+    "@friggframework/test": "2.0.0--canary.460.ad0a60d.0",
     "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ef50528e85534659a61cdc909e77babffc6ae0f7"
+  "gitHead": "ad0a60db3a1af2e7e55bd0fa837fdb352a0fd2c2"
 }

package/user/tests/use-cases/login-user.test.js

@@ -3,7 +3,7 @@ const { LoginUser } = require('../../use-cases/login-user');
 const { TestUserRepository } = require('../doubles/test-user-repository');
 
 jest.mock('bcryptjs', () => ({
-    compareSync: jest.fn(),
+    compare: jest.fn(),
 }));
 
 describe('LoginUser Use Case', () => {
@@ -16,7 +16,7 @@ describe('LoginUser Use Case', () => {
         userRepository = new TestUserRepository({ userConfig });
         loginUser = new LoginUser({ userRepository, userConfig });
 
-        bcrypt.compareSync.mockClear();
+        bcrypt.compare.mockClear();
     });
 
     describe('With Password Authentication', () => {
@@ -28,11 +28,11 @@ describe('LoginUser Use Case', () => {
                 hashword: 'hashed-password',
             });
 
-            bcrypt.compareSync.mockReturnValue(true);
+            bcrypt.compare.mockResolvedValue(true);
 
             const user = await loginUser.execute({ username, password });
 
-            expect(bcrypt.compareSync).toHaveBeenCalledWith(
+            expect(bcrypt.compare).toHaveBeenCalledWith(
                 password,
                 'hashed-password'
             );
@@ -48,7 +48,7 @@ describe('LoginUser Use Case', () => {
                 hashword: 'hashed-password',
             });
 
-            bcrypt.compareSync.mockReturnValue(false);
+            bcrypt.compare.mockResolvedValue(false);
 
             await expect(
                 loginUser.execute({ username, password })
@@ -145,7 +145,7 @@ describe('LoginUser Use Case', () => {
             loginUser = new LoginUser({ userRepository, userConfig });
         });
 
-        it('should verify bcrypt.compareSync is called with plain password and hash', async () => {
+        it('should verify bcrypt.compare is called with plain password and hash', async () => {
             const username = 'bcrypt-test-user';
             const plainPassword = 'MyPlainPassword123';
             const bcryptHash = '$2b$10$abcdefghijklmnopqrstuv';
@@ -155,14 +155,14 @@ describe('LoginUser Use Case', () => {
                 hashword: bcryptHash,
             });
 
-            bcrypt.compareSync.mockReturnValue(true);
+            bcrypt.compare.mockResolvedValue(true);
 
             await loginUser.execute({ username, password: plainPassword });
 
-            expect(bcrypt.compareSync).toHaveBeenCalledTimes(1);
-            expect(bcrypt.compareSync).toHaveBeenCalledWith(plainPassword, bcryptHash);
+            expect(bcrypt.compare).toHaveBeenCalledTimes(1);
+            expect(bcrypt.compare).toHaveBeenCalledWith(plainPassword, bcryptHash);
 
-            const [firstArg, secondArg] = bcrypt.compareSync.mock.calls[0];
+            const [firstArg, secondArg] = bcrypt.compare.mock.calls[0];
             expect(firstArg).toBe(plainPassword);
             expect(secondArg).toBe(bcryptHash);
         });
@@ -192,14 +192,14 @@ describe('LoginUser Use Case', () => {
                 hashword: encryptedLookingValue,
             });
 
-            bcrypt.compareSync.mockReturnValue(false);
+            bcrypt.compare.mockResolvedValue(false);
 
             await expect(
                 loginUser.execute({ username, password: 'any-password' })
             ).rejects.toThrow('Incorrect username or password');
         });
 
-        it('should verify bcrypt.compareSync returns false for mismatched passwords', async () => {
+        it('should verify bcrypt.compare returns false for mismatched passwords', async () => {
             const username = 'mismatch-test-user';
             const correctHash = '$2b$10$correcthash';
 
@@ -208,13 +208,13 @@ describe('LoginUser Use Case', () => {
                 hashword: correctHash,
             });
 
-            bcrypt.compareSync.mockReturnValue(false);
+            bcrypt.compare.mockResolvedValue(false);
 
             await expect(
                 loginUser.execute({ username, password: 'wrong-password' })
             ).rejects.toThrow('Incorrect username or password');
 
-            expect(bcrypt.compareSync).toHaveBeenCalledWith('wrong-password', correctHash);
+            expect(bcrypt.compare).toHaveBeenCalledWith('wrong-password', correctHash);
         });
     });
 });