@develit-services/rbac 0.4.0 → 0.5.0

package/dist/export/worker.cjs

@@ -480,8 +480,15 @@ let RbacServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
       { successMessage: "Scope successfully granted to user." },
       async ({ userId, scope, resourceId }) => {
         this.validateScope(scope);
-        const userScope = await getScopesByUserQuery({ db: this.db, userId });
-        if (userScope.some((s) => s.scope === scope)) {
+        const userScopes = await getScopesByUserQuery({ db: this.db, userId });
+        const matchingScopes = userScopes.filter((s) => s.scope === scope);
+        if (!resourceId && matchingScopes.find((s) => !s.resourceId)) {
+          throw backendSdk.createInternalError(null, {
+            message: "Scope already assigned to user.",
+            status: 409
+          });
+        }
+        if (resourceId && matchingScopes.some((s) => s.resourceId === resourceId)) {
           throw backendSdk.createInternalError(null, {
             message: "Scope already assigned to user.",
             status: 409
@@ -506,7 +513,16 @@ let RbacServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.
         for (const scope of scopes) {
           this.validateScope(scope.scope);
           const userScopes = await getScopesByUserQuery({ db: this.db, userId });
-          if (userScopes.some((s) => s.scope === scope.scope)) {
+          const matchingScopes = userScopes.filter(
+            (s) => s.scope === scope.scope
+          );
+          if (!scope.resourceId && matchingScopes.find((s) => !s.resourceId)) {
+            throw backendSdk.createInternalError(null, {
+              message: "Scope already assigned to user.",
+              status: 409
+            });
+          }
+          if (scope.resourceId && matchingScopes.some((s) => s.resourceId === scope.resourceId)) {
             throw backendSdk.createInternalError(null, {
               message: "Scope already assigned to user.",
               status: 409

package/dist/export/worker.mjs

@@ -476,8 +476,15 @@ let RbacServiceBase = class extends develitWorker(WorkerEntrypoint) {
       { successMessage: "Scope successfully granted to user." },
       async ({ userId, scope, resourceId }) => {
         this.validateScope(scope);
-        const userScope = await getScopesByUserQuery({ db: this.db, userId });
-        if (userScope.some((s) => s.scope === scope)) {
+        const userScopes = await getScopesByUserQuery({ db: this.db, userId });
+        const matchingScopes = userScopes.filter((s) => s.scope === scope);
+        if (!resourceId && matchingScopes.find((s) => !s.resourceId)) {
+          throw createInternalError(null, {
+            message: "Scope already assigned to user.",
+            status: 409
+          });
+        }
+        if (resourceId && matchingScopes.some((s) => s.resourceId === resourceId)) {
           throw createInternalError(null, {
             message: "Scope already assigned to user.",
             status: 409
@@ -502,7 +509,16 @@ let RbacServiceBase = class extends develitWorker(WorkerEntrypoint) {
         for (const scope of scopes) {
           this.validateScope(scope.scope);
           const userScopes = await getScopesByUserQuery({ db: this.db, userId });
-          if (userScopes.some((s) => s.scope === scope.scope)) {
+          const matchingScopes = userScopes.filter(
+            (s) => s.scope === scope.scope
+          );
+          if (!scope.resourceId && matchingScopes.find((s) => !s.resourceId)) {
+            throw createInternalError(null, {
+              message: "Scope already assigned to user.",
+              status: 409
+            });
+          }
+          if (scope.resourceId && matchingScopes.some((s) => s.resourceId === scope.resourceId)) {
             throw createInternalError(null, {
               message: "Scope already assigned to user.",
               status: 409

package/dist/export/wrangler.cjs

@@ -10,10 +10,15 @@ function defineRbacServiceWrangler(config) {
       name
     }),
     vars: {
-      // Variables
       ...envs.local.vars,
       ENVIRONMENT: "localhost"
     },
+    services: [
+      {
+        binding: "SECRETS_STORE",
+        service: `${project}-secrets-store`
+      }
+    ],
     d1_databases: [
       {
         binding: "RBAC_D1",

package/dist/export/wrangler.d.cts

@@ -5,6 +5,10 @@ declare function defineRbacServiceWrangler(config: RbacServiceWranglerConfig): {
         ENVIRONMENT: string;
         SERVICE_CONFIG_INCLUDE_CONFIRMATION: boolean;
     };
+    services: {
+        binding: string;
+        service: string;
+    }[];
     d1_databases: {
         binding: string;
         database_name: string;

package/dist/export/wrangler.d.mts

@@ -5,6 +5,10 @@ declare function defineRbacServiceWrangler(config: RbacServiceWranglerConfig): {
         ENVIRONMENT: string;
         SERVICE_CONFIG_INCLUDE_CONFIRMATION: boolean;
     };
+    services: {
+        binding: string;
+        service: string;
+    }[];
     d1_databases: {
         binding: string;
         database_name: string;

package/dist/export/wrangler.d.ts

@@ -5,6 +5,10 @@ declare function defineRbacServiceWrangler(config: RbacServiceWranglerConfig): {
         ENVIRONMENT: string;
         SERVICE_CONFIG_INCLUDE_CONFIRMATION: boolean;
     };
+    services: {
+        binding: string;
+        service: string;
+    }[];
     d1_databases: {
         binding: string;
         database_name: string;

package/dist/export/wrangler.mjs

@@ -8,10 +8,15 @@ function defineRbacServiceWrangler(config) {
       name
     }),
     vars: {
-      // Variables
       ...envs.local.vars,
       ENVIRONMENT: "localhost"
     },
+    services: [
+      {
+        binding: "SECRETS_STORE",
+        service: `${project}-secrets-store`
+      }
+    ],
     d1_databases: [
       {
         binding: "RBAC_D1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@develit-services/rbac",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "author": "Develit.io s.r.o.",
   "type": "module",
   "exports": {
@@ -30,13 +30,13 @@
     "./dist"
   ],
   "scripts": {
-    "dev": "wrangler dev --port 9237 --persist-to ../../.wrangler/state",
+    "dev": "wrangler dev --port 9237 --persist-to ../../.wrangler/state -c ./wrangler.jsonc -c ../../apps/secrets-store/wrangler.jsonc",
     "wrangler:generate": "bunx develit wrangler:generate --types",
     "db:init": "wrangler d1 execute develit-rbac --local --persist-to ../../.wrangler/state --command=\"SELECT 'Creating database...' AS status;\"",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "drizzle-kit migrate",
     "db:explore": "drizzle-kit studio",
-    "types": "wrangler types --env-interface RbacEnv --include-runtime false",
+    "types": "bash typegen.sh",
     "lint": "biome check",
     "lint:fix": "biome check --fix",
     "test": "vitest",