@friggframework/core 2.0.0-next.67 → 2.0.0-next.69

package/modules/repositories/module-repository.js

@@ -42,12 +42,12 @@ class ModuleRepository extends ModuleRepositoryInterface {
 
         return {
             id: entity.id,
-            accountId: entity.accountId,
             credential: entity.credential,
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
             moduleName: entity.moduleName,
+            ...(entity.data || {}),
         };
     }
 
@@ -66,12 +66,12 @@ class ModuleRepository extends ModuleRepositoryInterface {
 
         return entities.map((e) => ({
             id: e.id,
-            accountId: e.accountId,
             credential: e.credential,
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
             moduleName: e.moduleName,
+            ...(e.data || {}),
         }));
     }
 
@@ -90,12 +90,12 @@ class ModuleRepository extends ModuleRepositoryInterface {
 
         return entities.map((e) => ({
             id: e.id,
-            accountId: e.accountId,
             credential: e.credential,
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
             moduleName: e.moduleName,
+            ...(e.data || {}),
         }));
     }
 
@@ -118,12 +118,12 @@ class ModuleRepository extends ModuleRepositoryInterface {
 
         return entities.map((e) => ({
             id: e.id,
-            accountId: e.accountId,
             credential: e.credential,
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
             moduleName: e.moduleName,
+            ...(e.data || {}),
         }));
     }
 
@@ -163,12 +163,12 @@ class ModuleRepository extends ModuleRepositoryInterface {
 
         return {
             id: entity.id,
-            accountId: entity.accountId,
             credential: entity.credential,
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
             moduleName: entity.moduleName,
+            ...(entity.data || {}),
         };
     }
 
