@illustrisinteractive/sentinel-nest 0.0.5 → 0.0.7

package/src/sentinel/resources/tsconfig.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "resolvePackageJsonExports": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "target": "ES2023",
+    "sourceMap": true,
+    "outDir": ".sentinel/",
+    "baseUrl": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "strictNullChecks": true,
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "noFallthroughCasesInSwitch": false,
+    "allowJs": true
+  }
+}

package/src/sentinel/sentinel.config.json

@@ -0,0 +1,39 @@
+{
+  "name": "my-workspace",
+  "sourceRoot": "apps/my-workspace/src",
+  "sentinelConfigPath": "apps/my-workspace/src\\sentinel",
+  "resources": [
+    {
+      "name": "TestResource",
+      "actions": {
+        "manage": {
+          "description": "Allows all Actions in this Secured Resource."
+        }
+      }
+    },
+    {
+      "name": "NewResource",
+      "actions": {
+        "manage": {
+          "description": "Allows all Actions in this Secured Resource."
+        }
+      }
+    },
+    {
+      "name": "NewResource2",
+      "actions": {
+        "manage": {
+          "description": "Allows all Actions in this Secured Resource."
+        }
+      }
+    },
+    {
+      "name": "NewResource3",
+      "actions": {
+        "manage": {
+          "description": "Allows all Actions in this Secured Resource."
+        }
+      }
+    }
+  ]
+}

package/src/sentinel.guard.ts

@@ -1,26 +1,33 @@
 import {
   CanActivate,
   ExecutionContext,
-  Inject,
   Injectable,
+  Logger,
 } from '@nestjs/common';
 import { SentinelService } from './sentinel.service';
 import { type Metadata } from '@grpc/grpc-js';
 import { type Request } from 'express';
 import { SentinelModel } from './models/SentinelModel';
 import { Reflector } from '@nestjs/core';
-import { Can, SecuredResourceAction } from './main';
+import { Can } from '../src/can.decorator';
+import { SecuredResourceAction } from './main';
 @Injectable()
 export class SentinelGuard implements CanActivate {
-  @Inject() private reflector: Reflector;
-  constructor(private readonly sentinelService: SentinelService) {}
+  constructor(
+    private readonly sentinelService: SentinelService,
+    private reflector: Reflector,
+  ) {}
   canActivate(context: ExecutionContext): boolean {
     const requiredActions = this.reflector.get<SecuredResourceAction[]>(
       Can,
       context.getHandler(),
     );
-    console.log(requiredActions);
-    if (requiredActions.length == 0) return true;
+    if (!requiredActions || requiredActions.length == 0) {
+      Logger.warn(
+        'It seems like you used SentinelGuard without passing a SecuredResourceAction to look out for. Handler: ${context.getHandler().name}',
+      );
+      return true;
+    }
 
     let sentinelAuth = '';
     if (context.getType() == 'rpc') {

package/src/sentinel.module.ts

@@ -4,7 +4,6 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { PrismaService } from './prisma.service';
 import { ConfigurableModuleClass } from './sentinel.module-definition';
 import { JwtModule } from '@nestjs/jwt';
-import { SentinelGuard } from './sentinel.guard';
 
 @Module({
   imports: [
@@ -21,7 +20,7 @@ import { SentinelGuard } from './sentinel.guard';
     }),
   ],
   controllers: [],
-  providers: [PrismaService, SentinelService, SentinelGuard],
-  exports: [PrismaService, SentinelService, SentinelGuard],
+  providers: [PrismaService, SentinelService],
+  exports: [PrismaService, SentinelService],
 })
 export class SentinelModule extends ConfigurableModuleClass {}

package/src/sentinel.service.ts

@@ -52,9 +52,7 @@ export class SentinelService implements OnModuleInit {
     for (const resource of this.resources) {
       for (const action of Object.keys(resource.actions)) {
         if (
-          model.permissions.find(
-            (permissions) => permissions.action == resource.actions[action],
-          )
+          model.permissions.find((permissions) => permissions.action == action)
         ) {
           can(action, resource.name);
         } else cannot(action, resource.name);
@@ -97,9 +95,7 @@ export class SentinelService implements OnModuleInit {
     for (const resource of this.resources) {
       for (const action of Object.keys(resource.actions)) {
         if (
-          model.permissions.find(
-            (permissions) => permissions.action == resource.actions[action],
-          )
+          model.permissions.find((permissions) => permissions.action == action)
         ) {
           can(action, resource.name);
         } else cannot(action, resource.name);