npm - @checkfirst/nestjs-outlook - Versions diffs - 3.0.0 → 4.0.0 - Mend

@checkfirst/nestjs-outlook 3.0.0 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (41) hide show

package/dist/microsoft-outlook.module.js CHANGED Viewed

@@ -23,6 +23,7 @@ const csrf_token_entity_1 = require("./entities/csrf-token.entity");
 const microsoft_csrf_token_repository_1 = require("./repositories/microsoft-csrf-token.repository");
 const calendar_service_1 = require("./services/calendar/calendar.service");
 const email_service_1 = require("./services/email/email.service");
+const microsoft_user_entity_1 = require("./entities/microsoft-user.entity");
 _a = new common_1.ConfigurableModuleBuilder().setClassMethodName('forRoot').build(), exports.ConfigurableModuleClass = _a.ConfigurableModuleClass, exports.MODULE_OPTIONS_TOKEN = _a.MODULE_OPTIONS_TOKEN;
 let MicrosoftOutlookModule = class MicrosoftOutlookModule extends exports.ConfigurableModuleClass {
 };
@@ -31,7 +32,11 @@ exports.MicrosoftOutlookModule = MicrosoftOutlookModule = __decorate([
     (0, common_1.Module)({
         imports: [
             schedule_1.ScheduleModule.forRoot(),
-            typeorm_1.TypeOrmModule.forFeature([outlook_webhook_subscription_entity_1.OutlookWebhookSubscription, csrf_token_entity_1.MicrosoftCsrfToken]),
+            typeorm_1.TypeOrmModule.forFeature([
+                outlook_webhook_subscription_entity_1.OutlookWebhookSubscription,
+                csrf_token_entity_1.MicrosoftCsrfToken,
+                microsoft_user_entity_1.MicrosoftUser,
+            ]),
             event_emitter_1.EventEmitterModule.forRoot(),
         ],
         controllers: [microsoft_auth_controller_1.MicrosoftAuthController, calendar_controller_1.CalendarController, email_controller_1.EmailController],

package/dist/microsoft-outlook.module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"microsoft-outlook.module.js","sourceRoot":"","sources":["../src/microsoft-outlook.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAmE;AACnE,6CAAgD;AAChD,+CAAkD;AAClD,yDAA2D;AAC3D,mFAA8E;AAC9E,uFAAkF;AAClF,2EAAuE;AACvE,qEAAiE;AACjE,wGAA4F;AAC5F,oHAA8G;AAC9G,2CAA+C;AAE/C,oEAAkE;AAClE,oGAA8F;AAC9F,2EAAuE;AACvE,kEAA8D;~~AAEjD~~,KACX,IAAI,kCAAyB,EAA0B,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EADhF,+BAAuB,+BAAE,4BAAoB,2BACoC;~~AA2BzF~~,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,+BAAuB;CAAG,CAAA;AAAzD,wDAAsB;iCAAtB,sBAAsB;~~IArBlC~~,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,yBAAc,CAAC,OAAO,EAAE;YACxB,uBAAa,CAAC,UAAU,CAAC,~~CAAC,~~gEAA0B,~~EAAE,~~sCAAkB,~~CAAC~~,CAAC;~~YAC1E~~,kCAAkB,CAAC,OAAO,EAAE;SAC7B;QACD,WAAW,EAAE,CAAC,mDAAuB,EAAE,wCAAkB,EAAE,kCAAe,CAAC;QAC3E,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,4BAAgB;gBACzB,UAAU,EAAE,CAAC,OAA+B,EAAE,EAAE,CAAC,OAAO;gBACxD,MAAM,EAAE,CAAC,4BAAoB,CAAC;aAC/B;YACD,8EAAoC;YACpC,8DAA4B;YAC5B,kCAAe;YACf,4BAAY;YACZ,6CAAoB;SACrB;QACD,OAAO,EAAE,CAAC,kCAAe,EAAE,4BAAY,EAAE,6CAAoB,CAAC;KAC/D,CAAC;GACW,sBAAsB,CAAmC"}
1	+ {"version":3,"file":"microsoft-outlook.module.js","sourceRoot":"","sources":["../src/microsoft-outlook.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAmE;AACnE,6CAAgD;AAChD,+CAAkD;AAClD,yDAA2D;AAC3D,mFAA8E;AAC9E,uFAAkF;AAClF,2EAAuE;AACvE,qEAAiE;AACjE,wGAA4F;AAC5F,oHAA8G;AAC9G,2CAA+C;AAE/C,oEAAkE;AAClE,oGAA8F;AAC9F,2EAAuE;AACvE,kEAA8D;AAC9D,4EAAiE;AAEpD,KACX,IAAI,kCAAyB,EAA0B,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EADhF,+BAAuB,+BAAE,4BAAoB,2BACoC;AA+BzF,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,+BAAuB;CAAG,CAAA;AAAzD,wDAAsB;iCAAtB,sBAAsB;IAzBlC,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,yBAAc,CAAC,OAAO,EAAE;YACxB,uBAAa,CAAC,UAAU,CAAC;gBACvB,gEAA0B;gBAC1B,sCAAkB;gBAClB,qCAAa;aACd,CAAC;YACF,kCAAkB,CAAC,OAAO,EAAE;SAC7B;QACD,WAAW,EAAE,CAAC,mDAAuB,EAAE,wCAAkB,EAAE,kCAAe,CAAC;QAC3E,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,4BAAgB;gBACzB,UAAU,EAAE,CAAC,OAA+B,EAAE,EAAE,CAAC,OAAO;gBACxD,MAAM,EAAE,CAAC,4BAAoB,CAAC;aAC/B;YACD,8EAAoC;YACpC,8DAA4B;YAC5B,kCAAe;YACf,4BAAY;YACZ,6CAAoB;SACrB;QACD,OAAO,EAAE,CAAC,kCAAe,EAAE,4BAAY,EAAE,6CAAoB,CAAC;KAC/D,CAAC;GACW,sBAAsB,CAAmC"}

package/dist/migrations/1699000000000-AddMicrosoftUserTable.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+export declare class AddMicrosoftUserTable1699000000000 implements MigrationInterface {
+    up(queryRunner: QueryRunner): Promise<void>;
+    down(queryRunner: QueryRunner): Promise<void>;
+}

package/dist/migrations/1699000000000-AddMicrosoftUserTable.js ADDED Viewed

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AddMicrosoftUserTable1699000000000 = void 0;
+const typeorm_1 = require("typeorm");
+class AddMicrosoftUserTable1699000000000 {
+    async up(queryRunner) {
+        await queryRunner.createTable(new typeorm_1.Table({
+            name: 'microsoft_users',
+            columns: [
+                {
+                    name: 'id',
+                    type: 'INTEGER',
+                    isPrimary: true,
+                    isGenerated: true,
+                    generationStrategy: 'increment',
+                },
+                {
+                    name: 'external_user_id',
+                    type: 'varchar',
+                    length: '255',
+                    isNullable: false,
+                },
+                {
+                    name: 'access_token',
+                    type: 'text',
+                    isNullable: false,
+                },
+                {
+                    name: 'refresh_token',
+                    type: 'text',
+                    isNullable: false,
+                },
+                {
+                    name: 'token_expiry',
+                    type: 'timestamp',
+                    isNullable: false,
+                },
+                {
+                    name: 'scopes',
+                    type: 'text',
+                    isNullable: false,
+                },
+                {
+                    name: 'is_active',
+                    type: 'boolean',
+                    default: true,
+                    isNullable: false,
+                },
+                {
+                    name: 'created_at',
+                    type: 'timestamp',
+                    default: 'now()',
+                    isNullable: false,
+                },
+                {
+                    name: 'updated_at',
+                    type: 'timestamp',
+                    default: 'now()',
+                    isNullable: false,
+                },
+            ],
+        }), true);
+        await queryRunner.createIndex('microsoft_users', new typeorm_1.TableIndex({
+            name: 'IDX_microsoft_users_external_user_id',
+            columnNames: ['external_user_id'],
+        }));
+        const table = await queryRunner.getTable('outlook_webhook_subscriptions');
+        if (table) {
+            const accessTokenColumn = table.findColumnByName('access_token');
+            const refreshTokenColumn = table.findColumnByName('refresh_token');
+            if (accessTokenColumn) {
+                await queryRunner.dropColumn('outlook_webhook_subscriptions', 'access_token');
+            }
+            if (refreshTokenColumn) {
+                await queryRunner.dropColumn('outlook_webhook_subscriptions', 'refresh_token');
+            }
+        }
+    }
+    async down(queryRunner) {
+        const table = await queryRunner.getTable('outlook_webhook_subscriptions');
+        if (table) {
+            const accessTokenColumn = table.findColumnByName('access_token');
+            const refreshTokenColumn = table.findColumnByName('refresh_token');
+            if (!accessTokenColumn) {
+                await queryRunner.addColumn('outlook_webhook_subscriptions', new typeorm_1.TableColumn({
+                    name: 'access_token',
+                    type: 'text',
+                    isNullable: true,
+                }));
+            }
+            if (!refreshTokenColumn) {
+                await queryRunner.addColumn('outlook_webhook_subscriptions', new typeorm_1.TableColumn({
+                    name: 'refresh_token',
+                    type: 'text',
+                    isNullable: true,
+                }));
+            }
+        }
+        await queryRunner.dropIndex('microsoft_users', 'IDX_microsoft_users_external_user_id');
+        await queryRunner.dropTable('microsoft_users');
+    }
+}
+exports.AddMicrosoftUserTable1699000000000 = AddMicrosoftUserTable1699000000000;
+//# sourceMappingURL=1699000000000-AddMicrosoftUserTable.js.map

package/dist/migrations/1699000000000-AddMicrosoftUserTable.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"1699000000000-AddMicrosoftUserTable.js","sourceRoot":"","sources":["../../src/migrations/1699000000000-AddMicrosoftUserTable.ts"],"names":[],"mappings":"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"}

package/dist/repositories/outlook-webhook-subscription.repository.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ export declare class OutlookWebhookSubscriptionRepository {
     constructor(repository: Repository<OutlookWebhookSubscription>);
     saveSubscription(subscription: Partial<OutlookWebhookSubscription>): Promise<OutlookWebhookSubscription>;
     findBySubscriptionId(subscriptionId: string): Promise<OutlookWebhookSubscription | null>;
-    updateSubscriptionExpiration(subscriptionId: string, expirationDateTime: Date, accessToken?: string): Promise<void>;
+    updateSubscriptionExpiration(subscriptionId: string, expirationDateTime: Date): Promise<void>;
     deactivateSubscription(subscriptionId: string): Promise<void>;
     findSubscriptionsNeedingRenewal(hoursUntilExpiration: number): Promise<OutlookWebhookSubscription[]>;
     findActiveSubscriptions(): Promise<OutlookWebhookSubscription[]>;

package/dist/repositories/outlook-webhook-subscription.repository.js CHANGED Viewed

@@ -41,14 +41,11 @@ let OutlookWebhookSubscriptionRepository = class OutlookWebhookSubscriptionRepos
     async findBySubscriptionId(subscriptionId) {
         return this.repository.findOne({ where: { subscriptionId, isActive: true } });
     }
-    async updateSubscriptionExpiration(subscriptionId, expirationDateTime, accessToken) {
+    async updateSubscriptionExpiration(subscriptionId, expirationDateTime) {
         const update = {
             expirationDateTime,
             updatedAt: new Date(),
         };
-        if (accessToken) {
-            update.accessToken = accessToken;
-        }
         await this.repository.update({ subscriptionId, isActive: true }, update);
     }
     async deactivateSubscription(subscriptionId) {

package/dist/repositories/outlook-webhook-subscription.repository.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"outlook-webhook-subscription.repository.js","sourceRoot":"","sources":["../../src/repositories/outlook-webhook-subscription.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAyD;AACzD,yGAA6F;AAGtF,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAC/C,YAEmB,UAAkD;QAAlD,eAAU,GAAV,UAAU,CAAwC;IAClE,CAAC;IAEJ,KAAK,CAAC,gBAAgB,CACpB,YAAiD;QAGjD,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;YAChC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBACzD,KAAK,EAAE,EAAE,cAAc,EAAE,YAAY,CAAC,cAAc,EAAE;aACvD,CAAC,CAAC;YAEH,IAAI,oBAAoB,EAAE,CAAC;gBAEzB,MAAM,UAAU,GAAG,oBAAoB,CAAC,EAAE,CAAC;gBAC3C,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;gBAClD,oBAAoB,CAAC,EAAE,GAAG,UAAU,CAAC;gBACrC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAID,MAAM,qBAAqB,qBAAQ,YAAY,CAAE,CAAC;QAClD,OAAO,qBAAqB,CAAC,EAAE,CAAC;QAChC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAEtE,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,cAAsB;QAC/C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,cAAsB,EACtB,kBAAwB~~,EACxB,WAAoB~~;~~QAEpB~~,MAAM,MAAM,GAAwC;YAClD,kBAAkB;YAClB,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CAAC;QAEF,~~IAAI,WAAW,EAAE,CAAC;YAChB,~~MAAM,~~CAAC,WAAW,GAAG,WAAW,CAAC;QACnC,CAAC;QAED,MAAM,~~IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,cAAsB;QACjD,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,KAAK,CAAC,+BAA+B,CACnC,oBAA4B;QAE5B,MAAM,mBAAmB,GAAG,IAAI,IAAI,EAAE,CAAC;QACvC,mBAAmB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,EAAE,GAAG,oBAAoB,CAAC,CAAC;QAEpF,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAC1B,KAAK,EAAE;gBACL,QAAQ,EAAE,IAAI;gBACd,kBAAkB,EAAE,IAAA,kBAAQ,EAAC,mBAAmB,CAAC;aAClD;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAC1B,KAAK,EAAE;gBACL,QAAQ,EAAE,IAAI;gBACd,kBAAkB,EAAE,IAAA,kBAAQ,EAAC,GAAG,CAAC;aAClC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;~~AAjFY~~,oFAAoC;+CAApC,oCAAoC;IADhD,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,gEAA0B,CAAC,CAAA;qCAChB,oBAAU;GAH9B,oCAAoC,~~CAiFhD~~"}
1	+ {"version":3,"file":"outlook-webhook-subscription.repository.js","sourceRoot":"","sources":["../../src/repositories/outlook-webhook-subscription.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAyD;AACzD,yGAA6F;AAGtF,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAC/C,YAEmB,UAAkD;QAAlD,eAAU,GAAV,UAAU,CAAwC;IAClE,CAAC;IAEJ,KAAK,CAAC,gBAAgB,CACpB,YAAiD;QAGjD,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;YAChC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBACzD,KAAK,EAAE,EAAE,cAAc,EAAE,YAAY,CAAC,cAAc,EAAE;aACvD,CAAC,CAAC;YAEH,IAAI,oBAAoB,EAAE,CAAC;gBAEzB,MAAM,UAAU,GAAG,oBAAoB,CAAC,EAAE,CAAC;gBAC3C,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;gBAClD,oBAAoB,CAAC,EAAE,GAAG,UAAU,CAAC;gBACrC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAID,MAAM,qBAAqB,qBAAQ,YAAY,CAAE,CAAC;QAClD,OAAO,qBAAqB,CAAC,EAAE,CAAC;QAChC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAEtE,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,cAAsB;QAC/C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,cAAsB,EACtB,kBAAwB;QAExB,MAAM,MAAM,GAAwC;YAClD,kBAAkB;YAClB,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CAAC;QAEF,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,cAAsB;QACjD,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,KAAK,CAAC,+BAA+B,CACnC,oBAA4B;QAE5B,MAAM,mBAAmB,GAAG,IAAI,IAAI,EAAE,CAAC;QACvC,mBAAmB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,EAAE,GAAG,oBAAoB,CAAC,CAAC;QAEpF,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAC1B,KAAK,EAAE;gBACL,QAAQ,EAAE,IAAI;gBACd,kBAAkB,EAAE,IAAA,kBAAQ,EAAC,mBAAmB,CAAC;aAClD;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAC1B,KAAK,EAAE;gBACL,QAAQ,EAAE,IAAI;gBACd,kBAAkB,EAAE,IAAA,kBAAQ,EAAC,GAAG,CAAC;aAClC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA5EY,oFAAoC;+CAApC,oCAAoC;IADhD,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,gEAA0B,CAAC,CAAA;qCAChB,oBAAU;GAH9B,oCAAoC,CA4EhD"}

package/dist/services/auth/microsoft-auth.service.d.ts CHANGED Viewed

@@ -2,35 +2,46 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { TokenResponse } from '../../interfaces/outlook/token-response.interface';
 import { CalendarService } from '../calendar/calendar.service';
 import { EmailService } from '../email/email.service';
-import { Subscription } from '@microsoft/microsoft-graph-types';
 import { MicrosoftOutlookConfig } from '../../interfaces/config/outlook-config.interface';
 import { MicrosoftCsrfTokenRepository } from '../../repositories/microsoft-csrf-token.repository';
 import { StateObject } from '../../interfaces/microsoft-auth/state-object.interface';
+import { PermissionScope } from '../../enums/permission-scope.enum';
+import { Repository } from 'typeorm';
+import { MicrosoftUser } from '../../entities/microsoft-user.entity';
 export declare class MicrosoftAuthService {
     private readonly eventEmitter;
     private readonly calendarService;
     private readonly emailService;
     private readonly microsoftConfig;
     private readonly csrfTokenRepository;
+    private readonly microsoftUserRepository;
     private readonly logger;
     private readonly clientId;
     private readonly clientSecret;
     private readonly tenantId;
     private readonly redirectUri;
     private readonly tokenEndpoint;
-    private readonly scope;
+    private readonly requiredScopes;
+    private readonly defaultScopes;
     private readonly CSRF_TOKEN_EXPIRY;
     private subscriptionInProgress;
-    constructor(eventEmitter: EventEmitter2, calendarService: CalendarService, emailService: EmailService, microsoftConfig: MicrosoftOutlookConfig, csrfTokenRepository: MicrosoftCsrfTokenRepository);
+    constructor(eventEmitter: EventEmitter2, calendarService: CalendarService, emailService: EmailService, microsoftConfig: MicrosoftOutlookConfig, csrfTokenRepository: MicrosoftCsrfTokenRepository, microsoftUserRepository: Repository<MicrosoftUser>);
+    private mapToMicrosoftScopes;
     private buildRedirectUri;
     cleanupExpiredTokens(): Promise<void>;
     private generateCsrfToken;
     parseState(state: string): StateObject | null;
     validateCsrfToken(token: string, timestamp?: number): Promise<string | null>;
-    getLoginUrl(userId: string): Promise<string>;
+    getLoginUrl(userId: string, scopes?: PermissionScope[]): Promise<string>;
+    private saveMicrosoftUser;
+    private getMicrosoftUserTokenInfo;
+    getUserAccessTokenByExternalUserId(externalUserId: string): Promise<string>;
+    getUserAccessTokenByUserId(internalUserId: number | string): Promise<string>;
+    private processTokenInfo;
     exchangeCodeForToken(code: string, state: string): Promise<TokenResponse>;
     private setupSubscriptions;
-    refreshAccessToken(refreshToken: string, userId?: number, calendarId?: string): Promise<TokenResponse>;
-    renewWebhookSubscription(subscriptionId: string, accessToken: string, refreshToken: string): Promise<Subscription>;
+    refreshAccessToken(refreshToken: string, userId: number): Promise<string>;
+    private hasCalendarPermission;
+    private hasEmailPermission;
     isTokenExpired(tokenExpiry: Date, bufferMinutes?: number): boolean;
 }

package/dist/services/auth/microsoft-auth.service.js CHANGED Viewed

@@ -17,23 +17,35 @@ exports.MicrosoftAuthService = void 0;
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const axios_1 = require("axios");
-const qs = require("querystring");
 const calendar_service_1 = require("../calendar/calendar.service");
 const email_service_1 = require("../email/email.service");
 const constants_1 = require("../../constants");
-const event_types_enum_1 = require("../../event-types.enum");
+const event_types_enum_1 = require("../../enums/event-types.enum");
 const crypto = require("crypto");
 const schedule_1 = require("@nestjs/schedule");
 const microsoft_csrf_token_repository_1 = require("../../repositories/microsoft-csrf-token.repository");
+const permission_scope_enum_1 = require("../../enums/permission-scope.enum");
+const typeorm_1 = require("@nestjs/typeorm");
+const typeorm_2 = require("typeorm");
+const microsoft_user_entity_1 = require("../../entities/microsoft-user.entity");
 let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
-    constructor(eventEmitter, calendarService, emailService, microsoftConfig, csrfTokenRepository) {
+    constructor(eventEmitter, calendarService, emailService, microsoftConfig, csrfTokenRepository, microsoftUserRepository) {
         this.eventEmitter = eventEmitter;
         this.calendarService = calendarService;
         this.emailService = emailService;
         this.microsoftConfig = microsoftConfig;
         this.csrfTokenRepository = csrfTokenRepository;
+        this.microsoftUserRepository = microsoftUserRepository;
         this.logger = new common_1.Logger(MicrosoftAuthService_1.name);
         this.tenantId = 'common';
+        this.requiredScopes = ['offline_access', 'User.Read'];
+        this.defaultScopes = [
+            permission_scope_enum_1.PermissionScope.CALENDAR_READ,
+            permission_scope_enum_1.PermissionScope.CALENDAR_WRITE,
+            permission_scope_enum_1.PermissionScope.EMAIL_SEND,
+            permission_scope_enum_1.PermissionScope.EMAIL_READ,
+            permission_scope_enum_1.PermissionScope.EMAIL_WRITE,
+        ];
         this.CSRF_TOKEN_EXPIRY = 30 * 60 * 1000;
         this.subscriptionInProgress = new Map();
         console.log('MicrosoftAuthService constructor - microsoftConfig:', {
@@ -45,11 +57,25 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
         this.redirectUri = this.buildRedirectUri(this.microsoftConfig);
         console.log('Redirect URI:', this.redirectUri);
         this.tokenEndpoint = 'https://login.microsoftonline.com/common/oauth2/v2.0/token';
-        this.scope = ['offline_access', 'Calendars.ReadWrite', 'Calendars.Read', 'User.Read', 'Mail.Send', 'Mail.ReadWrite', 'Mail.Read'].join(' ');
         this.logger.log(`Microsoft OAuth redirect URI set to: ${this.redirectUri}`);
     }
+    mapToMicrosoftScopes(scopes) {
+        const scopeMapping = {
+            [permission_scope_enum_1.PermissionScope.CALENDAR_READ]: ['Calendars.Read'],
+            [permission_scope_enum_1.PermissionScope.CALENDAR_WRITE]: ['Calendars.ReadWrite'],
+            [permission_scope_enum_1.PermissionScope.EMAIL_READ]: ['Mail.Read'],
+            [permission_scope_enum_1.PermissionScope.EMAIL_WRITE]: ['Mail.ReadWrite'],
+            [permission_scope_enum_1.PermissionScope.EMAIL_SEND]: ['Mail.Send'],
+        };
+        const microsoftScopes = new Set();
+        this.requiredScopes.forEach(scope => microsoftScopes.add(scope));
+        scopes.forEach(scope => {
+            scopeMapping[scope].forEach(mappedScope => microsoftScopes.add(mappedScope));
+        });
+        return Array.from(microsoftScopes);
+    }
     buildRedirectUri(config) {
-        if (config.redirectPath && config.redirectPath.startsWith('http')) {
+        if (config.redirectPath.startsWith('http')) {
             this.logger.log(`Using complete redirect URI from config: ${config.redirectPath}`);
             return config.redirectPath;
         }
@@ -114,20 +140,24 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
         }
         return null;
     }
-    async getLoginUrl(userId) {
+    async getLoginUrl(userId, scopes = this.defaultScopes) {
         const csrf = await this.generateCsrfToken(userId);
         const stateObj = {
             userId,
             csrf,
             timestamp: Date.now(),
+            requestedScopes: scopes,
         };
         const stateJson = JSON.stringify(stateObj);
         const state = Buffer.from(stateJson).toString('base64').replace(/=/g, '');
         this.logger.log(`State object: ${JSON.stringify(stateObj)}`);
+        const scopeString = this.mapToMicrosoftScopes(scopes).join(' ');
+        const encodedScope = encodeURIComponent(scopeString);
         const encodedRedirectUri = encodeURIComponent(this.redirectUri);
-        const encodedScope = encodeURIComponent(this.scope);
-        this.logger.log(`Redirect URI (raw): ${this.redirectUri}`);
-        this.logger.log(`Redirect URI (encoded): ${encodedRedirectUri}`);
+        this.logger.debug(`Requested generic scopes: ${scopes.join(', ')}`);
+        this.logger.debug(`Mapped to Microsoft scopes: ${scopeString}`);
+        this.logger.debug(`Redirect URI (raw): ${this.redirectUri}`);
+        this.logger.debug(`Redirect URI (encoded): ${encodedRedirectUri}`);
         const authorizeUrl = `https://login.microsoftonline.com/${this.tenantId}/oauth2/v2.0/authorize` +
             `?client_id=${this.clientId}` +
             `&response_type=code` +
@@ -138,9 +168,85 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
         this.logger.log(`FINAL MICROSOFT LOGIN URL: ${authorizeUrl}`);
         return authorizeUrl;
     }
+    async saveMicrosoftUser(externalUserId, accessToken, refreshToken, expiresIn, scopes) {
+        let user = await this.microsoftUserRepository.findOne({
+            where: { externalUserId: externalUserId, isActive: true }
+        });
+        if (!user) {
+            user = new microsoft_user_entity_1.MicrosoftUser();
+            user.externalUserId = externalUserId;
+        }
+        user.accessToken = accessToken;
+        user.refreshToken = refreshToken;
+        user.tokenExpiry = new Date(Date.now() + expiresIn * 1000);
+        user.scopes = scopes;
+        user.isActive = true;
+        await this.microsoftUserRepository.save(user);
+    }
+    async getMicrosoftUserTokenInfo(externalUserId) {
+        const user = await this.microsoftUserRepository.findOne({
+            where: { externalUserId: externalUserId, isActive: true }
+        });
+        if (!user) {
+            return null;
+        }
+        return {
+            accessToken: user.accessToken,
+            refreshToken: user.refreshToken,
+            tokenExpiry: user.tokenExpiry,
+            scopes: user.scopes,
+        };
+    }
+    async getUserAccessTokenByExternalUserId(externalUserId) {
+        try {
+            const userInfo = await this.getMicrosoftUserTokenInfo(externalUserId);
+            if (!userInfo) {
+                throw new Error(`No token information found for user ${externalUserId}`);
+            }
+            const user = await this.microsoftUserRepository.findOne({
+                where: { externalUserId: externalUserId, isActive: true }
+            });
+            if (!user) {
+                throw new Error(`Could not find user record for ${externalUserId}`);
+            }
+            return await this.processTokenInfo(userInfo, user.id);
+        }
+        catch (error) {
+            this.logger.error(`Error getting access token for user ${externalUserId}:`, error);
+            throw new Error(`Failed to get valid access token: ${error instanceof Error ? error.message : 'Unknown error'}`);
+        }
+    }
+    async getUserAccessTokenByUserId(internalUserId) {
+        try {
+            const user = await this.microsoftUserRepository.findOne({
+                where: { id: typeof internalUserId === 'string' ? parseInt(internalUserId, 10) : internalUserId }
+            });
+            if (!user) {
+                throw new Error(`No Microsoft user found with internal ID ${String(internalUserId)}`);
+            }
+            return await this.processTokenInfo({
+                accessToken: user.accessToken,
+                refreshToken: user.refreshToken,
+                tokenExpiry: user.tokenExpiry,
+                scopes: user.scopes
+            }, user.id);
+        }
+        catch (error) {
+            this.logger.error(`Error getting access token for internal user ID ${String(internalUserId)}:`, error);
+            throw new Error(`Failed to get valid access token: ${error instanceof Error ? error.message : 'Unknown error'}`);
+        }
+    }
+    async processTokenInfo(tokenInfo, userId) {
+        if (!this.isTokenExpired(tokenInfo.tokenExpiry)) {
+            return tokenInfo.accessToken;
+        }
+        this.logger.log(`Access token for user ID ${String(userId)} is expired, refreshing...`);
+        const accessToken = await this.refreshAccessToken(tokenInfo.refreshToken, userId);
+        return accessToken;
+    }
     async exchangeCodeForToken(code, state) {
         const stateData = this.parseState(state);
-        if (!stateData || !stateData.userId) {
+        if (!(stateData === null || stateData === void 0 ? void 0 : stateData.userId)) {
             throw new Error('Invalid state parameter - missing user ID');
         }
         const csrfError = await this.validateCsrfToken(stateData.csrf, stateData.timestamp);
@@ -150,9 +256,12 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
         }
         try {
             this.logger.log(`Exchanging code for token with redirect URI: ${this.redirectUri}`);
+            const scopesToUse = stateData.requestedScopes || this.defaultScopes;
+            this.logger.log(`Using scopes for token exchange: ${scopesToUse.join(', ')}`);
+            const scopeString = this.mapToMicrosoftScopes(scopesToUse).join(' ');
             const postData = new URLSearchParams({
                 client_id: this.clientId,
-                scope: this.scope,
+                scope: scopeString,
                 code: code,
                 redirect_uri: this.redirectUri,
                 grant_type: 'authorization_code',
@@ -169,11 +278,12 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
                 refresh_token: tokenResponse.data.refresh_token || '',
                 expires_in: tokenResponse.data.expires_in,
             };
-            await Promise.resolve(this.eventEmitter.emit(event_types_enum_1.OutlookEventTypes.AUTH_TOKENS_SAVE, stateData.userId, tokenData));
-            const userId = Number(stateData.userId);
-            const accessToken = tokenData.access_token;
-            const refreshToken = tokenData.refresh_token;
-            await this.setupSubscriptions(userId, accessToken, refreshToken);
+            await this.saveMicrosoftUser(stateData.userId, tokenData.access_token, tokenData.refresh_token, tokenData.expires_in, scopeString);
+            await Promise.resolve(this.eventEmitter.emit(event_types_enum_1.OutlookEventTypes.USER_AUTHENTICATED, stateData.userId, {
+                externalUserId: stateData.userId,
+                scopes: scopesToUse
+            }));
+            await this.setupSubscriptions(stateData.userId, scopesToUse);
             return tokenData;
         }
         catch (error) {
@@ -181,83 +291,99 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
             throw new Error('Failed to exchange code for token');
         }
     }
-    async setupSubscriptions(userId, accessToken, refreshToken) {
-        if (this.subscriptionInProgress.get(userId)) {
-            this.logger.log(`Subscription setup already in progress for user ${String(userId)}`);
+    async setupSubscriptions(userId, scopes = this.defaultScopes) {
+        const userIdNum = parseInt(userId, 10);
+        if (this.subscriptionInProgress.get(userIdNum)) {
+            this.logger.log(`Subscription setup already in progress for user ${userId}`);
             return;
         }
         try {
-            this.subscriptionInProgress.set(userId, true);
-            try {
-                await this.calendarService.createWebhookSubscription(userId, accessToken, refreshToken);
-                this.logger.log(`Successfully created calendar webhook subscription for user ${String(userId)}`);
-            }
-            catch (calendarError) {
-                this.logger.error(`Failed to create calendar webhook subscription: ${calendarError instanceof Error ? calendarError.message : 'Unknown error'}`);
+            this.subscriptionInProgress.set(userIdNum, true);
+            if (this.hasCalendarPermission(scopes)) {
+                try {
+                    await this.calendarService.createWebhookSubscription(userId);
+                    this.logger.log(`Successfully created calendar webhook subscription for user ${userId}`);
+                }
+                catch (calendarError) {
+                    this.logger.error(`Failed to create calendar webhook subscription: ${calendarError instanceof Error ? calendarError.message : 'Unknown error'}`);
+                }
             }
-            try {
-                await this.emailService.createWebhookSubscription(userId, accessToken, refreshToken);
-                this.logger.log(`Successfully created email webhook subscription for user ${String(userId)}`);
-            }
-            catch (emailError) {
-                this.logger.error(`Failed to create email webhook subscription: ${emailError instanceof Error ? emailError.message : 'Unknown error'}`);
+            if (this.hasEmailPermission(scopes)) {
+                try {
+                    await this.emailService.createWebhookSubscription(userId);
+                    this.logger.log(`Successfully created email webhook subscription for user ${userId}`);
+                }
+                catch (emailError) {
+                    this.logger.error(`Failed to create email webhook subscription: ${emailError instanceof Error ? emailError.message : 'Unknown error'}`);
+                }
             }
         }
         catch (error) {
             this.logger.error(`Error setting up subscriptions: ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
         finally {
-            this.subscriptionInProgress.set(userId, false);
+            this.subscriptionInProgress.set(userIdNum, false);
         }
     }
-    async refreshAccessToken(refreshToken, userId, calendarId) {
+    async refreshAccessToken(refreshToken, userId) {
         try {
-            const payload = {
+            const user = await this.microsoftUserRepository.findOne({
+                where: { id: userId }
+            });
+            if (!user) {
+                throw new Error(`No user found with ID ${String(userId)}`);
+            }
+            const scopeString = user.scopes;
+            this.logger.debug(`Using saved scopes from database: ${scopeString}`);
+            this.logger.debug(`Refreshing token for user ID ${String(userId)} with scopes: ${scopeString}`);
+            const payload = new URLSearchParams({
                 client_id: this.clientId,
                 client_secret: this.clientSecret,
                 refresh_token: refreshToken,
                 grant_type: 'refresh_token',
-                scope: this.scope,
-            };
-            const response = await axios_1.default.post(this.tokenEndpoint, qs.stringify(payload), {
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                },
+                scope: scopeString,
             });
-            if (!response.data.access_token || !response.data.expires_in) {
-                throw new Error('Invalid token refresh response from Microsoft');
+            try {
+                const response = await axios_1.default.post(this.tokenEndpoint, payload.toString(), {
+                    headers: {
+                        'Content-Type': 'application/x-www-form-urlencoded',
+                    },
+                });
+                if (!response.data.access_token || !response.data.expires_in) {
+                    throw new Error('Invalid token refresh response from Microsoft');
+                }
+                const newRefreshToken = response.data.refresh_token || refreshToken;
+                const newAccessToken = response.data.access_token;
+                user.accessToken = newAccessToken;
+                user.refreshToken = newRefreshToken;
+                user.tokenExpiry = new Date(Date.now() + response.data.expires_in * 1000);
+                await this.microsoftUserRepository.save(user);
+                return newAccessToken;
             }
-            const newRefreshToken = response.data.refresh_token || refreshToken;
-            const tokenData = {
-                access_token: response.data.access_token,
-                refresh_token: newRefreshToken,
-                expires_in: response.data.expires_in,
-            };
-            if (userId !== undefined && calendarId) {
-                const userIdStr = String(userId);
-                const calendarIdStr = String(calendarId);
-                await Promise.resolve(this.eventEmitter.emit(event_types_enum_1.OutlookEventTypes.AUTH_TOKENS_UPDATE, userIdStr, calendarIdStr, tokenData));
+            catch (error) {
+                if (axios_1.default.isAxiosError(error) && error.response) {
+                    this.logger.error(`Microsoft API error refreshing token for user ID ${String(userId)}: Status: ${String(error.response.status)}, Response: ${JSON.stringify(error.response.data)}`);
+                    const errorData = error.response.data;
+                    if (errorData.error === 'invalid_grant') {
+                        throw new Error('Microsoft refresh token is invalid or expired');
+                    }
+                }
+                throw error;
             }
-            return tokenData;
         }
         catch (error) {
-            this.logger.error('Error refreshing access token:', error);
+            this.logger.error(`Error refreshing access token for user ID ${String(userId)}:`, error);
             throw new Error('Failed to refresh access token from Microsoft');
         }
     }
-    async renewWebhookSubscription(subscriptionId, accessToken, refreshToken) {
-        var _a;
-        try {
-            return await this.calendarService.renewWebhookSubscription(subscriptionId, accessToken);
-        }
-        catch (error) {
-            if (axios_1.default.isAxiosError(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
-                this.logger.log('Access token expired during webhook renewal, refreshing token...');
-                const tokenResponse = await this.refreshAccessToken(refreshToken);
-                return await this.calendarService.renewWebhookSubscription(subscriptionId, tokenResponse.access_token);
-            }
-            throw error;
-        }
+    hasCalendarPermission(scopes) {
+        return scopes.some(scope => scope === permission_scope_enum_1.PermissionScope.CALENDAR_READ ||
+            scope === permission_scope_enum_1.PermissionScope.CALENDAR_WRITE);
+    }
+    hasEmailPermission(scopes) {
+        return scopes.some(scope => scope === permission_scope_enum_1.PermissionScope.EMAIL_READ ||
+            scope === permission_scope_enum_1.PermissionScope.EMAIL_WRITE ||
+            scope === permission_scope_enum_1.PermissionScope.EMAIL_SEND);
     }
     isTokenExpired(tokenExpiry, bufferMinutes = 5) {
         const currentTimeWithBuffer = new Date(Date.now() + bufferMinutes * 60 * 1000);
@@ -276,8 +402,10 @@ exports.MicrosoftAuthService = MicrosoftAuthService = MicrosoftAuthService_1 = _
     __param(1, (0, common_1.Inject)((0, common_1.forwardRef)(() => calendar_service_1.CalendarService))),
     __param(2, (0, common_1.Inject)((0, common_1.forwardRef)(() => email_service_1.EmailService))),
     __param(3, (0, common_1.Inject)(constants_1.MICROSOFT_CONFIG)),
+    __param(5, (0, typeorm_1.InjectRepository)(microsoft_user_entity_1.MicrosoftUser)),
     __metadata("design:paramtypes", [event_emitter_1.EventEmitter2,
         calendar_service_1.CalendarService,
-        email_service_1.EmailService, Object, microsoft_csrf_token_repository_1.MicrosoftCsrfTokenRepository])
+        email_service_1.EmailService, Object, microsoft_csrf_token_repository_1.MicrosoftCsrfTokenRepository,
+        typeorm_2.Repository])
 ], MicrosoftAuthService);
 //# sourceMappingURL=microsoft-auth.service.js.map