Refactor OAuth token handling for new structure support

Updated APICall, AccessTokenManager, and OAuth.helper to support both legacy and new OAuth token storage structures. Added logic to distinguish between structures, improved parameter extraction for OAuth1 signatures, and ensured correct token updates and retrievals for both formats. Also replaced usage of oauthService with oauth_con_id for more robust identification.

Author: samme-abdul

packages/core/src/Components/APICall/APICall.class.ts

@@ -59,12 +59,13 @@ export class APICall extends Component {
         consumerSecret: Joi.string().allow('').label('Consumer Secret'),
         oauth1CallbackURL: Joi.string().allow('').label('OAuth1 Callback URL'),
         authenticate: Joi.string().allow('').label('Authenticate'),
+        oauth_con_id: Joi.string().allow('').label('OAuth Connection ID'),
     });
     constructor() {
         super();
     }
 
-    init() {}
+    init() { }
 
     async process(input, config, agent: Agent) {
         await super.process(input, config, agent);
@@ -113,10 +114,9 @@ export class APICall extends Component {
             let Headers: any = {};
             let _error: any = undefined;
             try {
-                if (config?.data?.oauthService && config?.data?.oauthService !== 'None') {
-                    const rootUrl = new URL(reqConfig.url).origin;
+                if (config?.data?.oauth_con_id !== '' && config?.data?.oauth_con_id !== 'None') {
                     const additionalParams = extractAdditionalParamsForOAuth1(reqConfig);
-                    const oauthHeaders = await generateOAuthHeaders(agent, config, reqConfig, logger, additionalParams, rootUrl);
+                    const oauthHeaders = await generateOAuthHeaders(agent, config, reqConfig, logger, additionalParams);
                     //reqConfig.headers = { ...reqConfig.headers, ...oauthHeaders };
                     reqConfig.headers = reqConfig.headers.concat({ ...oauthHeaders });
                 }

packages/core/src/Components/APICall/AccessTokenManager.ts

@@ -19,32 +19,35 @@ class AccessTokenManager {
     private secondaryToken: string; // refreshToken || tokenSecret
     private tokenUrl: string; // tokenURL to refresh accessToken
     private expires_in: any;
-    private data: any; // value of key(keyId) in teamSettings that needs to be updated if required
-    private keyId: any; // key of object  in teamSettings
+    private tokensData: any; // Full tokens data object
+    private keyId: any; // key of object in teamSettings
     private logger: any; // Use to log console in debugger
     private agent: Agent;
+    private isNewStructure: boolean;
     constructor(
         clientId: string,
         clientSecret: string,
         secondaryToken: string,
         tokenUrl: string,
         expires_in: any,
         primaryToken: string,
-        data: any,
+        tokensData: any,
         keyId: any,
         logger: any,
         agent: Agent,
+        isNewStructure: boolean = false,
     ) {
         this.clientId = clientId;
         this.clientSecret = clientSecret;
         this.primaryToken = primaryToken;
         this.secondaryToken = secondaryToken;
         this.tokenUrl = tokenUrl;
         this.expires_in = expires_in;
-        this.data = data;
+        this.tokensData = tokensData;
         this.keyId = keyId;
         this.logger = logger;
         this.agent = agent;
+        this.isNewStructure = isNewStructure;
     }
 
     async getAccessToken(): Promise<string> {
@@ -105,19 +108,46 @@ class AccessTokenManager {
             this.logger.debug('Access token refreshed successfully.');
             const expiresInMilliseconds: number = response?.data?.expires_in ? response?.data?.expires_in * 1000 : response?.data?.expires_in;
             const expirationTimestamp: number = expiresInMilliseconds ? new Date().getTime() + expiresInMilliseconds : expiresInMilliseconds;
-            this.data.primary = newAccessToken;
-            this.data.expires_in = expirationTimestamp ? expirationTimestamp?.toString() : expirationTimestamp;
-            //const oauthTeamSettings = new OauthTeamSettings();
-            //const save: any = await oauthTeamSettings.update({ keyId: this.keyId, data: this.data });
 
-            const save: any = await managedVault.user(AccessCandidate.agent(this.agent.id)).set(this.keyId, JSON.stringify(this.data));
+            // Maintain the same structure format when saving
+            let updatedData;
+            if (this.isNewStructure) {
+                // Maintain new structure format
+                updatedData = {
+                    ...this.tokensData,
+                    auth_data: {
+                        ...this.tokensData.auth_data,
+                        primary: newAccessToken,
+                        secondary: this.secondaryToken,
+                        expires_in: expirationTimestamp ? expirationTimestamp.toString() : expirationTimestamp
+                    }
+                };
+            } else {
+                // Maintain old structure format
+                updatedData = {
+                    ...this.tokensData,
+                    primary: newAccessToken,
+                    expires_in: expirationTimestamp ? expirationTimestamp.toString() : expirationTimestamp
+                };
+                // Keep secondary token if it exists
+                if (this.secondaryToken) {
+                    updatedData.secondary = this.secondaryToken;
+                }
+            }
+
+            const save: any = await managedVault.user(AccessCandidate.agent(this.agent.id)).set(this.keyId, JSON.stringify(updatedData));
             if (save && save.status === 200) {
                 console.log('Access token value is updated successfully.');
                 this.logger.debug('Access token value is updated successfully.');
             } else {
                 console.log('Warning: new access token value is not updated.');
                 this.logger.debug('Warning: new access token value is not updated.');
             }
+
+            // Update internal tokensData reference
+            this.tokensData = updatedData;
+            this.primaryToken = newAccessToken;
+
             return newAccessToken;
         } catch (error) {
             console.error('Failed to refresh access token:', error);