@smythos/sre 1.5.43 → 1.5.45

package/src/Components/APICall/APICall.class.ts

@@ -1,156 +1,156 @@
-import axios, { AxiosRequestConfig } from 'axios';
-import Joi from 'joi';
-
-import { Agent } from '@sre/AgentManager/Agent.class';
-import { Component } from '../Component.class';
-import { parseHeaders } from './parseHeaders';
-import { parseUrl, parseSmythFsUrl, destroyPublicUrls } from './parseUrl';
-import { parseData } from './parseData';
-import { parseProxy } from './parseProxy';
-import { parseArrayBufferResponse } from './ArrayBufferResponse.helper';
-import { extractAdditionalParamsForOAuth1, handleOAuthHeaders as generateOAuthHeaders } from './OAuth.helper';
-import { SocksProxyAgent } from 'socks-proxy-agent';
-import { formatDataForDebug } from '@sre/utils/data.utils';
-import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
-
-export class APICall extends Component {
-    protected schema = {
-        name: 'APICall',
-        description: 'Use this component to make an API call',
-        inputs: {},
-        outputs: {
-            Headers: {
-                description: 'The headers of the API call response',
-                default: true,
-            },
-            Response: {
-                description: 'The response of the API call',
-                default: true,
-            },
-        },
-    };
-
-    protected configSchema = Joi.object({
-        method: Joi.string().valid('GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS').required().label('Method'),
-        url: Joi.string()
-            .max(8192) /*.custom(isUrlValid, 'URL validation')*/
-            .required()
-            .label('URL'),
-        headers: Joi.any().allow('').label('Headers'),
-        contentType: Joi.string()
-            .valid('none', 'application/json', 'multipart/form-data', 'binary', 'application/x-www-form-urlencoded', 'text/plain', 'application/xml')
-            .label('Content-Type'),
-        body: Joi.any().allow('').label('Body'),
-        _templateSettings: Joi.object().allow(null).label('Template Settings'),
-        _templateVars: Joi.object().allow(null).label('Template Variables'),
-        proxy: Joi.string().allow('').label('Proxy'),
-        oauthService: Joi.string().allow('').label('OAuth Service'),
-        scope: Joi.string().allow('').label('Scope'),
-        authorizationURL: Joi.string().allow('').label('Authorization URL'),
-        tokenURL: Joi.string().allow('').label('Token URL'),
-        clientID: Joi.string().allow('').label('Client ID'),
-        clientSecret: Joi.string().allow('').label('Client Secret'),
-        oauth2CallbackURL: Joi.string().allow('').label('OAuth2 Callback URL'),
-        callbackURL: Joi.string().allow('').label('Callback URL'), // !TEMP: prevent validation error
-        requestTokenURL: Joi.string().allow('').label('Request Token URL'),
-        accessTokenURL: Joi.string().allow('').label('Access Token URL'),
-        userAuthorizationURL: Joi.string().allow('').label('User Authorization URL'),
-        consumerKey: Joi.string().allow('').label('Consumer Key'),
-        consumerSecret: Joi.string().allow('').label('Consumer Secret'),
-        oauth1CallbackURL: Joi.string().allow('').label('OAuth1 Callback URL'),
-        authenticate: Joi.string().allow('').label('Authenticate'),
-    });
-    constructor() {
-        super();
-    }
-
-    init() {}
-
-    async process(input, config, agent: Agent) {
-        await super.process(input, config, agent);
-
-        const logger = this.createComponentLogger(agent, config);
-
-        let publicUrls: string[] = [];
-
-        try {
-            logger.debug(`=== API Call Log ===`);
-
-            const method = config?.data?.method || 'get';
-
-            const reqConfig: AxiosRequestConfig = {};
-            reqConfig.method = method;
-
-            reqConfig.url = await parseUrl(input, config, agent);
-
-            // We generate public URLs for any resources specified with the smythfs protocol in the request URL.
-            ({ url: reqConfig.url, publicUrls } = await parseSmythFsUrl(reqConfig.url, agent));
-
-            const { data, headers } = await parseData(input, config, agent);
-
-            // If the data is null, the request may fail. We encountered an issue where a request failed due to null data being provided.
-            let dataForDebug;
-            if (data) {
-                reqConfig.data = data;
-
-                dataForDebug = await formatDataForDebug(data, AccessCandidate.agent(agent.id));
-            }
-
-            reqConfig.headers = (await parseHeaders(input, config, agent)).concat({ ...headers });
-
-            const proxyConfig = await parseProxy(input, config, agent);
-
-            if (proxyConfig) {
-                if (proxyConfig instanceof SocksProxyAgent) {
-                    const isSecureEndpoint = reqConfig.url?.startsWith('https://');
-                    reqConfig[isSecureEndpoint ? 'httpsAgent' : 'httpAgent'] = proxyConfig;
-                } else {
-                    reqConfig.proxy = proxyConfig;
-                }
-            }
-
-            let Response: any = {};
-            let Headers: any = {};
-            let _error: any = undefined;
-            try {
-                if (config?.data?.oauthService && config?.data?.oauthService !== 'None') {
-                    const rootUrl = new URL(reqConfig.url).origin;
-                    const additionalParams = extractAdditionalParamsForOAuth1(reqConfig);
-                    const oauthHeaders = await generateOAuthHeaders(agent, config, reqConfig, logger, additionalParams, rootUrl);
-                    //reqConfig.headers = { ...reqConfig.headers, ...oauthHeaders };
-                    reqConfig.headers = reqConfig.headers.concat({ ...oauthHeaders });
-                }
-
-                // in order to handle binary data automatically, we need to set responseType to 'arraybuffer' for all requests, then parse the response data based on content-type
-                reqConfig.responseType = 'arraybuffer';
-
-                logger.debug('Making API call', { ...reqConfig, data: dataForDebug });
-
-                const response = await axios.request(reqConfig);
-
-                const parsedRes = await parseArrayBufferResponse(response, agent);
-
-                // log response headers
-                logger.debug('API call Response Headers', response.headers);
-                Response = parsedRes;
-
-                logger.debug('API call Response\n', Response);
-
-                Headers = Object.fromEntries(Object.entries(response.headers));
-            } catch (error) {
-                logger.debug(`Error making API call: ${error.message}`);
-                Headers = error?.response?.headers ? Object.fromEntries(Object.entries(error.response.headers)) : {};
-                Response = await parseArrayBufferResponse(error.response, agent);
-                _error = error.message;
-            }
-
-            return { Response, Headers, _error, _debug: logger.output };
-        } catch (error) {
-            return { _error: error.message, _debug: logger.output };
-        } finally {
-            if (publicUrls.length > 0) {
-                await destroyPublicUrls(publicUrls);
-            }
-        }
-    }
-}
+import axios, { AxiosRequestConfig } from 'axios';
+import Joi from 'joi';
+
+import { Agent } from '@sre/AgentManager/Agent.class';
+import { Component } from '../Component.class';
+import { parseHeaders } from './parseHeaders';
+import { parseUrl, parseSmythFsUrl, destroyPublicUrls } from './parseUrl';
+import { parseData } from './parseData';
+import { parseProxy } from './parseProxy';
+import { parseArrayBufferResponse } from './ArrayBufferResponse.helper';
+import { extractAdditionalParamsForOAuth1, handleOAuthHeaders as generateOAuthHeaders } from './OAuth.helper';
+import { SocksProxyAgent } from 'socks-proxy-agent';
+import { formatDataForDebug } from '@sre/utils/data.utils';
+import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
+
+export class APICall extends Component {
+    protected schema = {
+        name: 'APICall',
+        description: 'Use this component to make an API call',
+        inputs: {},
+        outputs: {
+            Headers: {
+                description: 'The headers of the API call response',
+                default: true,
+            },
+            Response: {
+                description: 'The response of the API call',
+                default: true,
+            },
+        },
+    };
+
+    protected configSchema = Joi.object({
+        method: Joi.string().valid('GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS').required().label('Method'),
+        url: Joi.string()
+            .max(8192) /*.custom(isUrlValid, 'URL validation')*/
+            .required()
+            .label('URL'),
+        headers: Joi.any().allow('').label('Headers'),
+        contentType: Joi.string()
+            .valid('none', 'application/json', 'multipart/form-data', 'binary', 'application/x-www-form-urlencoded', 'text/plain', 'application/xml')
+            .label('Content-Type'),
+        body: Joi.any().allow('').label('Body'),
+        _templateSettings: Joi.object().allow(null).label('Template Settings'),
+        _templateVars: Joi.object().allow(null).label('Template Variables'),
+        proxy: Joi.string().allow('').label('Proxy'),
+        oauthService: Joi.string().allow('').label('OAuth Service'),
+        scope: Joi.string().allow('').label('Scope'),
+        authorizationURL: Joi.string().allow('').label('Authorization URL'),
+        tokenURL: Joi.string().allow('').label('Token URL'),
+        clientID: Joi.string().allow('').label('Client ID'),
+        clientSecret: Joi.string().allow('').label('Client Secret'),
+        oauth2CallbackURL: Joi.string().allow('').label('OAuth2 Callback URL'),
+        callbackURL: Joi.string().allow('').label('Callback URL'), // !TEMP: prevent validation error
+        requestTokenURL: Joi.string().allow('').label('Request Token URL'),
+        accessTokenURL: Joi.string().allow('').label('Access Token URL'),
+        userAuthorizationURL: Joi.string().allow('').label('User Authorization URL'),
+        consumerKey: Joi.string().allow('').label('Consumer Key'),
+        consumerSecret: Joi.string().allow('').label('Consumer Secret'),
+        oauth1CallbackURL: Joi.string().allow('').label('OAuth1 Callback URL'),
+        authenticate: Joi.string().allow('').label('Authenticate'),
+    });
+    constructor() {
+        super();
+    }
+
+    init() {}
+
+    async process(input, config, agent: Agent) {
+        await super.process(input, config, agent);
+
+        const logger = this.createComponentLogger(agent, config);
+
+        let publicUrls: string[] = [];
+
+        try {
+            logger.debug(`=== API Call Log ===`);
+
+            const method = config?.data?.method || 'get';
+
+            const reqConfig: AxiosRequestConfig = {};
+            reqConfig.method = method;
+
+            reqConfig.url = await parseUrl(input, config, agent);
+
+            // We generate public URLs for any resources specified with the smythfs protocol in the request URL.
+            ({ url: reqConfig.url, publicUrls } = await parseSmythFsUrl(reqConfig.url, agent));
+
+            const { data, headers } = await parseData(input, config, agent);
+
+            // If the data is null, the request may fail. We encountered an issue where a request failed due to null data being provided.
+            let dataForDebug;
+            if (data) {
+                reqConfig.data = data;
+
+                dataForDebug = await formatDataForDebug(data, AccessCandidate.agent(agent.id));
+            }
+
+            reqConfig.headers = (await parseHeaders(input, config, agent)).concat({ ...headers });
+
+            const proxyConfig = await parseProxy(input, config, agent);
+
+            if (proxyConfig) {
+                if (proxyConfig instanceof SocksProxyAgent) {
+                    const isSecureEndpoint = reqConfig.url?.startsWith('https://');
+                    reqConfig[isSecureEndpoint ? 'httpsAgent' : 'httpAgent'] = proxyConfig;
+                } else {
+                    reqConfig.proxy = proxyConfig;
+                }
+            }
+
+            let Response: any = {};
+            let Headers: any = {};
+            let _error: any = undefined;
+            try {
+                if (config?.data?.oauthService && config?.data?.oauthService !== 'None') {
+                    const rootUrl = new URL(reqConfig.url).origin;
+                    const additionalParams = extractAdditionalParamsForOAuth1(reqConfig);
+                    const oauthHeaders = await generateOAuthHeaders(agent, config, reqConfig, logger, additionalParams, rootUrl);
+                    //reqConfig.headers = { ...reqConfig.headers, ...oauthHeaders };
+                    reqConfig.headers = reqConfig.headers.concat({ ...oauthHeaders });
+                }
+
+                // in order to handle binary data automatically, we need to set responseType to 'arraybuffer' for all requests, then parse the response data based on content-type
+                reqConfig.responseType = 'arraybuffer';
+
+                logger.debug('Making API call', { ...reqConfig, data: dataForDebug });
+
+                const response = await axios.request(reqConfig);
+
+                const parsedRes = await parseArrayBufferResponse(response, agent);
+
+                // log response headers
+                logger.debug('API call Response Headers', response.headers);
+                Response = parsedRes;
+
+                logger.debug('API call Response\n', Response);
+
+                Headers = Object.fromEntries(Object.entries(response.headers));
+            } catch (error) {
+                logger.debug(`Error making API call: ${error.message}`);
+                Headers = error?.response?.headers ? Object.fromEntries(Object.entries(error.response.headers)) : {};
+                Response = await parseArrayBufferResponse(error.response, agent);
+                _error = error.message;
+            }
+
+            return { Response, Headers, _error, _debug: logger.output };
+        } catch (error) {
+            return { _error: error.message, _debug: logger.output };
+        } finally {
+            if (publicUrls.length > 0) {
+                await destroyPublicUrls(publicUrls);
+            }
+        }
+    }
+}

package/src/Components/APICall/AccessTokenManager.ts

@@ -1,130 +1,130 @@
-// accessTokenManager.ts
-import { Agent } from '@sre/AgentManager/Agent.class';
-import { ConnectorService } from '@sre/Core/ConnectorsService';
-import { SystemEvents } from '@sre/Core/SystemEvents';
-import { Logger } from '@sre/helpers/Log.helper';
-import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
-import axios from 'axios';
-
-const console = Logger('AccessTokenManager');
-let managedVault: any;
-
-SystemEvents.on('SRE:Booted', () => {
-    managedVault = ConnectorService.getManagedVaultConnector();
-});
-class AccessTokenManager {
-    private clientId: string;
-    private clientSecret: string;
-    private primaryToken: string; // accessToken || token
-    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 logger: any; // Use to log console in debugger
-    private agent: Agent;
-    constructor(
-        clientId: string,
-        clientSecret: string,
-        secondaryToken: string,
-        tokenUrl: string,
-        expires_in: any,
-        primaryToken: string,
-        data: any,
-        keyId: any,
-        logger: any,
-        agent: Agent,
-    ) {
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.primaryToken = primaryToken;
-        this.secondaryToken = secondaryToken;
-        this.tokenUrl = tokenUrl;
-        this.expires_in = expires_in;
-        this.data = data;
-        this.keyId = keyId;
-        this.logger = logger;
-        this.agent = agent;
-    }
-
-    async getAccessToken(): Promise<string> {
-        try {
-            const currentTime: any = new Date().getTime();
-
-            // If there's no secondaryToken (refresh token) and no expires_in,
-            // assume it's a long-lived token and return the primaryToken directly
-            if (!this.secondaryToken && !this.expires_in) {
-                console.log('Using long-lived access token');
-                this.logger.debug('Using long-lived access token. If authentication failes, please re-authenticate and try again');
-                return this.primaryToken;
-            }
-
-            // Regular token expiration check for tokens with expiration
-            // should be alway currentTime >= Number(this.expires_in)
-            if (!this.expires_in || currentTime >= Number(this.expires_in)) {
-                if (!this.secondaryToken) {
-                    this.logger.debug('Refresh token is missing. Please re authenticate');
-                    console.log('Refresh token is missing. Please re authenticate...');
-                    // Redirect the user to the OAuth authorization URL or initiate the reauthentication flow
-                    throw new Error('Reauthentication required');
-                }
-                this.logger.debug('Access token is expired or missing. Refreshing access token...');
-                console.log('Access token is expired or missing. Refreshing access token...');
-                return await this.refreshAccessToken();
-            } else {
-                console.log('Access token is still valid');
-                this.logger.debug('Access token is still valid.');
-                return this.primaryToken;
-            }
-        } catch (error) {
-            console.error('Error fetching access token:', error);
-            this.logger.debug('Error fetching access token');
-            throw error;
-        }
-    }
-
-    async refreshAccessToken(): Promise<string> {
-        try {
-            const response = await axios.post(
-                this.tokenUrl,
-                new URLSearchParams({
-                    client_id: this.clientId,
-                    client_secret: this.clientSecret,
-                    refresh_token: this.secondaryToken,
-                    grant_type: 'refresh_token',
-                }).toString(),
-                {
-                    headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded',
-                    },
-                },
-            );
-
-            const newAccessToken: string = response?.data?.access_token;
-            console.log('Access token refreshed successfully.');
-            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));
-            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.');
-            }
-            return newAccessToken;
-        } catch (error) {
-            console.error('Failed to refresh access token:', error);
-            this.logger.debug(`Failed to refresh access token: ${error}`);
-            throw new Error('Failed to refresh access token.');
-        }
-    }
-}
-
-export default AccessTokenManager;
+// accessTokenManager.ts
+import { Agent } from '@sre/AgentManager/Agent.class';
+import { ConnectorService } from '@sre/Core/ConnectorsService';
+import { SystemEvents } from '@sre/Core/SystemEvents';
+import { Logger } from '@sre/helpers/Log.helper';
+import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
+import axios from 'axios';
+
+const console = Logger('AccessTokenManager');
+let managedVault: any;
+
+SystemEvents.on('SRE:Booted', () => {
+    managedVault = ConnectorService.getManagedVaultConnector();
+});
+class AccessTokenManager {
+    private clientId: string;
+    private clientSecret: string;
+    private primaryToken: string; // accessToken || token
+    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 logger: any; // Use to log console in debugger
+    private agent: Agent;
+    constructor(
+        clientId: string,
+        clientSecret: string,
+        secondaryToken: string,
+        tokenUrl: string,
+        expires_in: any,
+        primaryToken: string,
+        data: any,
+        keyId: any,
+        logger: any,
+        agent: Agent,
+    ) {
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.primaryToken = primaryToken;
+        this.secondaryToken = secondaryToken;
+        this.tokenUrl = tokenUrl;
+        this.expires_in = expires_in;
+        this.data = data;
+        this.keyId = keyId;
+        this.logger = logger;
+        this.agent = agent;
+    }
+
+    async getAccessToken(): Promise<string> {
+        try {
+            const currentTime: any = new Date().getTime();
+
+            // If there's no secondaryToken (refresh token) and no expires_in,
+            // assume it's a long-lived token and return the primaryToken directly
+            if (!this.secondaryToken && !this.expires_in) {
+                console.log('Using long-lived access token');
+                this.logger.debug('Using long-lived access token. If authentication failes, please re-authenticate and try again');
+                return this.primaryToken;
+            }
+
+            // Regular token expiration check for tokens with expiration
+            // should be alway currentTime >= Number(this.expires_in)
+            if (!this.expires_in || currentTime >= Number(this.expires_in)) {
+                if (!this.secondaryToken) {
+                    this.logger.debug('Refresh token is missing. Please re authenticate');
+                    console.log('Refresh token is missing. Please re authenticate...');
+                    // Redirect the user to the OAuth authorization URL or initiate the reauthentication flow
+                    throw new Error('Reauthentication required');
+                }
+                this.logger.debug('Access token is expired or missing. Refreshing access token...');
+                console.log('Access token is expired or missing. Refreshing access token...');
+                return await this.refreshAccessToken();
+            } else {
+                console.log('Access token is still valid');
+                this.logger.debug('Access token is still valid.');
+                return this.primaryToken;
+            }
+        } catch (error) {
+            console.error('Error fetching access token:', error);
+            this.logger.debug('Error fetching access token');
+            throw error;
+        }
+    }
+
+    async refreshAccessToken(): Promise<string> {
+        try {
+            const response = await axios.post(
+                this.tokenUrl,
+                new URLSearchParams({
+                    client_id: this.clientId,
+                    client_secret: this.clientSecret,
+                    refresh_token: this.secondaryToken,
+                    grant_type: 'refresh_token',
+                }).toString(),
+                {
+                    headers: {
+                        'Content-Type': 'application/x-www-form-urlencoded',
+                    },
+                },
+            );
+
+            const newAccessToken: string = response?.data?.access_token;
+            console.log('Access token refreshed successfully.');
+            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));
+            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.');
+            }
+            return newAccessToken;
+        } catch (error) {
+            console.error('Failed to refresh access token:', error);
+            this.logger.debug(`Failed to refresh access token: ${error}`);
+            throw new Error('Failed to refresh access token.');
+        }
+    }
+}
+
+export default AccessTokenManager;