@friggframework/core 2.0.0-next.70 → 2.0.0-next.71

package/handlers/app-handler-helpers.js

@@ -32,6 +32,7 @@ const createApp = (applyMiddleware) => {
             flushDebugLog(boomError);
             res.status(statusCode).json({ error: 'Internal Server Error' });
         } else {
+            console.warn(`[Frigg] ${req.method} ${req.path} -> ${statusCode}: ${err.message}`);
             res.status(statusCode).json({ error: err.message });
         }
     });

package/modules/module.js

@@ -42,7 +42,9 @@ class Module extends Delegate {
         const apiParams = {
             ...this.definition.env,
             delegate: this,
-            ...(this.credential?.data ? this.apiParamsFromCredential(this.credential.data) : {}), // Handle case when credential is undefined
+            ...(this.credential?.data
+                ? this.apiParamsFromCredential(this.credential.data)
+                : {}), // Handle case when credential is undefined
             ...this.apiParamsFromEntity(this.entity),
         };
         this.api = new this.apiClass(apiParams);
@@ -100,10 +102,15 @@ class Module extends Delegate {
             this.api,
             this.userId
         );
-        Object.assign(
-            credentialDetails.details,
-            this.apiParamsFromCredential(this.api)
-        );
+        const apiParams = this.apiParamsFromCredential(this.api);
+
+        if (!apiParams.refresh_token && this.api.isRefreshable) {
+            console.warn(
+                `[Frigg] No refresh_token in apiParams for module ${this.name}.`
+            );
+        }
+
+        Object.assign(credentialDetails.details, apiParams);
         credentialDetails.details.authIsValid = true;
 
         const persisted = await this.credentialRepository.upsertCredential(

package/modules/requester/oauth-2.js

@@ -30,7 +30,6 @@ const { ModuleConstants } = require('../ModuleConstants');
  * await api.getTokenFromClientCredentials();
  */
 class OAuth2Requester extends Requester {
-
     static requesterType = ModuleConstants.authType.oauth2;
 
     /**
@@ -118,6 +117,16 @@ class OAuth2Requester extends Requester {
         const newRefreshToken = get(params, 'refresh_token', null);
         if (newRefreshToken !== null) {
             this.refresh_token = newRefreshToken;
+        } else {
+            if (this.refresh_token) {
+                console.log(
+                    '[Frigg] No refresh_token in response, preserving existing'
+                );
+            } else {
+                console.log(
+                    '[Frigg] Current refresh_token is null and no new refresh_token in response'
+                );
+            }
         }
         const accessExpiresIn = get(params, 'expires_in', null);
         const refreshExpiresIn = get(
@@ -128,7 +137,9 @@ class OAuth2Requester extends Requester {
 
         this.accessTokenExpire = new Date(Date.now() + accessExpiresIn * 1000);
         if (refreshExpiresIn !== null) {
-            this.refreshTokenExpire = new Date(Date.now() + refreshExpiresIn * 1000);
+            this.refreshTokenExpire = new Date(
+                Date.now() + refreshExpiresIn * 1000
+            );
         }
 
         await this.notify(this.DLGT_TOKEN_UPDATE);
@@ -237,6 +248,7 @@ class OAuth2Requester extends Requester {
                 'Content-Type': 'application/x-www-form-urlencoded',
             },
         };
+        console.log('[Frigg] Refreshing access token with options');
         const response = await this._post(options, false);
         await this.setTokens(response);
         return response;
@@ -284,7 +296,7 @@ class OAuth2Requester extends Requester {
      */
     async refreshAuth() {
         try {
-            console.log('[OAuth2Requester.refreshAuth] Starting token refresh', {
+            console.log('[Frigg] Starting token refresh', {
                 grant_type: this.grant_type,
                 has_refresh_token: !!this.refresh_token,
                 has_client_id: !!this.client_id,
@@ -300,10 +312,10 @@ class OAuth2Requester extends Requester {
             } else {
                 await this.getTokenFromClientCredentials();
             }
-            console.log('[OAuth2Requester.refreshAuth] Token refresh succeeded');
+            console.log('[Frigg] Token refresh succeeded');
             return true;
         } catch (error) {
-            console.error('[OAuth2Requester.refreshAuth] Token refresh failed', {
+            console.error('[Frigg] Token refresh failed', {
                 error_message: error?.message,
                 error_name: error?.name,
                 response_status: error?.response?.status,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0-next.70",
+    "version": "2.0.0-next.71",
     "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.70",
-        "@friggframework/prettier-config": "2.0.0-next.70",
-        "@friggframework/test": "2.0.0-next.70",
+        "@friggframework/eslint-config": "2.0.0-next.71",
+        "@friggframework/prettier-config": "2.0.0-next.71",
+        "@friggframework/test": "2.0.0-next.71",
         "@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": "dee1112300e01813e68b2598c3a722d1a31e1677"
+    "gitHead": "a0fd3deb90390dbb9d01d7ac8fdb5e5f5b8f9c78"
 }