📈 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
Old authorization module removed
Yevhenii Kulisidi64d204342003
diff --git a/src/alert/alert.controller.ts b/src/alert/alert.controller.tsindex dfbdc1573..4d96e4537 100644--- a/src/alert/alert.controller.ts+++ b/src/alert/alert.controller.ts@@ -5,7 +5,7 @@ import { In } from 'typeorm'import { ApiTags, ApiResponse } from '@nestjs/swagger'import { AlertService } from './alert.service'import { SelfhostedGuard } from '../common/guards/selfhosted.guard'-import { RolesGuard } from '../common/guards/roles.guard'+import { RolesGuard } from '../auth/guards/roles.guard'import * as _isEmpty from 'lodash/isEmpty'import * as _map from 'lodash/map'import * as _omit from 'lodash/omit'@@ -14,8 +14,8 @@ import * as _pick from 'lodash/pick'import { UserService } from 'src/user/user.service'import { ProjectService } from 'src/project/project.service'import { AppLoggerService } from 'src/logger/logger.service'-import { CurrentUserId } from '../common/decorators/current-user-id.decorator'-import { Roles } from '../common/decorators/roles.decorator'+import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'+import { Roles } from '../auth/decorators/roles.decorator'import { UserType } from 'src/user/entities/user.entity'import { Alert } from './entity/alert.entity'import { AlertDTO, CreateAlertDTO } from './dto/alert.dto'diff --git a/src/analytics/analytics.controller.ts b/src/analytics/analytics.controller.tsindex 36e409ef7..63632b7ea 100644--- a/src/analytics/analytics.controller.ts+++ b/src/analytics/analytics.controller.ts@@ -42,9 +42,9 @@ import {checkIfTBAllowed,} from './analytics.service'import { TaskManagerService } from '../task-manager/task-manager.service'-import { CurrentUserId } from '../common/decorators/current-user-id.decorator'+import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'import { DEFAULT_TIMEZONE } from '../user/entities/user.entity'-import { RolesGuard } from '../common/guards/roles.guard'+import { RolesGuard } from '../auth/guards/roles.guard'import { PageviewsDTO } from './dto/pageviews.dto'import { EventsDTO } from './dto/events.dto'import { AnalyticsGET_DTO } from './dto/getData.dto'diff --git a/src/common/decorators/2fa-disabled.decorator.ts b/src/common/decorators/2fa-disabled.decorator.tsdeleted file mode 100644index 335e4925b..000000000--- a/src/common/decorators/2fa-disabled.decorator.ts+++ /dev/null@@ -1,7 +0,0 @@-import { SetMetadata, CustomDecorator } from '@nestjs/common'--/**- * Should be applied to controllers where user has to be authenticated but 2FA is not required.- */-export const TwoFaNotRequired = (): CustomDecorator<string> =>- SetMetadata('twoFaNotRequired', true)diff --git a/src/common/decorators/current-user-id.decorator.ts b/src/common/decorators/current-user-id.decorator.tsdeleted file mode 100644index 388055119..000000000--- a/src/common/decorators/current-user-id.decorator.ts+++ /dev/null@@ -1,25 +0,0 @@-import { createParamDecorator, ExecutionContext } from '@nestjs/common'-import { Request } from 'express'-import { verify } from 'jsonwebtoken'-import { ExtractJwt } from 'passport-jwt'--export const CurrentUserId = createParamDecorator(- async (data: unknown, context: ExecutionContext) => {- const request: Request = context.switchToHttp().getRequest()- let token = ''-- if (request.cookies['token']) {- token = request.cookies['token']- } else {- const extract = ExtractJwt.fromAuthHeaderAsBearerToken()- token = extract(request)- }-- try {- const decoded: any = verify(token, process.env.JWT_SECRET)- return decoded.user_id- } catch {- return null- }- },-)diff --git a/src/common/decorators/roles.decorator.ts b/src/common/decorators/roles.decorator.tsdeleted file mode 100644index b891e1484..000000000--- a/src/common/decorators/roles.decorator.ts+++ /dev/null@@ -1,4 +0,0 @@-import { SetMetadata, CustomDecorator } from '@nestjs/common'--export const Roles = (...roles: string[]): CustomDecorator<string> =>- SetMetadata('roles', roles)diff --git a/src/common/guards/roles.guard.ts b/src/common/guards/roles.guard.tsdeleted file mode 100644index 05768f911..000000000--- a/src/common/guards/roles.guard.ts+++ /dev/null@@ -1,68 +0,0 @@-import {- Injectable,- CanActivate,- ExecutionContext,- UnauthorizedException,-} from '@nestjs/common'-import { Reflector } from '@nestjs/core'-import { Request } from 'express'-import { verify } from 'jsonwebtoken'-import { ExtractJwt } from 'passport-jwt'--import { UserService } from '../../user/user.service'-import { User } from '../../user/entities/user.entity'-import { isSelfhosted } from '../constants'--@Injectable()-export class RolesGuard implements CanActivate {- constructor(private reflector: Reflector, private userService: UserService) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const secret = process.env.JWT_SECRET- const roles = this.reflector.get<string[]>('roles', context.getHandler())- const twoFaNotRequired = this.reflector.get<boolean>(- 'twoFaNotRequired',- context.getHandler(),- )- if (!roles || isSelfhosted) {- return true- }-- const request: Request = context.switchToHttp().getRequest()- let token = ''- if (request.cookies['token']) {- token = request.cookies['token']- } else {- const extract = ExtractJwt.fromAuthHeaderAsBearerToken()- token = extract(request)- }-- try {- const decoded: any = verify(token, secret)- if (decoded) {- const user: User = await this.userService.findOneWhere({- id: decoded.user_id,- })- const hasRole = user.roles.some(- role => !!roles.find(item => item === role),- )-- if (!hasRole) {- throw new Error()- }-- if (- !twoFaNotRequired &&- user.isTwoFactorAuthenticationEnabled &&- !decoded.isSecondFactorAuthenticated- ) {- throw new Error()- }-- return true- }- } catch {- throw new UnauthorizedException()- }- }-}diff --git a/src/marketplace/categories/categories.controller.ts b/src/marketplace/categories/categories.controller.tsindex 4f1cbe609..b6b5b4c51 100644--- a/src/marketplace/categories/categories.controller.ts+++ b/src/marketplace/categories/categories.controller.ts@@ -14,8 +14,8 @@ import {ValidationPipe,} from '@nestjs/common'import { ApiParam, ApiQuery, ApiTags } from '@nestjs/swagger'-import { Roles } from '../../common/decorators/roles.decorator'-import { RolesGuard } from '../../common/guards/roles.guard'+import { Roles } from '../../auth/decorators/roles.decorator'+import { RolesGuard } from '../../auth/guards/roles.guard'import { UserType } from '../../user/entities/user.entity'import { CategoriesService } from './categories.service'import { Category } from './category.entity'diff --git a/src/marketplace/complaints/complaints.controller.ts b/src/marketplace/complaints/complaints.controller.tsindex 1063556b5..13c8cf069 100644--- a/src/marketplace/complaints/complaints.controller.ts+++ b/src/marketplace/complaints/complaints.controller.ts@@ -20,8 +20,8 @@ import { CreateComplaintQueryDto } from './dtos/queries/create-complaint.dto'import { GetComplaintsQueryDto } from './dtos/queries/get-complaints.dto'import { Complaint } from './entities/complaint.entity'import { UserType } from 'src/user/entities/user.entity'-import { RolesGuard } from 'src/common/guards/roles.guard'-import { Roles } from 'src/common/decorators/roles.decorator'+import { RolesGuard } from 'src/auth/guards/roles.guard'+import { Roles } from 'src/auth/decorators/roles.decorator'@ApiTags('complaints')@Controller('complaints')diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.tsindex c53a4a604..3ed4b6e90 100644--- a/src/marketplace/extensions/extensions.controller.ts+++ b/src/marketplace/extensions/extensions.controller.ts@@ -37,7 +37,7 @@ import { SearchExtensionQueries } from './dtos/search-extension-queries.dto'import { CategoriesService } from '../categories/categories.service'import { SortByExtension } from './enums/sort-by-extension.enum'import { CdnService } from '../cdn/cdn.service'-import { CurrentUserId } from 'src/common/decorators/current-user-id.decorator'+import { CurrentUserId } from 'src/auth/decorators/current-user-id.decorator'import { Extension } from './entities/extension.entity'import { GetInstalledExtensionsQueriesDto } from './dtos/queries/get-installed-extensions.dto'import { InstallExtensionParamsDto } from './dtos/params/install-extension.dto'@@ -45,8 +45,8 @@ import { UninstallExtensionParamsDto } from './dtos/params/uninstall-extension.dimport { InstallExtensionBodyDto } from './dtos/bodies/install-extension.dto'import { UninstallExtensionBodyDto } from './dtos/bodies/uninstall-extension.dto'import { ProjectService } from '../../project/project.service'-import { Roles } from '../../common/decorators/roles.decorator'-import { RolesGuard } from '../../common/guards/roles.guard'+import { Roles } from '../../auth/decorators/roles.decorator'+import { RolesGuard } from '../../auth/guards/roles.guard'import { UserType } from '../../user/entities/user.entity'import { ExtensionStatus } from './enums/extension-status.enum'diff --git a/src/old-auth/auth.controller.ts b/src/old-auth/auth.controller.tsindex b766a9908..ad3979849 100644--- a/src/old-auth/auth.controller.ts+++ b/src/old-auth/auth.controller.ts@@ -25,9 +25,9 @@ import { User, UserType } from '../user/entities/user.entity'import { ProjectService } from '../project/project.service'import { PasswordChangeDTO } from './dto/password-change.dto'import { RequestPasswordChangeDTO } from './dto/request-pass-change.dto'-import { RolesGuard } from '../common/guards/roles.guard'-import { Roles } from '../common/decorators/roles.decorator'-import { CurrentUserId } from '../common/decorators/current-user-id.decorator'+import { RolesGuard } from '../auth/guards/roles.guard'+import { Roles } from '../auth/decorators/roles.decorator'+import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'import { checkRateLimit } from '../common/utils'import { LetterTemplate } from '../mailer/letter'import { AppLoggerService } from '../logger/logger.service'diff --git a/src/project/project.controller.ts b/src/project/project.controller.tsindex 20e4371b6..92165c3e8 100644--- a/src/project/project.controller.ts+++ b/src/project/project.controller.ts@@ -29,13 +29,13 @@ import { ActionTokenType } from '../action-tokens/action-token.entity'import { ActionTokensService } from '../action-tokens/action-tokens.service'import { MailerService } from '../mailer/mailer.service'import { LetterTemplate } from '../mailer/letter'-import { Roles } from '../common/decorators/roles.decorator'+import { Roles } from '../auth/decorators/roles.decorator'import { SelfhostedGuard } from '../common/guards/selfhosted.guard'-import { RolesGuard } from '../common/guards/roles.guard'+import { RolesGuard } from '../auth/guards/roles.guard'import { Pagination } from '../common/pagination/pagination'import { Project } from './entity/project.entity'import { ProjectShare, roles } from './entity/project-share.entity'-import { CurrentUserId } from '../common/decorators/current-user-id.decorator'+import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'import { UserService } from '../user/user.service'import { ProjectDTO } from './dto/project.dto'import { ShareDTO } from './dto/share.dto'diff --git a/src/twoFactorAuth/twoFactorAuth.controller.ts b/src/twoFactorAuth/twoFactorAuth.controller.tsindex 3e96ec952..2c227f561 100644--- a/src/twoFactorAuth/twoFactorAuth.controller.ts+++ b/src/twoFactorAuth/twoFactorAuth.controller.ts@@ -17,11 +17,11 @@ import { UserType } from '../user/entities/user.entity'import { AppLoggerService } from '../logger/logger.service'import { MailerService } from '../mailer/mailer.service'import { LetterTemplate } from '../mailer/letter'-import { CurrentUserId } from '../common/decorators/current-user-id.decorator'+import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'import { SelfhostedGuard } from '../common/guards/selfhosted.guard'-import { Roles } from '../common/decorators/roles.decorator'-import { TwoFaNotRequired } from '../common/decorators/2fa-disabled.decorator'-import { RolesGuard } from '../common/guards/roles.guard'+import { Roles } from '../auth/decorators/roles.decorator'+import { TwoFaNotRequired } from '../auth/decorators/two-fa-not-required.decorator'+import { RolesGuard } from '../auth/guards/roles.guard'import { TwoFactorAuthDTO } from './dto/2fa-auth.dto'import { generateRecoveryCode, checkRateLimit } from '../common/utils'diff --git a/src/user/user.controller.ts b/src/user/user.controller.tsindex f00ba7e4a..a44830c6a 100644--- a/src/user/user.controller.ts+++ b/src/user/user.controller.ts@@ -38,14 +38,14 @@ import {PlanCode,Theme,} from './entities/user.entity'-import { Roles } from '../common/decorators/roles.decorator'+import { Roles } from '../auth/decorators/roles.decorator'import { Pagination } from '../common/pagination/pagination'import { GDPR_EXPORT_TIMEFRAME, clickhouse } from '../common/constants'-import { RolesGuard } from '../common/guards/roles.guard'+import { RolesGuard } from '../auth/guards/roles.guard'import { SelfhostedGuard } from '../common/guards/selfhosted.guard'import { UpdateUserProfileDTO } from './dto/update-user.dto'import { AdminUpdateUserProfileDTO } from './dto/admin-update-user.dto'-import { CurrentUserId } from '../common/decorators/current-user-id.decorator'+import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'import { ActionTokensService } from '../action-tokens/action-tokens.service'import { MailerService } from '../mailer/mailer.service'import { ActionTokenType } from '../action-tokens/action-token.entity'