@hed-hog/core 0.0.141 → 0.0.150

package/dist/session/session.service.js

@@ -133,7 +133,46 @@ let SessionService = class SessionService {
             };
         }
         catch (err) {
-            throw new common_1.HttpException('Erro ao buscar sessões do usuário', common_1.HttpStatus.SERVICE_UNAVAILABLE);
+            throw new common_1.HttpException((0, api_locale_1.getLocaleText)('session.errorFetchingSessions', locale, 'Error fetching user sessions'), common_1.HttpStatus.SERVICE_UNAVAILABLE);
+        }
+    }
+    async getUserSessionsActive(paginationParams, userId, locale) {
+        var _a, _b, _c;
+        const userExists = await this.prisma.user.findUnique({
+            where: { id: userId },
+            select: { id: true },
+        });
+        if (!userExists) {
+            throw new common_1.BadRequestException((0, api_locale_1.getLocaleText)('session.userNotFound', locale, 'User not found.'));
+        }
+        try {
+            const paginate = await this.paginationService.paginatePrismaModel(this.prisma.user_session, Object.assign(Object.assign({}, paginationParams), { where: { user_id: userId, revoked_at: null, expires_at: { gt: new Date() } } }));
+            const itemsWithLocation = await Promise.all(paginate.data.map(async (s) => {
+                const ip = s.ip_address || s.ip || null;
+                let location = null;
+                if (ip && ip !== '127.0.0.1' && ip !== '::1') {
+                    try {
+                        location = await this.fetchGeoByIp(ip);
+                    }
+                    catch (_a) {
+                        location = { ip, raw: null };
+                    }
+                }
+                else if (ip) {
+                    location = { ip: '127.0.0.1', country: 'Localhost', region: '', city: '' };
+                }
+                return Object.assign(Object.assign({}, s), { location });
+            }));
+            return {
+                data: itemsWithLocation,
+                total: paginate.total || 0,
+                lastPage: Math.ceil((paginate.total || 0) / (paginate.pageSize || 1)),
+                page: (_a = paginate.page) !== null && _a !== void 0 ? _a : 1,
+                pageSize: (_c = (_b = paginate.pageSize) !== null && _b !== void 0 ? _b : paginationParams.pageSize) !== null && _c !== void 0 ? _c : 10,
+            };
+        }
+        catch (err) {
+            throw new common_1.HttpException((0, api_locale_1.getLocaleText)('session.errorFetchingSessions', locale, 'Error fetching user sessions'), common_1.HttpStatus.SERVICE_UNAVAILABLE);
         }
     }
     async fetchGeoByIp(ip) {
@@ -161,26 +200,38 @@ let SessionService = class SessionService {
             data: { revoked_at: new Date() },
         });
     }
