Merge pull request #105 from SmythOS/dev

Dev Merge

Author: zubairirfan96

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@smythos/sre",
-    "version": "1.5.52",
+    "version": "1.5.53",
     "description": "Smyth Runtime Environment",
     "author": "Alaa-eddine KADDOURI",
     "license": "MIT",

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

@@ -114,7 +114,8 @@ export class APICall extends Component {
             let Headers: any = {};
             let _error: any = undefined;
             try {
-                if (config?.data?.oauth_con_id !== '' && config?.data?.oauth_con_id !== 'None') {
+                // To support both old and new OAuth configuration, we check for both oauth_con_id and oauthService.
+                if ((config?.data?.oauth_con_id !== '' && config?.data?.oauth_con_id !== 'None') || (config?.data?.oauthService !== '' && config.data.oauthService !== 'None')) {
                     const additionalParams = extractAdditionalParamsForOAuth1(reqConfig);
                     const oauthHeaders = await generateOAuthHeaders(agent, config, reqConfig, logger, additionalParams);
                     //reqConfig.headers = { ...reqConfig.headers, ...oauthHeaders };

packages/core/src/Components/APICall/OAuth.helper.ts

@@ -176,7 +176,8 @@ export const buildOAuth1Header = (url, method, oauth1Credentials, additionalPara
 export const retrieveOAuthTokens = async (agent, config) => {
     let tokenKey: any = null;
     try {
-        tokenKey = config?.data?.oauth_con_id;
+        // To support both old and new OAuth configuration, we check for both oauth_con_id and config.id (component id)
+        tokenKey = config?.data?.oauth_con_id || `OAUTH_${config?.id}_TOKENS`;
 
         try {
             const result: any = await managedVault.user(AccessCandidate.agent(agent.id)).get(tokenKey);
@@ -423,7 +424,7 @@ async function getClientCredentialToken(tokensData, logger, keyId, oauthTokens,
                 if (!updatedData.team) updatedData.team = agent.teamId;
                 if (!updatedData.oauth_info) {
                     updatedData.oauth_info = {
-                        oauth_keys_prefix: `OAUTH_${config?.data?.oauth_con_id?.split('_')[1]}`,
+                        oauth_keys_prefix: `OAUTH_${config?.data?.oauth_con_id?.split('_')[1] || config?.id}`,
                         service: 'oauth2_client_credentials',
                         tokenURL,
                         clientID,

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@smythos/sdk",
-    "version": "1.0.47",
+    "version": "1.0.48",
     "description": "SRE SDK",
     "keywords": [
         "smythos",