@@ -180,14 +180,24 @@ class ModuleRepository extends ModuleRepositoryInterface {
      * @returns {Promise<Object>} Created entity object
      */
     async createEntity(entityData) {
-        // Convert Mongoose-style fields to Prisma
+        const {
+            user,
+            userId,
+            credential,
+            credentialId,
+            name,
+            moduleName,
+            externalId,
+            ...dynamicData
+        } = entityData;
+
         const data = {
-            userId: entityData.user || entityData.userId,
-            credentialId: entityData.credential || entityData.credentialId,
-            name: entityData.name,
-            moduleName: entityData.moduleName,
-            externalId: entityData.externalId,
-            accountId: entityData.accountId,
+            userId: userId || user,
+            credentialId: credentialId || credential,
+            name,
+            moduleName,
+            externalId,
+            data: dynamicData,
         };
 
         const entity = await this.prisma.entity.create({
@@ -197,12 +207,12 @@ class ModuleRepository extends ModuleRepositoryInterface {
 
         return {
             id: entity.id,
-            accountId: entity.accountId,
             credential: entity.credential,
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
             moduleName: entity.moduleName,
+            ...(entity.data || {}),
         };
     }
 
@@ -215,36 +225,55 @@ class ModuleRepository extends ModuleRepositoryInterface {
      * @returns {Promise<Object|null>} Updated entity object or null if not found
      */
     async updateEntity(entityId, updates) {
-        // Convert Mongoose-style fields to Prisma
-        const data = {};
-        if (updates.user !== undefined) data.userId = updates.user;
-        if (updates.userId !== undefined) data.userId = updates.userId;
-        if (updates.credential !== undefined)
-            data.credentialId = updates.credential;
-        if (updates.credentialId !== undefined)
-            data.credentialId = updates.credentialId;
-        if (updates.name !== undefined) data.name = updates.name;
-        if (updates.moduleName !== undefined)
-            data.moduleName = updates.moduleName;
-        if (updates.externalId !== undefined)
-            data.externalId = updates.externalId;
-        if (updates.accountId !== undefined) data.accountId = updates.accountId;
+        const existing = await this.prisma.entity.findUnique({
+            where: { id: entityId },
+        });
+
+        if (!existing) {
+            return null;
+        }
+
+        const {
+            user,
+            userId,
+            credential,
+            credentialId,
+            name,
+            moduleName,
+            externalId,
+            ...dynamicData
+        } = updates;
+
+        const schemaUpdates = {};
+        if (user !== undefined || userId !== undefined) {
+            schemaUpdates.userId = userId || user;
+        }
+        if (credential !== undefined || credentialId !== undefined) {
+            schemaUpdates.credentialId = credentialId || credential;
+        }
+        if (name !== undefined) schemaUpdates.name = name;
+        if (moduleName !== undefined) schemaUpdates.moduleName = moduleName;
+        if (externalId !== undefined) schemaUpdates.externalId = externalId;
+
+        if (Object.keys(dynamicData).length > 0) {
+            schemaUpdates.data = { ...(existing.data || {}), ...dynamicData };
+        }
 
         try {
             const entity = await this.prisma.entity.update({
                 where: { id: entityId },
-                data,
+                data: schemaUpdates,
                 include: { credential: true },
             });
 
             return {
                 id: entity.id,
-                accountId: entity.accountId,
                 credential: entity.credential,
                 userId: entity.userId,
                 name: entity.name,
                 externalId: entity.externalId,
                 moduleName: entity.moduleName,
+                ...(entity.data || {}),
             };
         } catch (error) {
             if (error.code === 'P2025') {

package/modules/requester/oauth-2.js

@@ -279,6 +279,15 @@ class OAuth2Requester extends Requester {
      */
     async refreshAuth() {
         try {
+            console.log('[OAuth2Requester.refreshAuth] Starting token refresh', {
+                grant_type: this.grant_type,
+                has_refresh_token: !!this.refresh_token,
+                has_client_id: !!this.client_id,
+                has_client_secret: !!this.client_secret,
+                has_token_uri: !!this.tokenUri,
+                tokenUri: this.tokenUri,
+            });
+
             if (this.grant_type !== 'client_credentials') {
                 await this.refreshAccessToken({
                     refresh_token: this.refresh_token,
@@ -286,8 +295,15 @@ class OAuth2Requester extends Requester {
             } else {
                 await this.getTokenFromClientCredentials();
             }
+            console.log('[OAuth2Requester.refreshAuth] Token refresh succeeded');
             return true;
-        } catch {
+        } catch (error) {
+            console.error('[OAuth2Requester.refreshAuth] Token refresh failed', {
+                error_message: error?.message,
+                error_name: error?.name,
+                response_status: error?.response?.status,
+                response_data: error?.response?.data,
+            });
             await this.notify(this.DLGT_INVALID_AUTH);
             return false;
         }

package/modules/test/mock-api/definition.js

@@ -20,7 +20,7 @@ const Definition = {
         getEntityDetails: async function (api, callbackParams, tokenResponse, userId) {
             const userDetails = await api.getUserDetails();
             return {
-                identifiers: { externalId: userDetails.portalId, user: userId },
+                identifiers: { externalId: userDetails.portalId, userId },
                 details: { name: userDetails.hub_domain },
             }
         },
@@ -33,7 +33,7 @@ const Definition = {
         getCredentialDetails: async function (api, userId) {
             const userDetails = await api.getUserDetails();
             return {
-                identifiers: { externalId: userDetails.portalId, user: userId },
+                identifiers: { externalId: userDetails.portalId, userId },
                 details: {}
             };
         },

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0-next.67",
+    "version": "2.0.0-next.69",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -38,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0-next.67",
-        "@friggframework/prettier-config": "2.0.0-next.67",
-        "@friggframework/test": "2.0.0-next.67",
+        "@friggframework/eslint-config": "2.0.0-next.69",
+        "@friggframework/prettier-config": "2.0.0-next.69",
+        "@friggframework/test": "2.0.0-next.69",
         "@prisma/client": "^6.17.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "6b324d858e2593833a79f66c00b700272013a8cf"
+    "gitHead": "018c93f98b5f14786d016a4f621adef10ad27597"
 }

package/prisma-mongodb/schema.prisma

@@ -119,6 +119,8 @@ model Entity {
   moduleName   String?
   externalId   String?
 
+  data Json @default("{}")
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 

package/prisma-postgresql/schema.prisma

@@ -116,6 +116,8 @@ model Entity {
   moduleName   String?
   externalId   String?
 
+  data Json @default("{}")
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt