@smythos/sre 1.6.8 → 1.6.10

package/src/Components/APICall/AccessTokenManager.ts

@@ -1,166 +1,166 @@
-// 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 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,
-        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.tokensData = tokensData;
-        this.keyId = keyId;
-        this.logger = logger;
-        this.agent = agent;
-        this.isNewStructure = isNewStructure;
-    }
-
-    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;
-
-            // 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,
-                        // Persist rotated refresh_token when provided; fall back to existing
-                        secondary: (response?.data?.refresh_token ?? this.secondaryToken),
-                        // Use nullish check so 0 is preserved
-                        expires_in: (expirationTimestamp ?? undefined) !== undefined ? String(expirationTimestamp) : undefined
-                    }
-                };
-            } else {
-                // Maintain old structure format
-                updatedData = {
-                    ...this.tokensData,
-                    primary: newAccessToken,
-                    expires_in: (expirationTimestamp ?? undefined) !== undefined ? String(expirationTimestamp) : undefined
-                };
-                // Persist rotated refresh_token when provided; otherwise keep existing
-                updatedData.secondary = (response?.data?.refresh_token ?? 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;
-            // Update in-memory refresh token in case the provider rotated it
-            this.secondaryToken = (response?.data?.refresh_token ?? this.secondaryToken);
-            // Preserve 0 and avoid dropping undefined
-            this.expires_in =
-                (expirationTimestamp ?? undefined) !== undefined
-                    ? String(expirationTimestamp)
-                    : undefined;
-            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 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,
+        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.tokensData = tokensData;
+        this.keyId = keyId;
+        this.logger = logger;
+        this.agent = agent;
+        this.isNewStructure = isNewStructure;
+    }
+
+    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;
+
+            // 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,
+                        // Persist rotated refresh_token when provided; fall back to existing
+                        secondary: (response?.data?.refresh_token ?? this.secondaryToken),
+                        // Use nullish check so 0 is preserved
+                        expires_in: (expirationTimestamp ?? undefined) !== undefined ? String(expirationTimestamp) : undefined
+                    }
+                };
+            } else {
+                // Maintain old structure format
+                updatedData = {
+                    ...this.tokensData,
+                    primary: newAccessToken,
+                    expires_in: (expirationTimestamp ?? undefined) !== undefined ? String(expirationTimestamp) : undefined
+                };
+                // Persist rotated refresh_token when provided; otherwise keep existing
+                updatedData.secondary = (response?.data?.refresh_token ?? 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;
+            // Update in-memory refresh token in case the provider rotated it
+            this.secondaryToken = (response?.data?.refresh_token ?? this.secondaryToken);
+            // Preserve 0 and avoid dropping undefined
+            this.expires_in =
+                (expirationTimestamp ?? undefined) !== undefined
+                    ? String(expirationTimestamp)
+                    : undefined;
+            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;

package/src/Components/APICall/ArrayBufferResponse.helper.ts

@@ -1,58 +1,58 @@
-import { Agent } from '@sre/AgentManager/Agent.class';
-import { BinaryInput } from '@sre/helpers/BinaryInput.helper';
-import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
-import { isBinaryData, isBinaryMimeType } from '@sre/utils/data.utils';
-import { AxiosResponse } from 'axios';
-import mimeTypeCategories from './mimeTypeCategories';
-
-const contentHandlers = {
-    json: parseJson,
-    text: parseText,
-    binary: parseBinary,
-};
-
-function parseJson(data) {
-    return JSON.parse(Buffer.from(data).toString('utf8') || '{}');
-}
-
-function parseText(data) {
-    return Buffer.from(data).toString('utf8');
-}
-
-async function parseBinary(data, contentType, agentId) {
-    const binaryInput = BinaryInput.from(data, null, contentType);
-    const smythFile = await binaryInput.getJsonData(AccessCandidate.agent(agentId));
-
-    return smythFile;
-}
-
-export async function parseArrayBufferResponse(response: AxiosResponse, agent: Agent): Promise<any> {
-    if (!response?.data) {
-        return null;
-    }
-    const data = response.data;
-    const contentType = response.headers['content-type'];
-    const cleanContentType = contentType?.split(';')[0];
-
-    // Try to find an exact match first,
-    let handlerType = Object.keys(mimeTypeCategories).find((type) => mimeTypeCategories[type].includes(cleanContentType));
-
-    // If no exact match, try to find a match for the first part of the handlerTypes, some handlers are generic like text/ in that case we check if the handler is a substring of the contentType
-    if (!handlerType) {
-        handlerType = Object.keys(mimeTypeCategories).find((type) => mimeTypeCategories[type].some((prefix) => cleanContentType?.startsWith(prefix)));
-    }
-
-    const handler = contentHandlers[handlerType];
-
-    if (handler) {
-        return handler(data, contentType, agent.id);
-    }
-
-    // Fallback: if no content type matches then check if the data is binary
-    // If so then parse it as binary, otherwise parse it as text
-    if (isBinaryMimeType(contentType) || isBinaryData(data)) {
-        return parseBinary(data, contentType, agent.id);
-    } else {
-        return parseText(data);
-    }
-}
+import { Agent } from '@sre/AgentManager/Agent.class';
+import { BinaryInput } from '@sre/helpers/BinaryInput.helper';
+import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
+import { isBinaryData, isBinaryMimeType } from '@sre/utils/data.utils';
+import { AxiosResponse } from 'axios';
+import mimeTypeCategories from './mimeTypeCategories';
+
+const contentHandlers = {
+    json: parseJson,
+    text: parseText,
+    binary: parseBinary,
+};
+
+function parseJson(data) {
+    return JSON.parse(Buffer.from(data).toString('utf8') || '{}');
+}
+
+function parseText(data) {
+    return Buffer.from(data).toString('utf8');
+}
+
+async function parseBinary(data, contentType, agentId) {
+    const binaryInput = BinaryInput.from(data, null, contentType);
+    const smythFile = await binaryInput.getJsonData(AccessCandidate.agent(agentId));
+
+    return smythFile;
+}
+
+export async function parseArrayBufferResponse(response: AxiosResponse, agent: Agent): Promise<any> {
+    if (!response?.data) {
+        return null;
+    }
+    const data = response.data;
+    const contentType = response.headers['content-type'];
+    const cleanContentType = contentType?.split(';')[0];
+
+    // Try to find an exact match first,
+    let handlerType = Object.keys(mimeTypeCategories).find((type) => mimeTypeCategories[type].includes(cleanContentType));
+
+    // If no exact match, try to find a match for the first part of the handlerTypes, some handlers are generic like text/ in that case we check if the handler is a substring of the contentType
+    if (!handlerType) {
+        handlerType = Object.keys(mimeTypeCategories).find((type) => mimeTypeCategories[type].some((prefix) => cleanContentType?.startsWith(prefix)));
+    }
+
+    const handler = contentHandlers[handlerType];
+
+    if (handler) {
+        return handler(data, contentType, agent.id);
+    }
+
+    // Fallback: if no content type matches then check if the data is binary
+    // If so then parse it as binary, otherwise parse it as text
+    if (isBinaryMimeType(contentType) || isBinaryData(data)) {
+        return parseBinary(data, contentType, agent.id);
+    } else {
+        return parseText(data);
+    }
+}