-    async revokeAllOtherSessions(userId) {
-        const latestSession = await this.prisma.user_session.findFirst({
-            where: { user_id: userId },
-            orderBy: { created_at: 'desc' },
+    async revokeAllOtherSessions(userId, sessionId) {
+        const latestSession = await this.prisma.user_session.findUnique({
+            where: {
+                id: sessionId
+            },
             select: { id: true },
         });
         if (!latestSession) {
             return { count: 0 };
         }
-        return this.markRevokedByFilter(userId, { NOT: { id: latestSession.id } }, 'revokeAllOtherSessions');
+        return this.markRevokedByFilter(userId, {
+            NOT: { id: latestSession.id },
+            revoked_at: null
+        }, 'revokeAllOtherSessions');
     }
     async revokeAllSessions(userId) {
-        return this.markRevokedByFilter(userId, {}, 'revokeAllSessions');
+        return this.markRevokedByFilter(userId, { revoked_at: null }, 'revokeAllSessions');
     }
-    async revokeUserSession(userId, sessionId) {
-        await this.user.registerUserActivity(userId, "revokeSession");
-        return this.prisma.user_session.update({
+    async revokeUserSession(userId, sessionId, locale) {
+        const session = await this.prisma.user_session.findFirst({
             where: {
                 id: sessionId,
                 user_id: userId
+            }
+        });
+        if (!session) {
+            throw new common_1.NotFoundException((0, api_locale_1.getLocaleText)('session.notFound', locale, 'Session not found or does not belong to user'));
+        }
+        await this.user.registerUserActivity(userId, "revokeSession");
+        return this.prisma.user_session.update({
+            where: {
+                id: sessionId
             },
             data: {
                 revoked_at: new Date()

package/dist/session/session.service.js.map

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

package/dist/token/token.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token.module.d.ts","sourceRoot":"","sources":["../../src/token/token.module.ts"],"names":[],"mappings":"AAKA,qBAQa,WAAW;CAAG"}
+{"version":3,"file":"token.module.d.ts","sourceRoot":"","sources":["../../src/token/token.module.ts"],"names":[],"mappings":"AAMA,qBASa,WAAW;CAAG"}

package/dist/token/token.module.js

@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenModule = void 0;
+const api_prisma_1 = require("@hed-hog/api-prisma");
 const common_1 = require("@nestjs/common");
 const security_module_1 = require("../security/security.module");
 const setting_module_1 = require("../setting/setting.module");
@@ -19,6 +20,7 @@ exports.TokenModule = TokenModule = __decorate([
         providers: [token_service_1.TokenService],
         exports: [token_service_1.TokenService],
         imports: [
+            (0, common_1.forwardRef)(() => api_prisma_1.PrismaModule),
             (0, common_1.forwardRef)(() => setting_module_1.SettingModule),
             (0, common_1.forwardRef)(() => security_module_1.SecurityModule),
         ]

package/dist/token/token.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.module.js","sourceRoot":"","sources":["../../src/token/token.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,iEAA6D;AAC7D,8DAA0D;AAC1D,mDAA+C;AAUxC,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IARvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,4BAAY,CAAC;QACzB,OAAO,EAAE,CAAC,4BAAY,CAAC;QACvB,OAAO,EAAE;YACL,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,8BAAa,CAAC;YAC/B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,gCAAc,CAAC;SACjC;KACJ,CAAC;GACW,WAAW,CAAG"}
+{"version":3,"file":"token.module.js","sourceRoot":"","sources":["../../src/token/token.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAmD;AACnD,2CAAoD;AACpD,iEAA6D;AAC7D,8DAA0D;AAC1D,mDAA+C;AAWxC,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IATvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,4BAAY,CAAC;QACzB,OAAO,EAAE,CAAC,4BAAY,CAAC;QACvB,OAAO,EAAE;YACL,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,yBAAY,CAAC;YAC9B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,8BAAa,CAAC;YAC/B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,gCAAc,CAAC;SACjC;KACJ,CAAC;GACW,WAAW,CAAG"}

package/dist/token/token.service.d.ts

@@ -3,11 +3,11 @@ import { JwtService } from "@nestjs/jwt";
 import { SecurityService } from "../security/security.service";
 import { SettingService } from "../setting/setting.service";
 export declare class TokenService {
+    private readonly prisma;
     private readonly jwt;
     private readonly security;
     private readonly setting;
-    private readonly prisma;
-    constructor(jwt: JwtService, security: SecurityService, setting: SettingService, prisma: PrismaService);
+    constructor(prisma: PrismaService, jwt: JwtService, security: SecurityService, setting: SettingService);
     verify(locale: string, token: string): Promise<any>;
     createAccessToken(payload: Record<string, any>): Promise<string>;
     createOpaqueToken(size?: number): Promise<string>;

package/dist/token/token.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token.service.d.ts","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBACa,YAAY;IAIrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAEpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBANN,GAAG,EAAE,UAAU,EAEf,QAAQ,EAAE,eAAe,EAEzB,OAAO,EAAE,cAAc,EAEvB,MAAM,EAAE,aAAa;IAGlC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAgCpC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAM9C,iBAAiB,CAAC,IAAI,SAAK;YAInB,eAAe;IAgBvB,wBAAwB,CAAC,GAAG,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC;IAe5C,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAA,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB1F,uBAAuB,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAOxG,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAgBxH,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAUtD"}
+{"version":3,"file":"token.service.d.ts","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBACa,YAAY;IAGrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAEpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBANP,MAAM,EAAE,aAAa,EAErB,GAAG,EAAE,UAAU,EAEf,QAAQ,EAAE,eAAe,EAEzB,OAAO,EAAE,cAAc;IAGpC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IA0CpC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAM9C,iBAAiB,CAAC,IAAI,SAAK;YAInB,eAAe;IAgBvB,wBAAwB,CAAC,GAAG,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC;IAe5C,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAA,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB1F,uBAAuB,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAOxG,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAgBxH,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAUtD"}

package/dist/token/token.service.js

@@ -20,25 +20,35 @@ const jwt_1 = require("@nestjs/jwt");
 const security_service_1 = require("../security/security.service");
 const setting_service_1 = require("../setting/setting.service");
 let TokenService = class TokenService {
-    constructor(jwt, security, setting, prisma) {
+    constructor(prisma, jwt, security, setting) {
+        this.prisma = prisma;
         this.jwt = jwt;
         this.security = security;
         this.setting = setting;
-        this.prisma = prisma;
     }
     async verify(locale, token) {
         try {
             const payload = await this.jwt.verifyAsync(token, {
                 secret: this.security.getJwtSecret(),
             });
-            // Verify session is not revoked
-            if (payload.sessionId) {
-                const session = await this.prisma.session.findUnique({
-                    where: { id: payload.sessionId },
-                    select: { revoked_at: true }
-                });
-                if (!session || session.revoked_at !== null) {
-                    throw new common_1.UnauthorizedException((0, api_locale_1.getLocaleText)('sessionRevoked', locale, 'Session has been revoked.'));
+            // Verify session is not revoked (only if prisma is available)
+            if (payload.sessionId && this.prisma) {
+                try {
+                    const session = await this.prisma.user_session.findUnique({
+                        where: { id: payload.sessionId },
+                        select: { revoked_at: true, expires_at: true }
+                    });
+                    if (!session || session.revoked_at !== null || session.expires_at <= new Date()) {
+                        throw new common_1.UnauthorizedException((0, api_locale_1.getLocaleText)('sessionRevoked', locale, 'Session has been revoked.'));
+                    }
+                }
+                catch (sessionError) {
+                    // If it's an Unauthorized error from revoked session, rethrow it
+                    if (sessionError instanceof common_1.UnauthorizedException) {
+                        throw sessionError;
+                    }
+                    // Otherwise, log the error but allow auth to continue
+                    console.error('Session validation error:', sessionError);
                 }
             }
             return payload;
@@ -136,13 +146,12 @@ let TokenService = class TokenService {
 exports.TokenService = TokenService;
 exports.TokenService = TokenService = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, common_1.Inject)((0, common_1.forwardRef)(() => jwt_1.JwtService))),
-    __param(1, (0, common_1.Inject)((0, common_1.forwardRef)(() => security_service_1.SecurityService))),
-    __param(2, (0, common_1.Inject)((0, common_1.forwardRef)(() => setting_service_1.SettingService))),
-    __param(3, (0, common_1.Inject)((0, common_1.forwardRef)(() => api_prisma_1.PrismaService))),
-    __metadata("design:paramtypes", [jwt_1.JwtService,
+    __param(1, (0, common_1.Inject)((0, common_1.forwardRef)(() => jwt_1.JwtService))),
+    __param(2, (0, common_1.Inject)((0, common_1.forwardRef)(() => security_service_1.SecurityService))),
+    __param(3, (0, common_1.Inject)((0, common_1.forwardRef)(() => setting_service_1.SettingService))),
+    __metadata("design:paramtypes", [api_prisma_1.PrismaService,
+        jwt_1.JwtService,
         security_service_1.SecurityService,
-        setting_service_1.SettingService,
-        api_prisma_1.PrismaService])
+        setting_service_1.SettingService])
 ], TokenService);
 //# sourceMappingURL=token.service.js.map

package/dist/token/token.service.js.map

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

package/hedhog/data/route.yaml

@@ -62,6 +62,16 @@
           slug: admin-access
       - where:
           slug: user
+- url: /sessions/active
+  method: GET
+  relations:
+    role:
+      - where:
+          slug: admin
+      - where:
+          slug: admin-access
+      - where:
+          slug: user
 - url: /menu/system
   method: GET
   relations:

package/hedhog/data/setting_group.yaml

@@ -367,6 +367,47 @@
               order: 2
             - value: microsoft
               order: 3
+            - value: microsoft_entra_id
+              order: 4
+      - slug: microsoft_entra_id_client_id
+        type: string
+        name:
+          en: Microsoft Entra ID Client ID
+          pt: ID do Cliente Microsoft Entra ID
+        description:
+          en: The client ID for Microsoft Entra ID OAuth
+          pt: O ID do cliente para o OAuth do Microsoft Entra ID
+        value: ""
+        user_override: false
+      - slug: microsoft_entra_id_client_secret
+        type: secret
+        component: input-secret
+        name:
+          en: Microsoft Entra ID Client Secret
+          pt: Segredo do Cliente Microsoft Entra ID
+        description:
+          en: The client secret for Microsoft Entra ID OAuth
+          pt: O segredo do cliente para o OAuth do Microsoft Entra ID
+        value: ""
+        user_override: false
+      - slug: microsoft_entra_id_scopes
+        type: array
+        name:
+          en: Microsoft Entra ID Scopes
+          pt: Escopos do Microsoft Entra ID
+        description:
+          en: The scopes for Microsoft Entra ID OAuth
+          pt: Os escopos para o OAuth do Microsoft Entra ID
+        value: '["openid","profile","email"]'
+        component: checkbox
+        relations:
+          setting_list:
+            - value: openid
+              order: 0
+            - value: profile
+              order: 1
+            - value: email
+              order: 2
       - slug: google_client_id
         type: string
         name:
@@ -495,6 +536,16 @@
             - value: offline_access
               order: 4
         user_override: false
+      - slug: microsoft_tenant_id
+        type: string
+        name:
+          en: Microsoft Tenant ID
+          pt: ID do Tenant Microsoft
+        description:
+          en: The Azure AD tenant ID for corporate Microsoft Entra ID (Azure AD) authentication. Leave empty to use common endpoint for personal Microsoft accounts.
+          pt: O ID do tenant do Azure AD para autenticação corporativa Microsoft Entra ID (Azure AD). Deixe vazio para usar o endpoint comum para contas pessoais da Microsoft.
+        value: ""
+        user_override: false
       - slug: github_client_id
         type: string
         name:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/core",
-  "version": "0.0.141",
+  "version": "0.0.150",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -31,10 +31,10 @@
     "uuid": "^11.1.0",
     "@hed-hog/api-locale": "0.0.11",
     "@hed-hog/api-prisma": "0.0.4",
-    "@hed-hog/api-mail": "0.0.7",
-    "@hed-hog/api-pagination": "0.0.5",
     "@hed-hog/types": "0.0.1",
-    "@hed-hog/api": "0.0.3"
+    "@hed-hog/api": "0.0.3",
+    "@hed-hog/api-pagination": "0.0.5",
+    "@hed-hog/api-mail": "0.0.7"
   },
   "exports": {
     ".": {

package/src/auth/guards/auth.guard.ts

@@ -1,10 +1,10 @@
-import { IS_PUBLIC_KEY } from '@hed-hog/api';
+import { IS_PUBLIC_KEY, WITH_ROLE } from '@hed-hog/api';
 import { getLocaleText } from '@hed-hog/api-locale';
 import {
-    CanActivate,
-    ExecutionContext,
-    Injectable,
-    UnauthorizedException,
+  CanActivate,
+  ExecutionContext,
+  Injectable,
+  UnauthorizedException,
 } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { Request } from 'express';
@@ -23,19 +23,32 @@ export class AuthGuard implements CanActivate {
       context.getClass(),
     ]);
 
+    const withRole = this.reflector.getAllAndOverride<boolean>(WITH_ROLE, [
+      context.getHandler(),
+      context.getClass(),
+    ]);
+
     const request = context.switchToHttp().getRequest();
     const token = this.extractTokenFromHeader(request);
     const locale = request.headers['locale'] || request.headers['accept-language'] || 'en';
 
+    // If endpoint requires role/authentication and no token provided
     if (!token) {
       if (isPublic) {
         return true;
+      } else if (withRole) {
+        // @Role() decorator requires authentication
+        throw new UnauthorizedException(
+          getLocaleText('accessDenied', locale, 'Access denied.'),
+        );
       } else {
+        // No explicit decorator, default behavior (deny)
         throw new UnauthorizedException(
           getLocaleText('accessDenied', locale, 'Access denied.'),
         );
       }
     }
+    
     try {
       const payload = await this.token.verify(locale, token);
 

package/src/language/en.json

@@ -166,5 +166,6 @@
     }
   },
   "mail_sent_not_found": "Mail sent record not found.",
-  "validationSslugMustBeString": "Slug must be a string."
+  "validationSslugMustBeString": "Slug must be a string.",
+  "sessionRevoked": "Session has been revoked or expired."
 }

package/src/language/pt.json

@@ -166,5 +166,6 @@
     }
   },
   "mail_sent_not_found": "Registro de e-mail enviado não encontrado.",
-  "validationSslugMustBeString": "O slug deve ser uma string."
+  "validationSslugMustBeString": "O slug deve ser uma string.",
+  "sessionRevoked": "Sessão foi revogada ou expirada."
 }

package/src/oauth/oauth.controller.ts

@@ -33,84 +33,91 @@ export class OAuthController {
     return res.redirect(redirectURL);
   }
 
+
   @Public()
   @Get(':provider/login')
-  async login(@Param('provider') provider: user_account_provider_enum, @Res() res) {
+  async login(@Param('provider') provider: string, @Res() res) {
     const url = this.service.getAuthUrl(
-      provider,
+      provider as user_account_provider_enum,
       `/callback/${provider}/login`,
     );
     return res.redirect(url);
   }
 
+
   @Public()
   @Get(':provider/register')
-  async register(@Param('provider') provider: user_account_provider_enum, @Res() res) {
+  async register(@Param('provider') provider: string, @Res() res) {
     const url = this.service.getAuthUrl(
-      provider,
+      provider as user_account_provider_enum,
       `/callback/${provider}/register`,
     );
     return res.redirect(url);
   }
 
+
   @Public()
   @Get(':provider/connect')
-  async connect(@Param('provider') provider: user_account_provider_enum, @Res() res) {
+  async connect(@Param('provider') provider: string, @Res() res) {
     const url = this.service.getAuthUrl(
-      provider,
+      provider as user_account_provider_enum,
       `/callback/${provider}/connect`,
     );
     return res.redirect(url);
   }
 
+
   @Public()
   @Get(':provider/callback/login')
   async callbackLogin(
     @Locale() locale: string,
     @Ip() ipAddress: string,
     @Headers('user-agent') userAgent: string,
-    @Param('provider') provider: user_account_provider_enum,
+    @Param('provider') provider: string,
     @Query('code') code: string,
     @Res({ passthrough: true }) res,
   ) {
-    return this.service.handleCallback({ res, locale, ipAddress, userAgent, provider, code, type: 'login' });
+    return this.service.handleCallback({ res, locale, ipAddress, userAgent, provider: provider as user_account_provider_enum, code, type: 'login' });
   }
 
+
   @Public()
   @Get(':provider/callback/register')
   async callbackRegister(
     @Locale() locale: string,
     @Ip() ipAddress: string,
     @Headers('user-agent') userAgent: string,
-    @Param('provider') provider: user_account_provider_enum,
+    @Param('provider') provider: string,
     @Query('code') code: string,
     @Res({ passthrough: true }) res,
   ) {
-    return this.service.handleCallback({ res, locale, ipAddress, userAgent, provider, code, type: 'register' });
+    return this.service.handleCallback({ res, locale, ipAddress, userAgent, provider: provider as user_account_provider_enum, code, type: 'register' });
   }
 
+
   @Get(':provider/callback/connect')
   async callbackConnect(
     @Locale() locale: string,
     @Ip() ipAddress: string,
     @Headers('user-agent') userAgent: string,
     @User() { id },
-    @Param('provider') provider: user_account_provider_enum,
+    @Param('provider') provider: string,
     @Query('code') code: string,
     @Res({ passthrough: true }) res,
   ) {
-    return this.service.handleCallback({ res, locale, ipAddress, userAgent, provider, code, type: 'connect', userId: id });
+    return this.service.handleCallback({ res, locale, ipAddress, userAgent, provider: provider as user_account_provider_enum, code, type: 'connect', userId: id });
   }
 
+
   @Delete(':provider')
   async disconnect(
     @Locale() locale: string,
     @Ip() ipAddress: string,
     @Headers('user-agent') userAgent: string,
-    @Param('provider') provider: user_account_provider_enum,
+    @Param('provider') provider: string,
     @Body('email') email: string,
     @Res({ passthrough: true }) res,
   ) {
-    return this.service.handleCallback({ res, locale, ipAddress, userAgent, provider, email, type: 'disconnect' });
+    return this.service.handleCallback({ res, locale, ipAddress, userAgent, provider: provider as user_account_provider_enum, email, type: 'disconnect' });
   }
 }

package/src/oauth/oauth.module.ts

@@ -14,6 +14,7 @@ import { OAuthService } from './oauth.service';
 import { FacebookProvider } from './providers/facebook.provider';
 import { GithubProvider } from './providers/github.provider';
 import { GoogleProvider } from './providers/google.provider';
+import { MicrosoftEntraIdProvider } from './providers/microsoft-entra-id.provider';
 import { MicrosoftProvider } from './providers/microsoft.provider';
 
 @Module({
@@ -30,7 +31,7 @@ import { MicrosoftProvider } from './providers/microsoft.provider';
     forwardRef(() => UserModule),
   ],
   controllers: [OAuthController],
-  providers: [OAuthService, GoogleProvider, FacebookProvider, GithubProvider, MicrosoftProvider],
+  providers: [OAuthService, GoogleProvider, FacebookProvider, GithubProvider, MicrosoftProvider, MicrosoftEntraIdProvider],
   exports: [OAuthService],
 })
 export class OAuthModule {}

package/src/oauth/oauth.service.ts

@@ -2,14 +2,14 @@ import { PrismaService, user_account_provider_enum } from '@hed-hog/api-prisma';
 import {
   BadRequestException,
   ConflictException,
-  forwardRef,
   Inject,
   Injectable,
-  NotFoundException
+  NotFoundException,
+  forwardRef
 } from '@nestjs/common';
 import { AuthService } from '../auth/auth.service';
 import { FileService } from '../file/file.service';
-import { MailService as MailManagerService } from '../mail/mail.service';
+import { MailService } from '../mail/mail.service';
 import { SecurityService } from '../security/security.service';
 import { SettingService } from '../setting/setting.service';
 import { TokenService } from '../token/token.service';
@@ -18,6 +18,7 @@ import { OAuthProvider } from './interfaces/OAuthProvider';
 import { FacebookProvider } from './providers/facebook.provider';
 import { GithubProvider } from './providers/github.provider';
 import { GoogleProvider } from './providers/google.provider';
+import { MicrosoftEntraIdProvider } from './providers/microsoft-entra-id.provider';
 import { MicrosoftProvider } from './providers/microsoft.provider';
 
 type HandleCallbackProps = {
@@ -41,10 +42,11 @@ export class OAuthService {
     facebook: FacebookProvider,
     microsoft: MicrosoftProvider,
     github: GithubProvider,
+    microsoftEntraId: MicrosoftEntraIdProvider,
     @Inject(forwardRef(() => AuthService))
     private readonly auth: AuthService,
     private readonly file: FileService,
-    private readonly mail: MailManagerService,
+    private readonly mail: MailService,
     private readonly security: SecurityService,
     private readonly prisma: PrismaService,
     private readonly token: TokenService,
@@ -56,6 +58,7 @@ export class OAuthService {
     this.providers.set(facebook.getProviderType(), facebook);
     this.providers.set(microsoft.getProviderType(), microsoft);
     this.providers.set(github.getProviderType(), github);
+    this.providers.set(microsoftEntraId.getProviderType(), microsoftEntraId);
   }
 
   getAuthUrl(provider: user_account_provider_enum, callbackPath: string) {