📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Simplify redundant code
Blue Mousea84b42e999db
diff --git a/backend/apps/cloud/src/auth/guards/authentication.guard.ts b/backend/apps/cloud/src/auth/guards/authentication.guard.tsindex ffaec491b..98678c22b 100644--- a/backend/apps/cloud/src/auth/guards/authentication.guard.ts+++ b/backend/apps/cloud/src/auth/guards/authentication.guard.ts@@ -1,18 +1,10 @@import { Injectable, CanActivate, ExecutionContext } from '@nestjs/common'import { Reflector } from '@nestjs/core'-import { ExtractJwt } from 'passport-jwt'-import { verify } from 'jsonwebtoken'--import { UserService } from '../../user/user.service'-import { JWT_ACCESS_TOKEN_SECRET } from '../../common/constants'import { IS_TWO_FA_NOT_REQUIRED_KEY } from '../decorators'@Injectable()export class AuthenticationGuard implements CanActivate {- constructor(- private readonly reflector: Reflector,- private readonly userService: UserService,- ) {}+ constructor(private readonly reflector: Reflector) {}async canActivate(context: ExecutionContext) {const isTwoFaNotRequired = this.reflector.get<boolean>(@@ -21,38 +13,20 @@ export class AuthenticationGuard implements CanActivate {)const request = context.switchToHttp().getRequest()- const userFromRequest = request.user-- const user = await this.userService.findUserById(userFromRequest?.id)+ const user = request.user- let token = ''- if (request.cookies.token) {- token = request.cookies.token- } else {- const extract = ExtractJwt.fromAuthHeaderAsBearerToken()- token = extract(request)- }-- if (isTwoFaNotRequired || !token) {+ if (isTwoFaNotRequired) {return true}- try {- const decoded: any = verify(token, JWT_ACCESS_TOKEN_SECRET)-- // If the token is not decoded, it means it's invalid- if (!decoded) {- return false- }+ // If user is missing here, upstream guards (e.g., JwtAccessTokenGuard) already rejected the request,+ // or this route allows API key auth via MultiAuthGuard. When using API key, skip 2FA enforcement.+ if (!user) return true- // If the user has 2FA enabled, but the token is temporary (meant to be used for 2FA routes only) then return false- if (- user?.isTwoFactorAuthenticationEnabled &&- !decoded.isSecondFactorAuthenticated- ) {- return false- }- } catch {+ if (+ user?.isTwoFactorAuthenticationEnabled &&+ !user?.isSecondFactorAuthenticated+ ) {return false}diff --git a/backend/apps/cloud/src/auth/strategies/jwt-access-token.strategy.ts b/backend/apps/cloud/src/auth/strategies/jwt-access-token.strategy.tsindex 95b47f6c9..29edfcd72 100644--- a/backend/apps/cloud/src/auth/strategies/jwt-access-token.strategy.ts+++ b/backend/apps/cloud/src/auth/strategies/jwt-access-token.strategy.ts@@ -17,7 +17,10 @@ export class JwtAccessTokenStrategy extends PassportStrategy(private readonly userService: UserService,) {super({- jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),+ jwtFromRequest: ExtractJwt.fromExtractors([+ ExtractJwt.fromAuthHeaderAsBearerToken(),+ (request: any) => request?.cookies?.token,+ ]),ignoreExpiration: false,secretOrKey: JWT_ACCESS_TOKEN_SECRET,})@@ -30,6 +33,9 @@ export class JwtAccessTokenStrategy extends PassportStrategy(throw new UnauthorizedException()}- return user+ return {+ ...user,+ isSecondFactorAuthenticated: payload.isSecondFactorAuthenticated,+ }}}diff --git a/backend/apps/community/src/auth/guards/authentication.guard.ts b/backend/apps/community/src/auth/guards/authentication.guard.tsindex f729570e1..d8d6f812f 100644--- a/backend/apps/community/src/auth/guards/authentication.guard.ts+++ b/backend/apps/community/src/auth/guards/authentication.guard.ts@@ -1,40 +1,12 @@-import { Injectable, CanActivate, ExecutionContext } from '@nestjs/common'-import { Reflector } from '@nestjs/core'-import { ExtractJwt } from 'passport-jwt'-import { verify } from 'jsonwebtoken'--import { JWT_ACCESS_TOKEN_SECRET } from '../../common/constants'+import { Injectable, CanActivate } from '@nestjs/common'@Injectable()export class AuthenticationGuard implements CanActivate {- constructor(private readonly reflector: Reflector) {}-- async canActivate(context: ExecutionContext) {- const request = context.switchToHttp().getRequest()-- let token = ''- if (request.cookies.token) {- token = request.cookies.token- } else {- const extract = ExtractJwt.fromAuthHeaderAsBearerToken()- token = extract(request)- }-- if (!token) {- return true- }-- try {- const decoded: any = verify(token, JWT_ACCESS_TOKEN_SECRET)-- // If the token is not decoded, it means it's invalid- if (!decoded) {- return false- }- } catch {- return false- }+ constructor() {}+ async canActivate() {+ // If upstream guards authenticated a user, they set request.user.+ // If unauthenticated (including API-key or optional auth cases), allow pass-through here.return true}}diff --git a/backend/apps/community/src/auth/strategies/jwt-access-token.strategy.ts b/backend/apps/community/src/auth/strategies/jwt-access-token.strategy.tsindex 8bf8723ad..a9b8c6f09 100644--- a/backend/apps/community/src/auth/strategies/jwt-access-token.strategy.ts+++ b/backend/apps/community/src/auth/strategies/jwt-access-token.strategy.ts@@ -4,8 +4,8 @@ import { PassportStrategy } from '@nestjs/passport'import { Strategy, ExtractJwt } from 'passport-jwt'import { JWT_ACCESS_TOKEN_SECRET } from '../../common/constants'-import { IJwtPayload } from '../interfaces'import { UserService } from '../../user/user.service'+import { IJwtPayload } from '../interfaces'@Injectable()export class JwtAccessTokenStrategy extends PassportStrategy(@@ -17,7 +17,10 @@ export class JwtAccessTokenStrategy extends PassportStrategy(private readonly userService: UserService,) {super({- jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),+ jwtFromRequest: ExtractJwt.fromExtractors([+ ExtractJwt.fromAuthHeaderAsBearerToken(),+ (request: any) => request?.cookies?.token,+ ]),ignoreExpiration: false,secretOrKey: JWT_ACCESS_TOKEN_SECRET,})