@lenne.tech/nest-server 11.10.1 → 11.10.3

package/dist/core/modules/auth/guards/roles.guard.js

@@ -17,10 +17,9 @@ exports.RolesGuard = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const graphql_1 = require("@nestjs/graphql");
-const mongoose_1 = require("@nestjs/mongoose");
-const mongoose_2 = require("mongoose");
 const rxjs_1 = require("rxjs");
 const role_enum_1 = require("../../../common/enums/role.enum");
+const better_auth_token_service_1 = require("../../better-auth/better-auth-token.service");
 const core_better_auth_service_1 = require("../../better-auth/core-better-auth.service");
 const error_code_1 = require("../../error-code");
 const auth_guard_strategy_enum_1 = require("../auth-guard-strategy.enum");
@@ -34,7 +33,7 @@ let RolesGuard = RolesGuard_1 = class RolesGuard extends (0, auth_guard_1.AuthGu
         this.moduleRef = moduleRef;
         this.logger = new common_1.Logger(RolesGuard_1.name);
         this.betterAuthService = null;
-        this.mongoConnection = null;
+        this.tokenService = null;
         this.servicesResolved = false;
     }
     resolveServices() {
@@ -47,198 +46,104 @@ let RolesGuard = RolesGuard_1 = class RolesGuard extends (0, auth_guard_1.AuthGu
         catch {
         }
         try {
-            this.mongoConnection = this.moduleRef.get((0, mongoose_1.getConnectionToken)(), { strict: false });
+            this.tokenService = this.moduleRef.get(better_auth_token_service_1.BetterAuthTokenService, { strict: false });
         }
         catch {
         }
         this.servicesResolved = true;
     }
     async canActivate(context) {
+        const reflectorRoles = this.reflector.getAll('roles', [context.getHandler(), context.getClass()]);
+        const roles = reflectorRoles[0]
+            ? reflectorRoles[1]
+                ? [...reflectorRoles[0], ...reflectorRoles[1]]
+                : reflectorRoles[0]
+            : reflectorRoles[1];
+        if (roles && roles.includes(role_enum_1.RoleEnum.S_NO_ONE)) {
+            throw new common_1.UnauthorizedException(error_code_1.ErrorCode.UNAUTHORIZED);
+        }
+        if (!roles || !roles.some((value) => !!value) || roles.includes(role_enum_1.RoleEnum.S_EVERYONE)) {
+            return true;
+        }
         this.resolveServices();
+        const request = this.getRequest(context);
+        const existingUser = request?.user;
+        if (existingUser && existingUser._authenticatedViaBetterAuth === true) {
+            this.handleRequest(null, existingUser, null, context);
+            return true;
+        }
+        if (this.betterAuthService?.isEnabled()) {
+            const user = await this.verifyBetterAuthTokenFromContext(context);
+            if (user) {
+                if (request) {
+                    request.user = user;
+                }
+                this.handleRequest(null, user, null, context);
+                return true;
+            }
+        }
         try {
             const result = super.canActivate(context);
             return (0, rxjs_1.isObservable)(result) ? await (0, rxjs_1.firstValueFrom)(result) : await result;
         }
         catch (passportError) {
-            if (!this.betterAuthService?.isEnabled()) {
-                throw passportError;
-            }
-            const user = await this.verifyBetterAuthTokenFromContext(context);
-            if (!user) {
-                throw passportError;
-            }
-            const request = this.getRequest(context);
-            if (request) {
-                request.user = user;
+            const errorMessage = passportError instanceof Error ? passportError.message : String(passportError);
+            const isStrategyError = errorMessage.includes('Unknown authentication strategy');
+            if (this.betterAuthService?.isEnabled()) {
+                if (isStrategyError) {
+                    throw new invalid_token_exception_1.InvalidTokenException();
+                }
+                const user = await this.verifyBetterAuthTokenFromContext(context);
+                if (user) {
+                    if (request) {
+                        request.user = user;
+                    }
+                    this.handleRequest(null, user, null, context);
+                    return true;
+                }
             }
-            this.handleRequest(null, user, null, context);
-            return true;
+            throw passportError;
         }
     }
     async verifyBetterAuthTokenFromContext(context) {
-        if (!this.betterAuthService || !this.mongoConnection) {
+        if (!this.tokenService) {
             return null;
         }
         try {
-            let authHeader;
-            try {
-                const gqlContext = graphql_1.GqlExecutionContext.create(context);
-                const ctx = gqlContext.getContext();
-                if (ctx?.req?.headers) {
-                    authHeader = ctx.req.headers.authorization || ctx.req.headers.Authorization;
-                }
-            }
-            catch {
-            }
-            if (!authHeader) {
-                try {
-                    const httpRequest = context.switchToHttp().getRequest();
-                    if (httpRequest?.headers) {
-                        authHeader = httpRequest.headers.authorization || httpRequest.headers.Authorization;
-                    }
-                }
-                catch {
-                }
-            }
-            let token;
-            if (authHeader?.startsWith('Bearer ')) {
-                token = authHeader.substring(7);
-            }
-            else if (authHeader?.startsWith('bearer ')) {
-                token = authHeader.substring(7);
-            }
-            if (!token) {
-                let cookies;
-                try {
-                    const gqlContext = graphql_1.GqlExecutionContext.create(context);
-                    const ctx = gqlContext.getContext();
-                    if (ctx?.req?.cookies) {
-                        cookies = ctx.req.cookies;
-                    }
-                }
-                catch {
-                }
-                if (!cookies) {
-                    try {
-                        const httpRequest = context.switchToHttp().getRequest();
-                        if (httpRequest?.cookies) {
-                            cookies = httpRequest.cookies;
-                        }
-                    }
-                    catch {
-                    }
-                }
-                if (cookies) {
-                    const basePath = this.betterAuthService.getBasePath?.()?.replace(/^\//, '').replace(/\//g, '.') || 'iam';
-                    const basePathCookie = `${basePath}.session_token`;
-                    token =
-                        cookies[basePathCookie] ||
-                            cookies['better-auth.session_token'] ||
-                            cookies['token'] ||
-                            undefined;
-                }
+            const request = this.extractRequestFromContext(context);
+            if (!request) {
+                return null;
             }
+            const { token } = this.tokenService.extractTokenFromRequest(request);
             if (!token) {
                 return null;
             }
-            if (this.betterAuthService.isJwtEnabled()) {
-                try {
-                    const payload = await this.betterAuthService.verifyJwtToken(token);
-                    if (payload?.sub) {
-                        const user = await this.loadUserFromPayload(payload);
-                        if (user) {
-                            return user;
-                        }
-                    }
-                }
-                catch {
-                }
-            }
-            try {
-                const sessionResult = await this.betterAuthService.getSessionByToken(token);
-                if (sessionResult?.user) {
-                    return this.loadUserFromSessionResult(sessionResult.user);
-                }
-            }
-            catch {
-            }
-            return null;
+            return await this.tokenService.verifyAndLoadUser(token);
         }
         catch (error) {
-            this.logger.debug(`BetterAuth token fallback failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
+            this.logger.debug(`BetterAuth token verification failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
             return null;
         }
     }
-    async loadUserFromPayload(payload) {
-        if (!this.mongoConnection) {
-            return null;
-        }
+    extractRequestFromContext(context) {
         try {
-            const usersCollection = this.mongoConnection.collection('users');
-            let user = null;
-            if (mongoose_2.Types.ObjectId.isValid(payload.sub)) {
-                user = await usersCollection.findOne({ _id: new mongoose_2.Types.ObjectId(payload.sub) });
-            }
-            if (!user) {
-                user = await usersCollection.findOne({ iamId: payload.sub });
+            const gqlContext = graphql_1.GqlExecutionContext.create(context);
+            const ctx = gqlContext.getContext();
+            if (ctx?.req) {
+                return ctx.req;
             }
-            if (!user) {
-                return null;
-            }
-            const userObject = {
-                ...user,
-                _authenticatedViaBetterAuth: true,
-                hasRole: (roles) => {
-                    if (!user.roles || !Array.isArray(user.roles)) {
-                        return false;
-                    }
-                    return roles.some((role) => user.roles.includes(role));
-                },
-                id: user._id?.toString(),
-            };
-            return userObject;
         }
-        catch (error) {
-            this.logger.debug(`Failed to load user from payload: ${error instanceof Error ? error.message : 'Unknown error'}`);
-            return null;
-        }
-    }
-    async loadUserFromSessionResult(sessionUser) {
-        if (!this.mongoConnection || !sessionUser) {
-            return null;
+        catch {
         }
         try {
-            const usersCollection = this.mongoConnection.collection('users');
-            let user = null;
-            if (sessionUser.email) {
-                user = await usersCollection.findOne({ email: sessionUser.email });
+            const httpRequest = context.switchToHttp().getRequest();
+            if (httpRequest) {
+                return httpRequest;
             }
-            if (!user && sessionUser.id) {
-                user = await usersCollection.findOne({ iamId: sessionUser.id });
-            }
-            if (!user && sessionUser.id && mongoose_2.Types.ObjectId.isValid(sessionUser.id)) {
-                user = await usersCollection.findOne({ _id: new mongoose_2.Types.ObjectId(sessionUser.id) });
-            }
-            if (!user) {
-                return null;
-            }
-            const userObject = {
-                ...user,
-                _authenticatedViaBetterAuth: true,
-                hasRole: (roles) => {
-                    if (!user.roles || !Array.isArray(user.roles)) {
-                        return false;
-                    }
-                    return roles.some((role) => user.roles.includes(role));
-                },
-                id: user._id?.toString(),
-            };
-            return userObject;
         }
-        catch (error) {
-            this.logger.debug(`Failed to load user from session: ${error instanceof Error ? error.message : 'Unknown error'}`);
-            return null;
+        catch {
         }
+        return null;
     }
     handleRequest(err, user, info, context) {
         const reflectorRoles = this.reflector.getAll('roles', [context.getHandler(), context.getClass()]);

package/dist/core/modules/auth/guards/roles.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"roles.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/roles.guard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"roles.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/roles.guard.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/better-auth/better-auth-token.service.d.ts

@@ -0,0 +1,21 @@
+import { Connection } from 'mongoose';
+import { BetterAuthenticatedUser } from './better-auth.types';
+import { CoreBetterAuthService } from './core-better-auth.service';
+export interface TokenExtractionResult {
+    source: 'cookie' | 'header' | null;
+    token: null | string;
+}
+export declare class BetterAuthTokenService {
+    private readonly betterAuthService?;
+    private readonly connection?;
+    private readonly logger;
+    constructor(betterAuthService?: CoreBetterAuthService, connection?: Connection);
+    extractTokenFromRequest(request: {
+        cookies?: Record<string, string>;
+        headers?: Record<string, string | string[] | undefined>;
+    }): TokenExtractionResult;
+    verifyAndLoadUser(token: string): Promise<BetterAuthenticatedUser | null>;
+    createUserWithHasRole(user: Record<string, unknown>): BetterAuthenticatedUser;
+    private loadUserFromPayload;
+    private loadUserFromSessionResult;
+}

package/dist/core/modules/better-auth/better-auth-token.service.js

@@ -0,0 +1,153 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var BetterAuthTokenService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BetterAuthTokenService = void 0;
+const common_1 = require("@nestjs/common");
+const mongoose_1 = require("@nestjs/mongoose");
+const mongoose_2 = require("mongoose");
+const core_better_auth_service_1 = require("./core-better-auth.service");
+let BetterAuthTokenService = BetterAuthTokenService_1 = class BetterAuthTokenService {
+    constructor(betterAuthService, connection) {
+        this.betterAuthService = betterAuthService;
+        this.connection = connection;
+        this.logger = new common_1.Logger(BetterAuthTokenService_1.name);
+    }
+    extractTokenFromRequest(request) {
+        const authHeader = request.headers?.authorization || request.headers?.Authorization;
+        const headerValue = Array.isArray(authHeader) ? authHeader[0] : authHeader;
+        if (headerValue) {
+            if (headerValue.startsWith('Bearer ') || headerValue.startsWith('bearer ')) {
+                return { source: 'header', token: headerValue.substring(7) };
+            }
+        }
+        if (request.cookies && this.betterAuthService) {
+            const cookieName = this.betterAuthService.getSessionCookieName();
+            const token = request.cookies[cookieName] ||
+                request.cookies['better-auth.session_token'] ||
+                request.cookies['token'] ||
+                undefined;
+            if (token) {
+                return { source: 'cookie', token };
+            }
+        }
+        return { source: null, token: null };
+    }
+    async verifyAndLoadUser(token) {
+        if (!this.betterAuthService || !this.connection) {
+            return null;
+        }
+        if (this.betterAuthService.isJwtEnabled()) {
+            try {
+                const payload = await this.betterAuthService.verifyJwtToken(token);
+                if (payload?.sub) {
+                    const user = await this.loadUserFromPayload(payload);
+                    if (user) {
+                        return user;
+                    }
+                }
+            }
+            catch (error) {
+                if (error instanceof Error && error.message.includes('expired')) {
+                    this.logger.debug('JWT token expired');
+                    throw error;
+                }
+                this.logger.debug(`JWT verification failed, trying session: ${error instanceof Error ? error.message : 'Unknown error'}`);
+            }
+        }
+        try {
+            const sessionResult = await this.betterAuthService.getSessionByToken(token);
+            if (sessionResult?.user) {
+                return this.loadUserFromSessionResult(sessionResult.user);
+            }
+        }
+        catch (error) {
+            this.logger.debug(`Session lookup failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
+        }
+        return null;
+    }
+    createUserWithHasRole(user) {
+        return {
+            ...user,
+            _authenticatedViaBetterAuth: true,
+            hasRole: (roles) => {
+                const userRoles = user.roles;
+                if (!userRoles || !Array.isArray(userRoles)) {
+                    return false;
+                }
+                return roles.some((role) => userRoles.includes(role));
+            },
+            id: user._id?.toString() || user.id,
+        };
+    }
+    async loadUserFromPayload(payload) {
+        if (!this.connection) {
+            return null;
+        }
+        try {
+            const usersCollection = this.connection.collection('users');
+            let user = null;
+            if (mongoose_2.Types.ObjectId.isValid(payload.sub)) {
+                user = await usersCollection.findOne({ _id: new mongoose_2.Types.ObjectId(payload.sub) });
+            }
+            if (!user) {
+                user = await usersCollection.findOne({ iamId: payload.sub });
+            }
+            if (!user) {
+                return null;
+            }
+            return this.createUserWithHasRole(user);
+        }
+        catch (error) {
+            this.logger.debug(`Failed to load user from payload: ${error instanceof Error ? error.message : 'Unknown error'}`);
+            return null;
+        }
+    }
+    async loadUserFromSessionResult(sessionUser) {
+        if (!this.connection || !sessionUser) {
+            return null;
+        }
+        try {
+            const usersCollection = this.connection.collection('users');
+            let user = null;
+            if (sessionUser.email) {
+                user = await usersCollection.findOne({ email: sessionUser.email });
+            }
+            if (!user && sessionUser.id) {
+                user = await usersCollection.findOne({ iamId: sessionUser.id });
+            }
+            if (!user && sessionUser.id && mongoose_2.Types.ObjectId.isValid(sessionUser.id)) {
+                user = await usersCollection.findOne({ _id: new mongoose_2.Types.ObjectId(sessionUser.id) });
+            }
+            if (!user) {
+                return null;
+            }
+            return this.createUserWithHasRole(user);
+        }
+        catch (error) {
+            this.logger.debug(`Failed to load user from session: ${error instanceof Error ? error.message : 'Unknown error'}`);
+            return null;
+        }
+    }
+};
+exports.BetterAuthTokenService = BetterAuthTokenService;
+exports.BetterAuthTokenService = BetterAuthTokenService = BetterAuthTokenService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Optional)()),
+    __param(1, (0, common_1.Optional)()),
+    __param(1, (0, mongoose_1.InjectConnection)()),
+    __metadata("design:paramtypes", [core_better_auth_service_1.CoreBetterAuthService,
+        mongoose_2.Connection])
+], BetterAuthTokenService);
+//# sourceMappingURL=better-auth-token.service.js.map

package/dist/core/modules/better-auth/better-auth-token.service.js.map

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

package/dist/core/modules/better-auth/better-auth.config.d.ts

@@ -5,5 +5,8 @@ export interface CreateBetterAuthOptions {
     config: IBetterAuth;
     db: any;
     fallbackSecrets?: (string | undefined)[];
+    serverAppUrl?: string;
+    serverBaseUrl?: string;
+    serverEnv?: string;
 }
 export declare function createBetterAuthInstance(options: CreateBetterAuthOptions): BetterAuthInstance | null;