mblabs-roccato-backend-commons 1.0.53 → 1.0.55

package/dist/interfaces/azure.d.ts

@@ -1,8 +1,30 @@
 interface Credentials {
-    accountName?: string;
-    accountKey?: string;
+    tenant?: string;
+    account?: {
+        name?: string;
+        key?: string;
+    };
+    client?: {
+        id?: string;
+        secret?: string;
+    };
     connection?: string;
 }
+export declare namespace AzureAuth {
+    namespace RefreshAccess {
+        interface Request {
+            data: {
+                refreshToken: string;
+                scopes?: string[];
+            };
+            credentials: Credentials;
+        }
+        interface Response {
+            accessToken: string;
+            refreshToken: string;
+        }
+    }
+}
 export declare namespace AzureApplicationInsights {
     namespace TrackTrace {
         interface Request {
@@ -137,6 +159,9 @@ export declare namespace AzureStorageBlob {
         }
     }
 }
+export interface IAzureAuthService {
+    refreshAccess(req: AzureAuth.RefreshAccess.Request): Promise<AzureAuth.RefreshAccess.Response>;
+}
 export interface IAzureApplicationInsightsService {
     trackTrace(req: AzureApplicationInsights.TrackTrace.Request): Promise<void>;
     trackEvent(req: AzureApplicationInsights.TrackEvent.Request): Promise<void>;

package/dist/interfaces/gcp.d.ts

@@ -2,8 +2,11 @@ import { sheets_v4 as Sheetsv4 } from 'googleapis';
 export interface Credentials {
     project?: string;
     audience?: string;
-    clientId?: string;
-    clientSecret?: string;
+    client?: {
+        id?: string;
+        secret?: string;
+    };
+    privateKey?: string;
     redirectUri?: string;
     apiKey?: string;
 }

package/dist/services/azure/auth.d.ts

@@ -0,0 +1,6 @@
+import { AzureAuth, IAzureAuthService } from '../../interfaces/azure';
+declare class AzureAuthService implements IAzureAuthService {
+    refreshAccess({ credentials, data, }: AzureAuth.RefreshAccess.Request): Promise<AzureAuth.RefreshAccess.Response>;
+}
+declare const _default: AzureAuthService;
+export default _default;

package/dist/services/azure/auth.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const msal_node_1 = __importDefault(require("@azure/msal-node"));
+class AzureAuthService {
+    async refreshAccess({ credentials, data, }) {
+        const client = new msal_node_1.default.ConfidentialClientApplication({
+            auth: {
+                clientId: credentials.client?.id,
+                authority: `https://login.microsoftonline.com/${credentials.tenant ?? 'common'}`,
+                clientSecret: credentials.client?.secret,
+            },
+        });
+        const { accessToken } = await client.acquireTokenByRefreshToken({
+            refreshToken: data.refreshToken,
+            scopes: data.scopes ?? [],
+        });
+        return {
+            accessToken,
+            refreshToken: data.refreshToken,
+        };
+    }
+}
+exports.default = new AzureAuthService();

package/dist/services/azure/index.d.ts

@@ -1,5 +1,6 @@
 import AzureApplicationInsightsService from './application-insights';
+import AzureAuthService from './auth';
 import AzureCommunicationService from './communication';
 import AzureKeyVaultService from './keyvault';
 import AzureStorageBlobService from './storage-blob';
-export { AzureApplicationInsightsService, AzureCommunicationService, AzureKeyVaultService, AzureStorageBlobService, };
+export { AzureAuthService, AzureApplicationInsightsService, AzureCommunicationService, AzureKeyVaultService, AzureStorageBlobService, };

package/dist/services/azure/index.js

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AzureStorageBlobService = exports.AzureKeyVaultService = exports.AzureCommunicationService = exports.AzureApplicationInsightsService = void 0;
+exports.AzureStorageBlobService = exports.AzureKeyVaultService = exports.AzureCommunicationService = exports.AzureApplicationInsightsService = exports.AzureAuthService = void 0;
 const application_insights_1 = __importDefault(require("./application-insights"));
 exports.AzureApplicationInsightsService = application_insights_1.default;
+const auth_1 = __importDefault(require("./auth"));
+exports.AzureAuthService = auth_1.default;
 const communication_1 = __importDefault(require("./communication"));
 exports.AzureCommunicationService = communication_1.default;
 const keyvault_1 = __importDefault(require("./keyvault"));

package/dist/services/azure/storage-blob.js

@@ -8,7 +8,7 @@ const date_1 = __importDefault(require("../../services/date"));
 const file_1 = __importDefault(require("../../services/file"));
 class AzureStorageBlobService {
     async uploadBuffer({ credentials, data, }) {
-        const sharedKeyCredential = new storage_blob_1.StorageSharedKeyCredential(credentials.accountName, credentials.accountKey);
+        const sharedKeyCredential = new storage_blob_1.StorageSharedKeyCredential(credentials.account?.name, credentials.account?.key);
         const client = new storage_blob_1.BlobServiceClient(data.storageUrl, sharedKeyCredential);
         await client
             .getContainerClient(data.storageContainer)
@@ -16,7 +16,7 @@ class AzureStorageBlobService {
             .uploadData(data.file);
     }
     async downloadBuffer({ credentials, data, }) {
-        const sharedKeyCredential = new storage_blob_1.StorageSharedKeyCredential(credentials.accountName, credentials.accountKey);
+        const sharedKeyCredential = new storage_blob_1.StorageSharedKeyCredential(credentials.account?.name, credentials.account?.key);
         const client = new storage_blob_1.BlobServiceClient(data.storageUrl, sharedKeyCredential);
         const { readableStreamBody } = await client
             .getContainerClient(data.storageContainer)
@@ -28,7 +28,7 @@ class AzureStorageBlobService {
         };
     }
     async getPreSignedUrl({ credentials, data, }) {
-        const sharedKeyCredential = new storage_blob_1.StorageSharedKeyCredential(credentials.accountName, credentials.accountKey);
+        const sharedKeyCredential = new storage_blob_1.StorageSharedKeyCredential(credentials.account?.name, credentials.account?.key);
         const payload = {
             containerName: data.storageContainer,
             blobName: data.filename,
@@ -41,7 +41,7 @@ class AzureStorageBlobService {
             expiresOn: data.options?.hoursToExpire &&
                 date_1.default.addHours(date_1.default.getCurrentDate(), Number(data.options?.hoursToExpire)),
         };
-        const url = `https://${credentials.accountName}.blob.core.windows.net/${data.storageContainer}/${data.filename}`;
+        const url = `https://${credentials.account?.name}.blob.core.windows.net/${data.storageContainer}/${data.filename}`;
         const token = (0, storage_blob_1.generateBlobSASQueryParameters)(payload, sharedKeyCredential).toString();
         return {
             url: `${url}?${token}`,

package/dist/services/gcp/auth.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const google_auth_library_1 = require("google-auth-library");
 class GoogleAuthService {
     async refreshAccess({ credentials, data, }) {
-        const client = new google_auth_library_1.OAuth2Client(credentials.clientId, credentials.clientSecret, credentials.redirectUri);
+        const client = new google_auth_library_1.OAuth2Client(credentials.client.id, credentials.client.secret, credentials.redirectUri);
         client.setCredentials({
             access_token: data.accessToken,
             refresh_token: data.refreshToken,

package/dist/services/gcp/calendar.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const googleapis_1 = require("googleapis");
 class GoogleCalendarService {
     async getEvents({ credentials, data, }) {
-        const client = new googleapis_1.google.auth.OAuth2(credentials.clientId, credentials.clientSecret, credentials.redirectUri);
+        const client = new googleapis_1.google.auth.OAuth2(credentials.client.id, credentials.client.secret, credentials.redirectUri);
         client.setCredentials({
             access_token: data.accessToken,
             refresh_token: data.refreshToken,

package/dist/services/gcp/storage.js

@@ -9,6 +9,7 @@ class GoogleStorageService {
     async getSignedUrl({ credentials, data, }) {
         const storage = new storage_1.Storage({
             credentials: {
+                private_key: credentials.privateKey,
                 audience: credentials.audience,
                 project_id: credentials.project,
                 apiKey: credentials.apiKey,

package/dist/services/index.d.ts

@@ -1,5 +1,5 @@
 import { AmazonCloudwatchService, AmazonPinpointService, AmazonS3Service, AmazonSecretManagerService, AmazonSQSService } from './aws';
-import { AzureApplicationInsightsService, AzureCommunicationService, AzureKeyVaultService, AzureStorageBlobService } from './azure';
+import { AzureApplicationInsightsService, AzureAuthService, AzureCommunicationService, AzureKeyVaultService, AzureStorageBlobService } from './azure';
 import DateService from './date';
 import FileService from './file';
 import FirebaseService from './firebase';
@@ -12,4 +12,4 @@ import NodeMailerService from './nodemailer';
 import RabbitMQService from './rabbit';
 import RedisService from './redis';
 import SendgridService from './sendgrid';
-export { AmazonCloudwatchService, AmazonPinpointService, AmazonS3Service, AmazonSecretManagerService, AmazonSQSService, AzureApplicationInsightsService, AzureCommunicationService, AzureKeyVaultService, AzureStorageBlobService, DateService, FileService, FirebaseService, GoogleAuthService, GoogleCalendarService, GoogleSecretsService, GoogleSheetsService, GoogleStorageService, GrafanaService, I18nService, KafkaService, KeycloakService, NodeMailerService, RabbitMQService, RedisService, SendgridService, };
+export { AmazonCloudwatchService, AmazonPinpointService, AmazonS3Service, AmazonSecretManagerService, AmazonSQSService, AzureApplicationInsightsService, AzureAuthService, AzureCommunicationService, AzureKeyVaultService, AzureStorageBlobService, DateService, FileService, FirebaseService, GoogleAuthService, GoogleCalendarService, GoogleSecretsService, GoogleSheetsService, GoogleStorageService, GrafanaService, I18nService, KafkaService, KeycloakService, NodeMailerService, RabbitMQService, RedisService, SendgridService, };

package/dist/services/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SendgridService = exports.RedisService = exports.RabbitMQService = exports.NodeMailerService = exports.KeycloakService = exports.KafkaService = exports.I18nService = exports.GrafanaService = exports.GoogleStorageService = exports.GoogleSheetsService = exports.GoogleSecretsService = exports.GoogleCalendarService = exports.GoogleAuthService = exports.FirebaseService = exports.FileService = exports.DateService = exports.AzureStorageBlobService = exports.AzureKeyVaultService = exports.AzureCommunicationService = exports.AzureApplicationInsightsService = exports.AmazonSQSService = exports.AmazonSecretManagerService = exports.AmazonS3Service = exports.AmazonPinpointService = exports.AmazonCloudwatchService = void 0;
+exports.SendgridService = exports.RedisService = exports.RabbitMQService = exports.NodeMailerService = exports.KeycloakService = exports.KafkaService = exports.I18nService = exports.GrafanaService = exports.GoogleStorageService = exports.GoogleSheetsService = exports.GoogleSecretsService = exports.GoogleCalendarService = exports.GoogleAuthService = exports.FirebaseService = exports.FileService = exports.DateService = exports.AzureStorageBlobService = exports.AzureKeyVaultService = exports.AzureCommunicationService = exports.AzureAuthService = exports.AzureApplicationInsightsService = exports.AmazonSQSService = exports.AmazonSecretManagerService = exports.AmazonS3Service = exports.AmazonPinpointService = exports.AmazonCloudwatchService = void 0;
 const aws_1 = require("./aws");
 Object.defineProperty(exports, "AmazonCloudwatchService", { enumerable: true, get: function () { return aws_1.AmazonCloudwatchService; } });
 Object.defineProperty(exports, "AmazonPinpointService", { enumerable: true, get: function () { return aws_1.AmazonPinpointService; } });
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "AmazonSecretManagerService", { enumerable: true,
 Object.defineProperty(exports, "AmazonSQSService", { enumerable: true, get: function () { return aws_1.AmazonSQSService; } });
 const azure_1 = require("./azure");
 Object.defineProperty(exports, "AzureApplicationInsightsService", { enumerable: true, get: function () { return azure_1.AzureApplicationInsightsService; } });
+Object.defineProperty(exports, "AzureAuthService", { enumerable: true, get: function () { return azure_1.AzureAuthService; } });
 Object.defineProperty(exports, "AzureCommunicationService", { enumerable: true, get: function () { return azure_1.AzureCommunicationService; } });
 Object.defineProperty(exports, "AzureKeyVaultService", { enumerable: true, get: function () { return azure_1.AzureKeyVaultService; } });
 Object.defineProperty(exports, "AzureStorageBlobService", { enumerable: true, get: function () { return azure_1.AzureStorageBlobService; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mblabs-roccato-backend-commons",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -51,6 +51,7 @@
     "@azure/communication-sms": "^1.2.0-beta.3",
     "@azure/identity": "^4.9.1",
     "@azure/keyvault-secrets": "^4.9.0",
+    "@azure/msal-node": "^3.8.0",
     "@azure/storage-blob": "^12.27.0",
     "@google-cloud/secret-manager": "^6.0.1",
     "@google-cloud/storage": "^7.16.0",

package/src/interfaces/azure.ts

@@ -1,9 +1,33 @@
 interface Credentials {
-  accountName?: string;
-  accountKey?: string;
+  tenant?: string;
+  account?: {
+    name?: string;
+    key?: string;
+  };
+  client?: {
+    id?: string;
+    secret?: string;
+  };
   connection?: string;
 }
 
+export namespace AzureAuth {
+  export namespace RefreshAccess {
+    export interface Request {
+      data: {
+        refreshToken: string;
+        scopes?: string[];
+      };
+      credentials: Credentials;
+    }
+
+    export interface Response {
+      accessToken: string;
+      refreshToken: string;
+    }
+  }
+}
+
 export namespace AzureApplicationInsights {
   export namespace TrackTrace {
     export interface Request {
@@ -150,6 +174,10 @@ export namespace AzureStorageBlob {
   }
 }
 
+export interface IAzureAuthService {
+  refreshAccess(req: AzureAuth.RefreshAccess.Request): Promise<AzureAuth.RefreshAccess.Response>;
+}
+
 export interface IAzureApplicationInsightsService {
   trackTrace(req: AzureApplicationInsights.TrackTrace.Request): Promise<void>;
   trackEvent(req: AzureApplicationInsights.TrackEvent.Request): Promise<void>;

package/src/interfaces/gcp.ts

@@ -3,8 +3,11 @@ import { sheets_v4 as Sheetsv4 } from 'googleapis';
 export interface Credentials {
   project?: string;
   audience?: string;
-  clientId?: string;
-  clientSecret?: string;
+  client?: {
+    id?: string;
+    secret?: string;
+  };
+  privateKey?: string;
   redirectUri?: string;
   apiKey?: string;
 }

package/src/services/azure/auth.ts

@@ -0,0 +1,30 @@
+import MSAL from '@azure/msal-node';
+
+import { AzureAuth, IAzureAuthService } from '../../interfaces/azure';
+
+class AzureAuthService implements IAzureAuthService {
+  async refreshAccess ({
+    credentials,
+    data,
+  }: AzureAuth.RefreshAccess.Request): Promise<AzureAuth.RefreshAccess.Response> {
+    const client = new MSAL.ConfidentialClientApplication({
+      auth: {
+        clientId: credentials.client?.id!,
+        authority: `https://login.microsoftonline.com/${credentials.tenant ?? 'common'}`,
+        clientSecret: credentials.client?.secret!,
+      },
+    });
+
+    const { accessToken } = await client.acquireTokenByRefreshToken({
+      refreshToken: data.refreshToken,
+      scopes: data.scopes ?? [],
+    });
+
+    return {
+      accessToken,
+      refreshToken: data.refreshToken,
+    };
+  }
+}
+
+export default new AzureAuthService();

package/src/services/azure/index.ts

@@ -1,11 +1,13 @@
 import AzureApplicationInsightsService from './application-insights';
+import AzureAuthService from './auth';
 import AzureCommunicationService from './communication';
 import AzureKeyVaultService from './keyvault';
 import AzureStorageBlobService from './storage-blob';
 
 export {
+  AzureAuthService,
   AzureApplicationInsightsService,
   AzureCommunicationService,
   AzureKeyVaultService,
   AzureStorageBlobService,
-};
+};

package/src/services/azure/storage-blob.ts

@@ -16,8 +16,8 @@ class AzureStorageBlobService implements IAzureStorageBlobService {
     data,
   }: AzureStorageBlob.UploadBuffer.Request): Promise<void> {
     const sharedKeyCredential = new StorageSharedKeyCredential(
-      credentials.accountName!,
-      credentials.accountKey!
+      credentials.account?.name!,
+      credentials.account?.key!
     );
 
     const client = new BlobServiceClient(data.storageUrl, sharedKeyCredential);
@@ -33,8 +33,8 @@ class AzureStorageBlobService implements IAzureStorageBlobService {
     data,
   }: AzureStorageBlob.DownloadBuffer.Request): Promise<AzureStorageBlob.DownloadBuffer.Response> {
     const sharedKeyCredential = new StorageSharedKeyCredential(
-      credentials.accountName!,
-      credentials.accountKey!
+      credentials.account?.name!,
+      credentials.account?.key!
     );
 
     const client = new BlobServiceClient(data.storageUrl, sharedKeyCredential);
@@ -56,8 +56,8 @@ class AzureStorageBlobService implements IAzureStorageBlobService {
     data,
   }: AzureStorageBlob.GetPreSignedUrl.Request): Promise<AzureStorageBlob.GetPreSignedUrl.Response> {
     const sharedKeyCredential = new StorageSharedKeyCredential(
-      credentials.accountName!,
-      credentials.accountKey!
+      credentials.account?.name!,
+      credentials.account?.key!
     );
 
     const payload: BlobSASSignatureValues = {
@@ -75,7 +75,7 @@ class AzureStorageBlobService implements IAzureStorageBlobService {
         DateService.addHours(DateService.getCurrentDate(), Number(data.options?.hoursToExpire)),
     };
 
-    const url = `https://${credentials.accountName!}.blob.core.windows.net/${data.storageContainer}/${data.filename}`;
+    const url = `https://${credentials.account?.name!}.blob.core.windows.net/${data.storageContainer}/${data.filename}`;
     const token = generateBlobSASQueryParameters(payload, sharedKeyCredential).toString();
 
     return {

package/src/services/gcp/auth.ts

@@ -9,8 +9,8 @@ class GoogleAuthService implements IGoogleAuthService {
   }: GoogleAuth.RefreshAccess.Request): Promise<GoogleAuth.RefreshAccess.Response> {
 
     const client = new OAuth2Client(
-      credentials.clientId,
-      credentials.clientSecret,
+      credentials.client.id,
+      credentials.client.secret,
       credentials.redirectUri
     );
 

package/src/services/gcp/calendar.ts

@@ -8,8 +8,8 @@ class GoogleCalendarService implements IGoogleCalendarService {
     data,
   }: GoogleCalendar.GetEvents.Request): Promise<GoogleCalendar.GetEvents.Response> {
     const client = new GoogleSDK.auth.OAuth2(
-      credentials.clientId,
-      credentials.clientSecret,
+      credentials.client.id,
+      credentials.client.secret,
       credentials.redirectUri
     );
 

package/src/services/gcp/storage.ts

@@ -10,6 +10,7 @@ class GoogleStorageService implements IGoogleStorageService {
   }: GoogleStorage.GetSignedUrl.Request) {
     const storage = new Storage({
       credentials: {
+        private_key: credentials.privateKey,
         audience: credentials.audience,
         project_id: credentials.project,
         apiKey: credentials.apiKey,

package/src/services/index.ts

@@ -7,6 +7,7 @@ import {
 } from './aws';
 import {
   AzureApplicationInsightsService,
+  AzureAuthService,
   AzureCommunicationService,
   AzureKeyVaultService,
   AzureStorageBlobService,
@@ -37,6 +38,7 @@ export {
   AmazonSecretManagerService,
   AmazonSQSService,
   AzureApplicationInsightsService,
+  AzureAuthService,
   AzureCommunicationService,
   AzureKeyVaultService,
   AzureStorageBlobService,

package/yarn.lock

@@ -1404,6 +1404,11 @@
   dependencies:
     "@azure/msal-common" "15.7.0"
 
+"@azure/msal-common@15.13.0":
+  version "15.13.0"
+  resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-15.13.0.tgz#229008f8badbf5af6a446a0be1c436be2f4c8cd9"
+  integrity sha512-8oF6nj02qX7eE/6+wFT5NluXRHc05AgdCC3fJnkjiJooq8u7BcLmxaYYSwc2AfEkWRMRi6Eyvvbeqk4U4412Ag==
+
 "@azure/msal-common@15.7.0":
   version "15.7.0"
   resolved "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.7.0.tgz#03833058fc21e16f5dde0540ebe6233dfdd0dd2b"
@@ -1418,6 +1423,15 @@
     jsonwebtoken "^9.0.0"
     uuid "^8.3.0"
 
+"@azure/msal-node@^3.8.0":
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-3.8.0.tgz#17634ebab1b4d6f6a3fac1a378c4929fdeeae79d"
+  integrity sha512-23BXm82Mp5XnRhrcd4mrHa0xuUNRp96ivu3nRatrfdAqjoeWAGyD0eEAafxAOHAEWWmdlyFK4ELFcdziXyw2sA==
+  dependencies:
+    "@azure/msal-common" "15.13.0"
+    jsonwebtoken "^9.0.0"
+    uuid "^8.3.0"
+
 "@azure/opentelemetry-instrumentation-azure-sdk@^1.0.0-beta.7":
   version "1.0.0-beta.8"
   resolved "https://registry.npmjs.org/@azure/opentelemetry-instrumentation-azure-sdk/-/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.8.tgz#7abc6b056354414e6bacc366873c67f8cbe718aa"