@hed-hog/core 0.0.139 → 0.0.141

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":"AAEA,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;gBAJP,GAAG,EAAE,UAAU,EAEf,QAAQ,EAAE,eAAe,EAEzB,OAAO,EAAE,cAAc;IAGpC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAgBpC,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;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"}

package/dist/token/token.service.js

@@ -14,21 +14,34 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenService = void 0;
 const api_locale_1 = require("@hed-hog/api-locale");
+const api_prisma_1 = require("@hed-hog/api-prisma");
 const common_1 = require("@nestjs/common");
 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) {
+    constructor(jwt, security, setting, prisma) {
         this.jwt = jwt;
         this.security = security;
         this.setting = setting;
+        this.prisma = prisma;
     }
     async verify(locale, token) {
         try {
-            return this.jwt.verifyAsync(token, {
+            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.'));
+                }
+            }
+            return payload;
         }
         catch (error) {
             console.log('JWT ERROR', error);
@@ -126,8 +139,10 @@ exports.TokenService = TokenService = __decorate([
     __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,
         security_service_1.SecurityService,
-        setting_service_1.SettingService])
+        setting_service_1.SettingService,
+        api_prisma_1.PrismaService])
 ], 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

@@ -36,6 +36,14 @@
           slug: admin
       - where:
           slug: admin-access
+- url: /sessions/revoke-all-other
+  method: DELETE
+  relations:
+    role:
+      - where:
+          slug: admin
+      - where:
+          slug: admin-access
 - url: /sessions/:sessionId/revoke
   method: DELETE
   relations:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/core",
-  "version": "0.0.139",
+  "version": "0.0.141",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -30,10 +30,10 @@
     "speakeasy": "^2.0.0",
     "uuid": "^11.1.0",
     "@hed-hog/api-locale": "0.0.11",
-    "@hed-hog/api-mail": "0.0.7",
     "@hed-hog/api-prisma": "0.0.4",
