exguard-backend 1.0.7 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exguard-backend",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "private": false,
   "publishConfig": {
     "access": "public"

package/scripts/setup-nestjs.cjs

@@ -125,12 +125,12 @@ import { Guard } from 'exguard-backend';
         apiUrl: process.env.EXGUARD_API_URL || 'http://localhost:3000',
         cache: {
           enabled: process.env.EXGUARD_CACHE_ENABLED !== 'false',
-          ttl: parseInt(process.env.EXGUARD_CACHE_TTL) || 300000, // 5 minutes
+          ttl: parseInt(process.env.EXGUARD_CACHE_TTL || '300000'), // 5 minutes
         },
         realtime: {
           enabled: process.env.EXGUARD_REALTIME_ENABLED === 'true',
-          url: process.env.EXGUARD_REALTIME_URL,
-          token: process.env.EXGUARD_SERVICE_TOKEN,
+          url: process.env.EXGUARD_REALTIME_URL || undefined,
+          token: process.env.EXGUARD_SERVICE_TOKEN || undefined,
         },
       }),
     },
@@ -160,7 +160,7 @@ import { Guard, GuardContext } from 'exguard-backend';
 
 @Injectable()
 export class ExGuardNestGuard implements CanActivate {
-  constructor(protected exGuard: Guard) {}
+  constructor(public exGuard: Guard) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
@@ -185,11 +185,11 @@ export class ExGuardNestGuard implements CanActivate {
     return true;
   }
 
-  protected async checkPermissions(context: GuardContext) {
+  public async checkPermissions(context: GuardContext) {
     return this.exGuard.authenticate(context);
   }
 
-  protected extractToken(request: any): string | null {
+  public extractToken(request: any): string | null {
     const authHeader = request.headers?.authorization;
     if (authHeader?.startsWith('Bearer ')) {
       return authHeader.substring(7);
@@ -200,14 +200,14 @@ export class ExGuardNestGuard implements CanActivate {
 
 @Injectable()
 export class ExGuardPermissionGuard extends ExGuardNestGuard {
-  protected async checkPermissions(context: GuardContext) {
+  public async checkPermissions(context: GuardContext) {
     return this.exGuard.requirePermissions(context, ['read']);
   }
 }
 
 @Injectable()
 export class ExGuardRoleGuard extends ExGuardNestGuard {
-  protected async checkPermissions(context: GuardContext) {
+  public async checkPermissions(context: GuardContext) {
     return this.exGuard.requireRoles(context, ['Admin']);
   }
 }
@@ -215,7 +215,7 @@ export class ExGuardRoleGuard extends ExGuardNestGuard {
 // Factory functions for dynamic guards
 export function createPermissionGuard(permissions: string[], requireAll = false) {
   return class extends ExGuardNestGuard {
-    protected async checkPermissions(context: GuardContext) {
+    public async checkPermissions(context: GuardContext) {
       return this.exGuard.requirePermissions(context, permissions, { requireAll });
     }
   };
@@ -223,7 +223,7 @@ export function createPermissionGuard(permissions: string[], requireAll = false)
 
 export function createRoleGuard(roles: string[], requireAll = false) {
   return class extends ExGuardNestGuard {
-    protected async checkPermissions(context: GuardContext) {
+    public async checkPermissions(context: GuardContext) {
       return this.exGuard.requireRoles(context, roles, { requireAll });
     }
   };
@@ -231,7 +231,7 @@ export function createRoleGuard(roles: string[], requireAll = false) {
 
 export function createModuleGuard(modules: string[], requireAll = false) {
   return class extends ExGuardNestGuard {
-    protected async checkPermissions(context: GuardContext) {
+    public async checkPermissions(context: GuardContext) {
       return this.exGuard.requireModules(context, modules, { requireAll });
     }
   };
@@ -421,26 +421,50 @@ function updateAppModule() {
     return;
   }
 
-  // Add import at the top
-  if (!appModuleContent.includes('import { ExGuardModule }')) {
+  // Add import at the top - find the last import statement
+  const importRegex = /import\s+.*\s+from\s+['"][^'"]*['"];?\s*/g;
+  const imports = appModuleContent.match(importRegex);
+  
+  if (imports && imports.length > 0) {
+    // Add after the last import
+    const lastImport = imports[imports.length - 1];
+    const lastImportIndex = appModuleContent.lastIndexOf(lastImport);
+    const afterLastImport = appModuleContent.substring(lastImportIndex + lastImport.length);
+    
+    appModuleContent = appModuleContent.substring(0, lastImportIndex + lastImport.length) + 
+                     `import { ExGuardModule } from './exguard/exguard.module';\n` + 
+                     afterLastImport;
+  } else {
+    // Add at the very top
     appModuleContent = `import { ExGuardModule } from './exguard/exguard.module';\n${appModuleContent}`;
   }
 
-  // Add to imports array - more robust regex
-  const moduleMatch = appModuleContent.match(/@Module\s*\(\s*\{([^}]*)\}/s);
-  if (moduleMatch) {
-    const moduleContent = moduleMatch[1];
+  // Find and update the @Module decorator
+  const moduleDecoratorMatch = appModuleContent.match(/@Module\s*\(\s*\{([^}]*)\}/s);
+  if (moduleDecoratorMatch) {
+    const moduleContent = moduleDecoratorMatch[1];
     
     // Check if imports array exists
-    const importsMatch = moduleContent.match(/imports:\s*\[([^\]]*)\]/);
-    if (importsMatch) {
-      const importsContent = importsMatch[1];
+    const importsArrayMatch = moduleContent.match(/imports:\s*\[([^\]]*)\]/s);
+    if (importsArrayMatch) {
+      // Add to existing imports array
+      const importsContent = importsArrayMatch[1];
       const newImportsContent = importsContent.trim() + ',\n    ExGuardModule';
-      appModuleContent = appModuleContent.replace(importsMatch[0], `imports: [${newImportsContent}]`);
+      appModuleContent = appModuleContent.replace(
+        importsArrayMatch[0], 
+        `imports: [${newImportsContent}]`
+      );
     } else {
-      // Add imports array
-      const newModuleContent = moduleContent.replace(/@Module\s*\(\s*\{/, `@Module({\n  imports: [ExGuardModule],`);
-      appModuleContent = appModuleContent.replace(moduleMatch[0], newModuleContent);
+      // Add imports array after @Module({
+      const moduleStartMatch = appModuleContent.match(/@Module\s*\(\s*\{/);
+      if (moduleStartMatch) {
+        const moduleStartIndex = appModuleContent.indexOf(moduleStartMatch[0]);
+        const afterModuleStart = appModuleContent.substring(moduleStartIndex + moduleStartMatch[0].length);
+        
+        appModuleContent = appModuleContent.substring(0, moduleStartIndex + moduleStartMatch[0].length) + 
+                         `\n  imports: [ExGuardModule],` + 
+                         afterModuleStart;
+      }
     }
   }