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

package/credential/repositories/credential-repository-postgres.js

@@ -111,8 +111,7 @@ class CredentialRepositoryPostgres extends CredentialRepositoryInterface {
         if (!identifiers)
             throw new Error('identifiers required to upsert credential');
 
-        // Support both userId (preferred) and user (legacy) for backward compatibility
-        if (!identifiers.userId && !identifiers.user) {
+        if (!identifiers.userId) {
             throw new Error('userId required in identifiers');
         }
         if (!identifiers.externalId) {
@@ -155,7 +154,7 @@ class CredentialRepositoryPostgres extends CredentialRepositoryInterface {
 
         const created = await this.prisma.credential.create({
             data: {
-                // Use userId from where clause (supports both userId and user fields)
+                // Use userId from where clause
                 userId: where.userId,
                 externalId,
                 authIsValid: authIsValid,
@@ -259,11 +258,8 @@ class CredentialRepositoryPostgres extends CredentialRepositoryInterface {
         const where = {};
 
         if (identifiers.id) where.id = this._convertId(identifiers.id);
-        // Support both userId (preferred) and user (legacy) for backward compatibility
         if (identifiers.userId)
             where.userId = this._convertId(identifiers.userId);
-        else if (identifiers.user)
-            where.userId = this._convertId(identifiers.user);
         if (identifiers.externalId) where.externalId = identifiers.externalId;
 
         return where;

package/credential/repositories/credential-repository.js

@@ -46,7 +46,6 @@ class CredentialRepository extends CredentialRepositoryInterface {
         return {
             _id: credential.id,
             id: credential.id,
-            user: credential.userId,
             userId: credential.userId,
             externalId: credential.externalId,
             authIsValid: credential.authIsValid,
@@ -105,18 +104,24 @@ class CredentialRepository extends CredentialRepositoryInterface {
         if (!identifiers)
             throw new Error('identifiers required to upsert credential');
 
+        if (!identifiers.userId) {
+            throw new Error('userId required in identifiers');
+        }
+        if (!identifiers.externalId) {
+            throw new Error(
+                'externalId required in identifiers to prevent credential collision. ' +
+                    'When multiple credentials exist for the same user, both userId and externalId ' +
+                    'are needed to uniquely identify which credential to update.'
+            );
+        }
+
         // Build where clause from identifiers
         const where = this._convertIdentifiersToWhere(identifiers);
 
+        const { externalId } = identifiers;
+
         // Separate schema fields from dynamic OAuth data
-        const {
-            user,
-            userId,
-            externalId,
-            authIsValid,
-            
-            ...oauthData
-        } = details;
+        const { authIsValid, ...oauthData } = details;
 
         // Find existing credential
         const existing = await this.prisma.credential.findFirst({ where });
@@ -128,11 +133,8 @@ class CredentialRepository extends CredentialRepositoryInterface {
             const updated = await this.prisma.credential.update({
                 where: { id: existing.id },
                 data: {
-                    userId: userId || user || existing.userId,
-                    externalId:
-                        externalId !== undefined
-                            ? externalId
-                            : existing.externalId,
+                    userId: existing.userId,
+                    externalId: existing.externalId,
                     authIsValid:
                         authIsValid !== undefined
                             ? authIsValid
@@ -153,10 +155,9 @@ class CredentialRepository extends CredentialRepositoryInterface {
         // Create new credential
         const created = await this.prisma.credential.create({
             data: {
-                userId: userId || user,
+                userId: where.userId,
                 externalId,
                 authIsValid: authIsValid,
-                
                 data: oauthData,
             },
         });
@@ -225,11 +226,10 @@ class CredentialRepository extends CredentialRepositoryInterface {
 
         // Separate schema fields from OAuth data
         const {
-            user,
             userId,
             externalId,
             authIsValid,
-            
+
             ...oauthData
         } = updates;
 
@@ -239,7 +239,7 @@ class CredentialRepository extends CredentialRepositoryInterface {
         const updated = await this.prisma.credential.update({
             where: { id: credentialId },
             data: {
-                userId: userId || user || existing.userId,
+                userId: userId || existing.userId,
                 externalId:
                     externalId !== undefined ? externalId : existing.externalId,
                 authIsValid:
@@ -273,7 +273,6 @@ class CredentialRepository extends CredentialRepositoryInterface {
 
         if (identifiers._id) where.id = identifiers._id;
         if (identifiers.id) where.id = identifiers.id;
-        if (identifiers.user) where.userId = identifiers.user;
         if (identifiers.userId) where.userId = identifiers.userId;
         if (identifiers.externalId) where.externalId = identifiers.externalId;
 
@@ -291,7 +290,6 @@ class CredentialRepository extends CredentialRepositoryInterface {
 
         if (filter.credentialId) where.id = filter.credentialId;
         if (filter.id) where.id = filter.id;
-        if (filter.user) where.userId = filter.user;
         if (filter.userId) where.userId = filter.userId;
         if (filter.externalId) where.externalId = filter.externalId;
 

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.68",
+    "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.68",
-        "@friggframework/prettier-config": "2.0.0-next.68",
-        "@friggframework/test": "2.0.0-next.68",
+        "@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": "c411e105b93b02eb77b55c580aa6c0e0cce3672f"
+    "gitHead": "018c93f98b5f14786d016a4f621adef10ad27597"
 }