-    "@hed-hog/types": "0.0.1",
+    "@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"
   },
   "exports": {

package/src/auth/auth.service.ts

@@ -2,11 +2,11 @@ import { getLocaleText } from '@hed-hog/api-locale';
 import { PrismaService } from '@hed-hog/api-prisma';
 import { User } from '@hed-hog/types';
 import {
-  BadRequestException,
-  forwardRef,
-  Inject,
-  Injectable,
-  NotFoundException,
+    BadRequestException,
+    forwardRef,
+    Inject,
+    Injectable,
+    NotFoundException,
 } from '@nestjs/common';
 import { ChallengeService } from '../challenge/challenge.service';
 import { MailService as MailManagerService } from '../mail/mail.service';
@@ -42,9 +42,9 @@ export class AuthService {
 
   async getAuthenticationPayload(locale: string, userId: number, ipAddress: string,
     userAgent: string) {
-    const payload = { sub: userId };
-    const accessToken = await this.token.createAccessToken(payload);
     const { token: refreshToken, session } = await this.session.create(locale, userId, ipAddress, userAgent);
+    const payload = { sub: userId, sessionId: session.id };
+    const accessToken = await this.token.createAccessToken(payload);
 
     return {
       accessToken,
@@ -453,7 +453,7 @@ export class AuthService {
     );
 
     const user = await this.user.findUserById(locale, session.user_id);
-    const payload = { sub: user.id };
+    const payload = { sub: user.id, sessionId: session.id };
     const accessToken = await this.token.createAccessToken(payload);
 
     return { accessToken, refreshToken: token, session };

package/src/menu/dto/update.dto.ts

@@ -17,4 +17,7 @@ export class UpdateDTO {
   @IsString({ message: (args) => getLocaleText('validation.iconMustBeString', args.value) })
   @IsOptional()
   icon?: string;
+
+  @IsOptional()
+  locale?: Record<string, string>;
 }

package/src/menu/menu.controller.ts

@@ -47,15 +47,6 @@ export class MenuController {
     return this.menuService.listRoles(locale, menuId, paginationParams);
   }
 
-  @Get(':menuId/screen')
-  async listScreens(
-    @Param('menuId', ParseIntPipe) menuId: number,
-    @Pagination() paginationParams,
-    @Locale() locale,
-  ) {
-    return this.menuService.listScreens(locale, menuId, paginationParams);
-  }
-
   @Patch(':menuId/role')
   async updateRoles(
     @Param('menuId', ParseIntPipe) menuId: number,
@@ -65,30 +56,26 @@ export class MenuController {
     return this.menuService.updateRoles(locale, menuId, data);
   }
 
-  @Patch(':menuId/screen')
-  async updateScreens(
-    @Param('menuId', ParseIntPipe) menuId: number,
-    @Body() data: UpdateIdsDTO,
-    @Locale() locale,
-  ) {
-    return this.menuService.updateScreens(locale, menuId, data);
-  }
-
   @Get(':menuId')
   async show(@Locale() locale,@Param('menuId', ParseIntPipe) menuId: number) {
     return this.menuService.get(locale, menuId);
   }
 
   @Post()
-  async create(@Body() data: CreateDTO) {
-    return this.menuService.create(data);
+  async create(@Locale() locale, @Body() data: CreateDTO) {
+    return this.menuService.create(locale,data);
+  }
+
+  @Patch('order')
+  async updateOrder(@Locale() locale, @Body() data: OrderDTO): Promise<void> {
+    return this.menuService.updateOrder(locale, data);
   }
 
   @Patch(':menuId')
   async update(
+    @Locale() locale,
     @Param('menuId', ParseIntPipe) menuId: number,
     @Body() data: UpdateDTO,
-    @Locale() locale,
   ) {
     return this.menuService.update(locale,{
       id: menuId,
@@ -97,12 +84,7 @@ export class MenuController {
   }
 
   @Delete()
-  async delete(@Body() data: DeleteDTO) {
-    return this.menuService.delete(data);
-  }
-
-  @Patch('order')
-  async updateOrder(@Body() data: OrderDTO): Promise<void> {
-    return this.menuService.updateOrder(data);
+  async delete(@Locale() locale, @Body() data: DeleteDTO) {
+    return this.menuService.delete(locale, data);
   }
 }

package/src/menu/menu.service.ts

@@ -6,6 +6,7 @@ import {
   BadRequestException,
   Inject,
   Injectable,
+  NotFoundException,
   forwardRef,
 } from '@nestjs/common';
 import { DeleteDTO } from '../dto/delete.dto';
@@ -276,7 +277,7 @@ export class MenuService {
     });
 
     if (!user) {
-      throw new BadRequestException(
+      throw new NotFoundException(
         getLocaleText('menuNotFound', locale, 'Menu not found.'), 
       );
     }
@@ -284,7 +285,7 @@ export class MenuService {
     return user;
   }
 
-  async create({ slug, url, icon, order, menuId }: CreateDTO) {
+  async create(_locale:string, { slug, url, icon, order, menuId }: CreateDTO) {
     return this.prismaService.menu.create({
       data: { slug, url, icon, order, menu_id: menuId },
     });
@@ -304,13 +305,54 @@ export class MenuService {
       );
     }
 
-    return this.prismaService.menu.update({
+    const { locale: localeData, ...menuData } = data;
+
+    // Update menu data
+    const result = await this.prismaService.menu.update({
       where: { id },
-      data,
+      data: menuData,
     });
+
+    // Update locale translations if provided
+    if (localeData) {
+      for (const [localeCode, translation] of Object.entries(localeData)) {
+        const localeRecord = await this.prismaService.locale.findUnique({
+          where: { code: localeCode },
+        });
+
+        if (localeRecord) {
+          // Check if translation exists
+          const existingTranslation = await this.prismaService.menu_locale.findFirst({
+            where: {
+              menu_id: id,
+              locale_id: localeRecord.id,
+            },
+          });
+
+          if (existingTranslation) {
+            // Update existing translation
+            await this.prismaService.menu_locale.update({
+              where: { id: existingTranslation.id },
+              data: { name: translation },
+            });
+          } else {
+            // Create new translation
+            await this.prismaService.menu_locale.create({
+              data: {
+                menu_id: id,
+                locale_id: localeRecord.id,
+                name: translation,
+              },
+            });
+          }
+        }
+      }
+    }
+
+    return result;
   }
 
-  async delete({ ids }: DeleteDTO, locale: string = 'en'): Promise<{count:number}> {
+  async delete(locale: string, { ids }: DeleteDTO): Promise<{count:number}> {
     if (ids == undefined || ids == null) {
       throw new BadRequestException(
         getLocaleText('deleteItemsRequired', locale, 'You must select at least one menu to delete.'),
@@ -340,7 +382,7 @@ export class MenuService {
     });
   }
 
-  async updateOrder({ ids }: OrderDTO, locale: string = 'en'): Promise<void> {
+  async updateOrder(locale: string, { ids }: OrderDTO): Promise<void> {
     const count = await this.prismaService.menu.count({
       where: {
         id: {

package/src/role/guards/role.guard.ts

@@ -111,7 +111,13 @@ export class RoleGuard implements CanActivate {
       },
     });
 
-    return route === 1;
+    if (route !== 1) {
+      throw new UnauthorizedException(
+        `Access denied. User does not have permission to access ${httpMethod} ${fullPath}`
+      );
+    }
+
+    return true;
   }
 
   private extractTokenFromHeader(request: Request): string | undefined {

package/src/role/role.controller.ts

@@ -116,12 +116,13 @@ export class RoleController {
   async update(
     @Param('roleId', ParseIntPipe) roleId: number,
     @Body() data: UpdateDTO,
+    @Locale() locale,
   ) {
-    return this.roleService.update(roleId, data);
+    return this.roleService.update(roleId, data, locale);
   }
 
   @Delete()
-  async delete(@Body() data: DeleteDTO) {
-    return this.roleService.delete(data);
+  async delete(@Body() data: DeleteDTO, @Locale() locale) {
+    return this.roleService.delete(data, locale);
   }
 }

package/src/role/role.service.ts

@@ -5,6 +5,7 @@ import {
   BadRequestException,
   Inject,
   Injectable,
+  NotFoundException,
   forwardRef,
 } from '@nestjs/common';
 import { DeleteDTO } from '../dto/delete.dto';
@@ -378,7 +379,7 @@ export class RoleService {
     });
 
     if (!role) {
-      return null;
+      throw new NotFoundException(`Role with ID ${roleId} not found`);
     }
 
     const localeData = role.role_locale.reduce((acc, item) => {
@@ -423,7 +424,16 @@ export class RoleService {
     return this.get(role.id);
   }
 
-  async update(id: number, body: UpdateDTO) {
+  async update(id: number, body: UpdateDTO, localeRequest:string) {
+
+    const roleExists = await this.prismaService.role.findUnique({
+      where: { id },
+    });
+
+    if (!roleExists) {
+      throw new NotFoundException(getLocaleText('itemNotFound', localeRequest, `Role with ID ${id} not found`).replace('{{item}}', 'Role'));
+    }
+
     const { locale } = body;
 
     if (locale) {
@@ -463,13 +473,27 @@ export class RoleService {
     return this.get(id);
   }
 
-  async delete({ ids }: DeleteDTO, locale: string = 'en'):Promise<{count:number}> {
+  async delete({ ids }: DeleteDTO, localeRequest: string = 'en'):Promise<{count:number}> {
     if (ids == undefined || ids == null) {
       throw new BadRequestException(
-        getLocaleText('deleteItemsRequired', locale, 'You must select at least one permission to delete.'),
+        getLocaleText('deleteItemsRequired', localeRequest, 'You must select at least one permission to delete.'),
       );
     }
 
+    const existingRoles = await this.prismaService.role.findMany({
+      where: {
+        id: {
+          in: ids,
+        },
+      },
+    });
+
+    if (existingRoles.length !== ids.length) {
+      const existingIds = existingRoles.map((role) => role.id);
+      const missingIds = ids.filter((id) => !existingIds.includes(id));
+      throw new NotFoundException(getLocaleText('itemsNotFound', localeRequest, `Roles with IDs ${missingIds.join(', ')} not found`).replace('{{items}}', 'Roles'));
+    }
+
     return this.prismaService.role.deleteMany({
       where: {
         id: {

package/src/route/route.controller.ts

@@ -1,3 +1,5 @@
+import { Role } from '@hed-hog/api';
+import { Locale } from '@hed-hog/api-locale';
 import { Pagination, PaginationDTO } from '@hed-hog/api-pagination';
 import {
   Body,
@@ -13,8 +15,6 @@ import {
 } from '@nestjs/common';
 import { DeleteDTO } from '../dto/delete.dto';
 import { UpdateIdsDTO } from '../dto/update-ids.dto';
-import { Locale } from '@hed-hog/api-locale';
-import { Role } from '@hed-hog/api';
 import { CreateDTO } from './dto/create.dto';
 import { UpdateDTO } from './dto/update.dto';
 import { RouteService } from './route.service';
@@ -33,26 +33,27 @@ export class RouteController {
   }
 
   @Get(':routeId')
-  async get(@Param('routeId', ParseIntPipe) routeId: number) {
-    return this.routeService.get(routeId);
+  async get(@Param('routeId', ParseIntPipe) routeId: number, @Locale() locale) {
+    return this.routeService.get(routeId, locale);
   }
 
   @Post()
-  async create(@Body() { url, method }: CreateDTO) {
-    return this.routeService.create({ url, method });
+  async create(@Body() { url, method }: CreateDTO, @Locale() locale) {
+    return this.routeService.create({ url, method }, locale);
   }
 
   @Patch(':routeId')
   async update(
     @Param('routeId', ParseIntPipe) routeId: number,
     @Body() data: UpdateDTO,
+    @Locale() locale
   ) {
-    return this.routeService.update({ id: routeId, data });
+    return this.routeService.update({ id: routeId, data }, locale);
   }
 
   @Delete()
-  async delete(@Body() data: DeleteDTO) {
-    return this.routeService.delete(data);
+  async delete(@Body() data: DeleteDTO, @Locale() locale) {
+    return this.routeService.delete(data, locale);
   }
 
   @Get(':routeId/role')
@@ -72,7 +73,7 @@ export class RouteController {
     return this.routeService.updateRoles(routeId, data);
   }
 
-  @Get(':routeId/screens')
+  @Get(':routeId/screen')
   async listScreens(
     @Param('routeId', ParseIntPipe) routeId: number,
     @Pagination() paginationParams: PaginationDTO,
@@ -81,7 +82,7 @@ export class RouteController {
     return this.routeService.listScreens(locale, routeId, paginationParams);
   }
 
-  @Patch(':routeId/screens')
+  @Patch(':routeId/screen')
   async updateScreens(
     @Param('routeId', ParseIntPipe) routeId: number,
     @Body() data: UpdateIdsDTO,

package/src/route/route.service.ts

@@ -1,6 +1,7 @@
+import { getLocaleText } from '@hed-hog/api-locale';
 import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
 import { PrismaService } from '@hed-hog/api-prisma';
-import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { BadRequestException, forwardRef, Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { DeleteDTO } from '../dto/delete.dto';
 import { UpdateIdsDTO } from '../dto/update-ids.dto';
 import { CreateDTO } from './dto/create.dto';
@@ -34,22 +35,64 @@ export class RouteService {
     );
   }
 
-  async get(routeId: number): Promise<any> {
-    return this.prismaService.route.findUnique({ where: { id: routeId } });
+  async get(routeId: number, locale: string): Promise<any> {
+    const route = await this.prismaService.route.findUnique({ where: { id: routeId } });
+
+    if (!route) {
+      throw new NotFoundException(getLocaleText('itemNotFound', locale, `Route with ID ${routeId} not found`).replace('{{item}}', 'Route'));
+    }
+
+    return route;
   }
 
-  async create({ url, method }: CreateDTO): Promise<any> {
+  async create({ url, method }: CreateDTO, locale: string): Promise<any> {
+
+    const existingRoute = await this.prismaService.route.findFirst({
+      where: {
+        url,
+        method,
+      },
+    });
+
+    if (existingRoute) {
+      throw new BadRequestException(getLocaleText('itemAlreadyExists', locale, `Route with URL ${url} and method ${method} already exists`).replace('{{item}}', 'Route'));
+    }
+
     return this.prismaService.route.create({ data: { url, method } });
   }
 
-  async update({ id, data }: { id: number; data: UpdateDTO }): Promise<any> {
+  async update({ id, data }: { id: number; data: UpdateDTO }, locale: string): Promise<any> {
+
+    const routeExists = await this.prismaService.route.findUnique({
+      where: { id },
+    });
+
+    if (!routeExists) {
+      throw new NotFoundException(getLocaleText('itemNotFound', locale, `Route with ID ${id} not found`).replace('{{item}}', 'Route'));
+    }
+
     return this.prismaService.route.update({
       where: { id },
       data,
     });
   }
 
-  async delete({ ids }: DeleteDTO):Promise<{count:number}> {
+  async delete({ ids }: DeleteDTO, locale: string):Promise<{count:number}> {
+
+    const existingRoutes = await this.prismaService.route.findMany({
+      where: {
+        id: {
+          in: ids,
+        },
+      },
+    });
+
+    if (existingRoutes.length !== ids.length) {
+      const existingIds = existingRoutes.map((route) => route.id);
+      const missingIds = ids.filter((id) => !existingIds.includes(id));
+      throw new NotFoundException(getLocaleText('itemsNotFound', locale, `Routes with IDs ${missingIds.join(', ')} not found`).replace('{{items}}', 'Routes'));
+    }
+
     return this.prismaService.route.deleteMany({
       where: {
         id: {

package/src/session/session.controller.ts

@@ -1,4 +1,5 @@
 import { Role, User } from '@hed-hog/api';
+import { Locale } from '@hed-hog/api-locale';
 import { Pagination, PaginationDTO } from '@hed-hog/api-pagination';
 import { Controller, Delete, Get, Param } from '@nestjs/common';
 import { SessionService } from './session.service';
@@ -9,24 +10,29 @@ export class SessionController {
         private readonly sessionService: SessionService
     ) {}
 
+    @Role()
     @Get('user')
     async getUserSessions(
         @Pagination() paginationParams: PaginationDTO,
         @User() { id },
+        @Locale() locale: string
     ) {
-        return this.sessionService.getUserSessions(paginationParams, id)
+        return this.sessionService.getUserSessions(paginationParams, id,locale)
     }
 
+    @Role()
     @Delete('revoke-all-other')
     async revokeAllOtherSessions(@User() { id }){
         return this.sessionService.revokeAllOtherSessions(id)
     }
 
+    @Role()
     @Delete('revoke-all')
     async revokeAllSessions(@User() { id }){
         return this.sessionService.revokeAllSessions(id)
     }
 
+    @Role()
     @Delete(':sessionId/revoke')
     async revokeSession(@User() { id: userId }, @Param('sessionId') sessionId: number){
         return this.sessionService.revokeUserSession(userId, sessionId)

package/src/session/session.service.ts

@@ -115,7 +115,17 @@ export class SessionService {
     });
   }
 
-  async getUserSessions(paginationParams: PaginationDTO, userId: number) {
+  async getUserSessions(paginationParams: PaginationDTO, userId: number, locale: string) {
+
+    const userExists = await this.prisma.user.findUnique({
+      where: { id: userId },
+      select: { id: true },
+    });
+
+    if (!userExists) {
+      throw new BadRequestException(getLocaleText('session.userNotFound', locale, 'User not found.'));
+    }
+
     try {
       const paginate = await this.paginationService.paginatePrismaModel(this.prisma.user_session, {
         ...paginationParams,

package/src/token/token.service.ts

@@ -1,4 +1,5 @@
 import { getLocaleText } from "@hed-hog/api-locale";
+import { PrismaService } from "@hed-hog/api-prisma";
 import { ForbiddenException, forwardRef, Inject, Injectable, UnauthorizedException } from "@nestjs/common";
 import { JwtService } from "@nestjs/jwt";
 import { SecurityService } from "../security/security.service";
@@ -14,13 +15,31 @@ export class TokenService {
     private readonly security: SecurityService,
     @Inject(forwardRef(() => SettingService))
     private readonly setting: SettingService,
+    @Inject(forwardRef(() => PrismaService))
+    private readonly prisma: PrismaService,
   ) { }
 
   async verify(locale: string, token: string) {
     try {
-      return this.jwt.verifyAsync(token, {
+      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 UnauthorizedException(
+            getLocaleText('sessionRevoked', locale, 'Session has been revoked.')
+          );
+        }
+      }
+
+      return payload;
     } catch (error) {
 
       console.log('JWT ERROR', error);