@prosopo/provider 3.2.5 → 3.12.3

package/CHANGELOG.md

@@ -1,5 +1,583 @@
 # @prosopo/provider
 
+## 3.12.3
+### Patch Changes
+
+- 04d0f1a: weighted random provider selection
+- Updated dependencies [04d0f1a]
+- Updated dependencies [1e3a838]
+  - @prosopo/load-balancer@2.8.0
+  - @prosopo/config@3.1.20
+  - @prosopo/api@3.1.24
+  - @prosopo/api-express-router@3.0.25
+  - @prosopo/api-route@2.6.28
+  - @prosopo/common@3.1.20
+  - @prosopo/database@3.4.5
+  - @prosopo/datasets@3.0.34
+  - @prosopo/env@3.2.13
+  - @prosopo/keyring@2.8.27
+  - @prosopo/locale@3.1.20
+  - @prosopo/types@3.5.3
+  - @prosopo/types-database@3.3.5
+  - @prosopo/types-env@2.7.38
+  - @prosopo/user-access-policy@3.5.19
+  - @prosopo/util@3.1.5
+  - @prosopo/util-crypto@13.5.22
+
+## 3.12.2
+### Patch Changes
+
+- 5659b24: Release 3.4.4
+- Updated dependencies [f912439]
+- Updated dependencies [5659b24]
+  - @prosopo/common@3.1.19
+  - @prosopo/api-express-router@3.0.24
+  - @prosopo/user-access-policy@3.5.18
+  - @prosopo/types-database@3.3.4
+  - @prosopo/load-balancer@2.7.12
+  - @prosopo/util-crypto@13.5.21
+  - @prosopo/api-route@2.6.27
+  - @prosopo/types-env@2.7.37
+  - @prosopo/database@3.4.4
+  - @prosopo/datasets@3.0.33
+  - @prosopo/keyring@2.8.26
+  - @prosopo/locale@3.1.19
+  - @prosopo/types@3.5.2
+  - @prosopo/util@3.1.4
+  - @prosopo/api@3.1.23
+  - @prosopo/env@3.2.12
+  - @prosopo/config@3.1.19
+
+## 3.12.1
+### Patch Changes
+
+- 52cd544: Integrity checks
+- b8cc590: New injection methods
+- b117ba3: Hot fix country code
+- 50c4120: Release 3.4.3
+- Updated dependencies [52cd544]
+- Updated dependencies [c72ecbd]
+- Updated dependencies [b117ba3]
+- Updated dependencies [50c4120]
+  - @prosopo/types@3.5.1
+  - @prosopo/database@3.4.3
+  - @prosopo/api-express-router@3.0.23
+  - @prosopo/user-access-policy@3.5.17
+  - @prosopo/types-database@3.3.3
+  - @prosopo/load-balancer@2.7.11
+  - @prosopo/util-crypto@13.5.20
+  - @prosopo/api-route@2.6.26
+  - @prosopo/types-env@2.7.36
+  - @prosopo/datasets@3.0.32
+  - @prosopo/keyring@2.8.25
+  - @prosopo/common@3.1.18
+  - @prosopo/locale@3.1.18
+  - @prosopo/util@3.1.3
+  - @prosopo/api@3.1.22
+  - @prosopo/env@3.2.11
+  - @prosopo/config@3.1.18
+
+## 3.12.0
+### Minor Changes
+
+- e20ad6b: IP country overrides
+
+### Patch Changes
+
+- 618703f: Release 3.4.2
+- cf6c8a4: Hot fix the request logger
+- Updated dependencies [618703f]
+- Updated dependencies [e20ad6b]
+  - @prosopo/api-express-router@3.0.22
+  - @prosopo/user-access-policy@3.5.16
+  - @prosopo/types-database@3.3.2
+  - @prosopo/load-balancer@2.7.10
+  - @prosopo/util-crypto@13.5.19
+  - @prosopo/api-route@2.6.25
+  - @prosopo/types-env@2.7.35
+  - @prosopo/database@3.4.2
+  - @prosopo/datasets@3.0.31
+  - @prosopo/keyring@2.8.24
+  - @prosopo/common@3.1.17
+  - @prosopo/locale@3.1.17
+  - @prosopo/types@3.5.0
+  - @prosopo/util@3.1.2
+  - @prosopo/api@3.1.21
+  - @prosopo/env@3.2.10
+  - @prosopo/config@3.1.17
+
+## 3.11.1
+### Patch Changes
+
+- 7e5613a: Always store image rounds count
+- 11303d9: feat/pluggable-redis
+- b6794f8: Timestamp decay fn
+- 11303d9: Release 3.4.0
+- 18cb28b: Release 3.4.1
+- 11303d9: feat/pluggable-redis
+- Updated dependencies [11303d9]
+- Updated dependencies [b6794f8]
+- Updated dependencies [11303d9]
+- Updated dependencies [bac2d91]
+- Updated dependencies [18cb28b]
+- Updated dependencies [11303d9]
+  - @prosopo/user-access-policy@3.5.15
+  - @prosopo/database@3.4.1
+  - @prosopo/types-database@3.3.1
+  - @prosopo/api-express-router@3.0.21
+  - @prosopo/load-balancer@2.7.9
+  - @prosopo/util-crypto@13.5.18
+  - @prosopo/api-route@2.6.24
+  - @prosopo/types-env@2.7.34
+  - @prosopo/datasets@3.0.30
+  - @prosopo/keyring@2.8.23
+  - @prosopo/common@3.1.16
+  - @prosopo/locale@3.1.16
+  - @prosopo/types@3.4.1
+  - @prosopo/util@3.1.1
+  - @prosopo/api@3.1.20
+  - @prosopo/env@3.2.9
+  - @prosopo/config@3.1.16
+
+## 3.11.0
+### Minor Changes
+
+- 6768f14: Update salt
+
+### Patch Changes
+
+- f3f7aec: Release 3.4.0
+- Updated dependencies [f3f7aec]
+- Updated dependencies [6768f14]
+  - @prosopo/api-express-router@3.0.20
+  - @prosopo/user-access-policy@3.5.14
+  - @prosopo/types-database@3.3.0
+  - @prosopo/load-balancer@2.7.8
+  - @prosopo/util-crypto@13.5.17
+  - @prosopo/api-route@2.6.23
+  - @prosopo/types-env@2.7.33
+  - @prosopo/database@3.4.0
+  - @prosopo/datasets@3.0.29
+  - @prosopo/keyring@2.8.22
+  - @prosopo/common@3.1.15
+  - @prosopo/locale@3.1.15
+  - @prosopo/types@3.4.0
+  - @prosopo/util@3.1.0
+  - @prosopo/api@3.1.19
+  - @prosopo/env@3.2.8
+  - @prosopo/config@3.1.15
+
+## 3.10.0
+### Minor Changes
+
+- 97edf3f: Adding dom manip checks
+
+### Patch Changes
+
+- Release 3.3.1
+- 0824221: Release 3.2.4
+- Updated dependencies [97edf3f]
+- Updated dependencies
+- Updated dependencies [0824221]
+  - @prosopo/types@3.3.0
+  - @prosopo/api-express-router@3.0.19
+  - @prosopo/user-access-policy@3.5.13
+  - @prosopo/types-database@3.2.2
+  - @prosopo/load-balancer@2.7.7
+  - @prosopo/util-crypto@13.5.16
+  - @prosopo/api-route@2.6.22
+  - @prosopo/types-env@2.7.32
+  - @prosopo/database@3.3.2
+  - @prosopo/datasets@3.0.28
+  - @prosopo/keyring@2.8.21
+  - @prosopo/common@3.1.14
+  - @prosopo/locale@3.1.14
+  - @prosopo/util@3.0.17
+  - @prosopo/api@3.1.18
+  - @prosopo/env@3.2.7
+  - @prosopo/config@3.1.14
+
+## 3.9.1
+### Patch Changes
+
+- 5137f01: Update pow record at verify
+- bebb855: ip parsing
+- 509be28: Fix IP conditions logic
+- 509be28: Fix require all conditions logic
+- 008d112: Release 3.3.0
+- Updated dependencies [5137f01]
+- Updated dependencies [0555cd8]
+- Updated dependencies [509be28]
+- Updated dependencies [008d112]
+  - @prosopo/types-database@3.2.1
+  - @prosopo/database@3.3.1
+  - @prosopo/types@3.2.1
+  - @prosopo/api-express-router@3.0.18
+  - @prosopo/user-access-policy@3.5.12
+  - @prosopo/load-balancer@2.7.6
+  - @prosopo/util-crypto@13.5.15
+  - @prosopo/api-route@2.6.21
+  - @prosopo/types-env@2.7.31
+  - @prosopo/datasets@3.0.27
+  - @prosopo/keyring@2.8.20
+  - @prosopo/common@3.1.13
+  - @prosopo/locale@3.1.13
+  - @prosopo/util@3.0.16
+  - @prosopo/api@3.1.17
+  - @prosopo/env@3.2.6
+  - @prosopo/config@3.1.13
+
+## 3.9.0
+### Minor Changes
+
+- cf48565: Store additional details. Remove duplicate indexes.
+- 260de39: Fix indexes so that stuff properly expires
+
+### Patch Changes
+
+- 0824221: Release 3.2.4
+- Updated dependencies [cf48565]
+- Updated dependencies [d644c04]
+- Updated dependencies [0824221]
+- Updated dependencies [260de39]
+  - @prosopo/types-database@3.2.0
+  - @prosopo/database@3.3.0
+  - @prosopo/types@3.2.0
+  - @prosopo/api-express-router@3.0.17
+  - @prosopo/user-access-policy@3.5.11
+  - @prosopo/load-balancer@2.7.5
+  - @prosopo/util-crypto@13.5.14
+  - @prosopo/api-route@2.6.20
+  - @prosopo/types-env@2.7.30
+  - @prosopo/datasets@3.0.26
+  - @prosopo/keyring@2.8.19
+  - @prosopo/common@3.1.12
+  - @prosopo/locale@3.1.12
+  - @prosopo/util@3.0.15
+  - @prosopo/api@3.1.16
+  - @prosopo/env@3.2.5
+  - @prosopo/config@3.1.12
+
+## 3.8.4
+### Patch Changes
+
+- 0d1a33e: Adding ipcomparison service with user features
+- 0d1a33e: Adding ip comparison service
+- 1a23649: Release 3.2.3
+- Updated dependencies [0d1a33e]
+- Updated dependencies [0d1a33e]
+- Updated dependencies [1a23649]
+  - @prosopo/types-database@3.1.5
+  - @prosopo/locale@3.1.11
+  - @prosopo/types@3.1.4
+  - @prosopo/api-express-router@3.0.16
+  - @prosopo/user-access-policy@3.5.10
+  - @prosopo/load-balancer@2.7.4
+  - @prosopo/util-crypto@13.5.13
+  - @prosopo/api-route@2.6.19
+  - @prosopo/types-env@2.7.29
+  - @prosopo/database@3.2.4
+  - @prosopo/datasets@3.0.25
+  - @prosopo/keyring@2.8.18
+  - @prosopo/common@3.1.11
+  - @prosopo/util@3.0.14
+  - @prosopo/api@3.1.15
+  - @prosopo/env@3.2.4
+  - @prosopo/config@3.1.11
+
+## 3.8.3
+### Patch Changes
+
+- 36b23e0: Fix entropy. Fix api call. Persist ja4 through logs.
+- 657a827: Release 3.2.2
+- 4aac849: Do not error when IPs don't match
+- Updated dependencies [36b23e0]
+- Updated dependencies [a8a9251]
+- Updated dependencies [657a827]
+  - @prosopo/api@3.1.14
+  - @prosopo/types-database@3.1.4
+  - @prosopo/api-express-router@3.0.15
+  - @prosopo/user-access-policy@3.5.9
+  - @prosopo/load-balancer@2.7.3
+  - @prosopo/util-crypto@13.5.12
+  - @prosopo/api-route@2.6.18
+  - @prosopo/types-env@2.7.28
+  - @prosopo/database@3.2.3
+  - @prosopo/datasets@3.0.24
+  - @prosopo/keyring@2.8.17
+  - @prosopo/common@3.1.10
+  - @prosopo/locale@3.1.10
+  - @prosopo/types@3.1.3
+  - @prosopo/util@3.0.13
+  - @prosopo/env@3.2.3
+  - @prosopo/config@3.1.10
+
+## 3.8.2
+### Patch Changes
+
+- 4440947: fix type-only tsc compilation
+- 7bdaca6: Release 3.2.1
+- 1249ce0: Be more lenient with random provider selection
+- Updated dependencies [4440947]
+- Updated dependencies [7bdaca6]
+- Updated dependencies [809b984]
+- Updated dependencies [1249ce0]
+- Updated dependencies [809b984]
+  - @prosopo/api-express-router@3.0.14
+  - @prosopo/user-access-policy@3.5.8
+  - @prosopo/types-database@3.1.3
+  - @prosopo/load-balancer@2.7.2
+  - @prosopo/util-crypto@13.5.11
+  - @prosopo/api-route@2.6.17
+  - @prosopo/types-env@2.7.27
+  - @prosopo/database@3.2.2
+  - @prosopo/datasets@3.0.23
+  - @prosopo/keyring@2.8.16
+  - @prosopo/common@3.1.9
+  - @prosopo/locale@3.1.9
+  - @prosopo/types@3.1.2
+  - @prosopo/util@3.0.12
+  - @prosopo/api@3.1.13
+  - @prosopo/env@3.2.2
+  - @prosopo/config@3.1.9
+
+## 3.8.1
+### Patch Changes
+
+- 1f980c4: Fix types mismatch in decryption
+- 6fe8570: Release 3.2.0
+- Updated dependencies [1f980c4]
+- Updated dependencies [6fe8570]
+  - @prosopo/load-balancer@2.7.1
+  - @prosopo/types@3.1.1
+  - @prosopo/api-express-router@3.0.13
+  - @prosopo/user-access-policy@3.5.7
+  - @prosopo/types-database@3.1.2
+  - @prosopo/util-crypto@13.5.10
+  - @prosopo/api-route@2.6.16
+  - @prosopo/types-env@2.7.26
+  - @prosopo/database@3.2.1
+  - @prosopo/datasets@3.0.22
+  - @prosopo/keyring@2.8.15
+  - @prosopo/common@3.1.8
+  - @prosopo/locale@3.1.8
+  - @prosopo/util@3.0.11
+  - @prosopo/api@3.1.12
+  - @prosopo/env@3.2.1
+  - @prosopo/config@3.1.8
+
+## 3.8.0
+### Minor Changes
+
+- 8bdc7f0: Using detector to select provider
+
+### Patch Changes
+
+- f304be9: Release 3.1.13
+- Updated dependencies [f304be9]
+- Updated dependencies [8bdc7f0]
+  - @prosopo/api-express-router@3.0.12
+  - @prosopo/user-access-policy@3.5.6
+  - @prosopo/types-database@3.1.1
+  - @prosopo/load-balancer@2.7.0
+  - @prosopo/util-crypto@13.5.9
+  - @prosopo/api-route@2.6.15
+  - @prosopo/types-env@2.7.25
+  - @prosopo/database@3.2.0
+  - @prosopo/datasets@3.0.21
+  - @prosopo/keyring@2.8.14
+  - @prosopo/common@3.1.7
+  - @prosopo/locale@3.1.7
+  - @prosopo/types@3.1.0
+  - @prosopo/util@3.0.10
+  - @prosopo/api@3.1.11
+  - @prosopo/env@3.2.0
+  - @prosopo/config@3.1.7
+
+## 3.7.0
+### Minor Changes
+
+- 9b92339: fix/ipv6-in-captcha-flow
+
+### Patch Changes
+
+- a07db04: Release 3.1.12
+- ebb0168: Allowing for simple pattern matching with domains
+- Updated dependencies [9b92339]
+- Updated dependencies [9eed772]
+- Updated dependencies [a07db04]
+- Updated dependencies [ebb0168]
+  - @prosopo/types-database@3.1.0
+  - @prosopo/database@3.1.0
+  - @prosopo/datasets@3.0.20
+  - @prosopo/config@3.1.6
+  - @prosopo/api-express-router@3.0.11
+  - @prosopo/user-access-policy@3.5.5
+  - @prosopo/types-env@2.7.24
+  - @prosopo/api@3.1.10
+  - @prosopo/env@3.1.11
+  - @prosopo/util@3.0.9
+  - @prosopo/api-route@2.6.14
+  - @prosopo/common@3.1.6
+  - @prosopo/keyring@2.8.13
+  - @prosopo/load-balancer@2.6.21
+  - @prosopo/locale@3.1.6
+  - @prosopo/types@3.0.10
+  - @prosopo/util-crypto@13.5.8
+
+## 3.6.2
+### Patch Changes
+
+- Updated dependencies [e64160c]
+- Updated dependencies [553025d]
+  - @prosopo/database@3.0.19
+  - @prosopo/user-access-policy@3.5.4
+  - @prosopo/env@3.1.10
+  - @prosopo/api@3.1.9
+  - @prosopo/types-database@3.0.19
+  - @prosopo/api-express-router@3.0.10
+  - @prosopo/datasets@3.0.19
+  - @prosopo/types-env@2.7.23
+
+## 3.6.1
+### Patch Changes
+
+- d8e855c: Adding checks for IP consistency throughout the verification process
+- 6960643: lint detect missing and unneccessary imports
+- Updated dependencies [d8e855c]
+- Updated dependencies [6960643]
+  - @prosopo/types-database@3.0.18
+  - @prosopo/locale@3.1.5
+  - @prosopo/api-express-router@3.0.9
+  - @prosopo/user-access-policy@3.5.3
+  - @prosopo/load-balancer@2.6.20
+  - @prosopo/util-crypto@13.5.7
+  - @prosopo/api-route@2.6.13
+  - @prosopo/types-env@2.7.22
+  - @prosopo/database@3.0.18
+  - @prosopo/datasets@3.0.18
+  - @prosopo/keyring@2.8.12
+  - @prosopo/common@3.1.5
+  - @prosopo/types@3.0.9
+  - @prosopo/util@3.0.8
+  - @prosopo/api@3.1.8
+  - @prosopo/env@3.1.9
+
+## 3.6.0
+### Minor Changes
+
+- dc5ce11: Use out of the box JA4 impl
+
+### Patch Changes
+
+- 6b98f67: Fix recency checker
+- Updated dependencies [30e7d4d]
+  - @prosopo/datasets@3.0.17
+  - @prosopo/config@3.1.5
+  - @prosopo/api-express-router@3.0.8
+  - @prosopo/api-route@2.6.12
+  - @prosopo/common@3.1.4
+  - @prosopo/database@3.0.17
+  - @prosopo/env@3.1.8
+  - @prosopo/keyring@2.8.11
+  - @prosopo/load-balancer@2.6.19
+  - @prosopo/types@3.0.8
+  - @prosopo/types-database@3.0.17
+  - @prosopo/types-env@2.7.21
+  - @prosopo/user-access-policy@3.5.2
+  - @prosopo/util@3.0.7
+  - @prosopo/util-crypto@13.5.6
+
+## 3.5.0
+### Minor Changes
+
+- 3834a10: Proper session validation
+
+### Patch Changes
+
+- 0c865a7: Add missing var
+- 1f3a02f: Release 3.1.8
+- Updated dependencies [1f3a02f]
+  - @prosopo/user-access-policy@3.5.1
+  - @prosopo/types-database@3.0.16
+  - @prosopo/types-env@2.7.20
+  - @prosopo/database@3.0.16
+  - @prosopo/datasets@3.0.16
+  - @prosopo/env@3.1.7
+
+## 3.4.0
+### Minor Changes
+
+- e0628d9: Make sure rules don't leak between IPs
+
+### Patch Changes
+
+- 8cc6551: x
+- Updated dependencies [926df8a]
+- Updated dependencies [e0628d9]
+  - @prosopo/datasets@3.0.15
+  - @prosopo/user-access-policy@3.5.0
+  - @prosopo/database@3.0.15
+  - @prosopo/types-database@3.0.15
+  - @prosopo/env@3.1.6
+  - @prosopo/types-env@2.7.19
+
+## 3.3.1
+### Patch Changes
+
+- a49b538: Extra tests
+- e090e2f: More tests
+- Updated dependencies [44ffda2]
+- Updated dependencies [a49b538]
+- Updated dependencies [e090e2f]
+  - @prosopo/config@3.1.4
+  - @prosopo/user-access-policy@3.4.1
+  - @prosopo/common@3.1.3
+  - @prosopo/api-express-router@3.0.7
+  - @prosopo/api-route@2.6.11
+  - @prosopo/database@3.0.14
+  - @prosopo/datasets@3.0.14
+  - @prosopo/env@3.1.5
+  - @prosopo/keyring@2.8.10
+  - @prosopo/types@3.0.7
+  - @prosopo/types-database@3.0.14
+  - @prosopo/types-env@2.7.18
+  - @prosopo/util@3.0.6
+  - @prosopo/util-crypto@13.5.5
+
+## 3.3.0
+### Minor Changes
+
+- df4e030: Revising UAP rule getters
+
+### Patch Changes
+
+- 91bbe87: configure typecheck before bundle for vue packages
+- 91bbe87: make typecheck script always recompile
+- 346e092: NODE_ENV default to "development"
+- 5d36e05: remove tsc --force
+- Updated dependencies [828066d]
+- Updated dependencies [df4e030]
+- Updated dependencies [91bbe87]
+- Updated dependencies [3ef4fd2]
+- Updated dependencies [91bbe87]
+- Updated dependencies [346e092]
+- Updated dependencies [5d36e05]
+  - @prosopo/types-database@3.0.13
+  - @prosopo/api-route@2.6.10
+  - @prosopo/types-env@2.7.17
+  - @prosopo/database@3.0.13
+  - @prosopo/common@3.1.2
+  - @prosopo/types@3.0.6
+  - @prosopo/env@3.1.4
+  - @prosopo/config@3.1.3
+  - @prosopo/user-access-policy@3.4.0
+  - @prosopo/api-express-router@3.0.6
+  - @prosopo/util-crypto@13.5.4
+  - @prosopo/datasets@3.0.13
+  - @prosopo/keyring@2.8.9
+  - @prosopo/util@3.0.5
+
 ## 3.2.5
 ### Patch Changes
 

package/dist/api/admin/apiRemoveDetectorKeyEndpoint.js

@@ -1,6 +1,6 @@
 import { ApiEndpointResponseStatus } from "@prosopo/api-route";
 import { getLogger } from "@prosopo/common";
-import { UpdateDetectorKeyBody } from "@prosopo/types";
+import { RemoveDetectorKeyBodySpec } from "@prosopo/types";
 class ApiRemoveDetectorKeyEndpoint {
   constructor(clientTaskManager) {
     this.clientTaskManager = clientTaskManager;
@@ -8,10 +8,13 @@ class ApiRemoveDetectorKeyEndpoint {
   async processRequest(args, logger) {
     logger = logger || getLogger("info", import.meta.url);
     try {
-      const { detectorKey } = args;
+      const { detectorKey, expirationInSeconds } = args;
       logger = logger || getLogger("info", import.meta.url);
       logger.info(() => ({ msg: "Removing detector key" }));
-      await this.clientTaskManager.removeDetectorKey(detectorKey);
+      await this.clientTaskManager.removeDetectorKey(
+        detectorKey,
+        expirationInSeconds
+      );
       return {
         status: ApiEndpointResponseStatus.SUCCESS
       };
@@ -24,7 +27,7 @@ class ApiRemoveDetectorKeyEndpoint {
     }
   }
   getRequestArgsSchema() {
-    return UpdateDetectorKeyBody;
+    return RemoveDetectorKeyBodySpec;
   }
 }
 export {

package/dist/api/blacklistRequestInspector.js

@@ -1,5 +1,5 @@
 import { ApiPrefix } from "@prosopo/types";
-import { ScopeMatch, userScopeInputSchema, AccessPolicyType } from "@prosopo/user-access-policy";
+import { userScopeInputSchema, ScopeMatch, AccessPolicyType } from "@prosopo/user-access-policy";
 import { uniqueSubsets } from "@prosopo/util";
 const getRequestUserScope = (requestHeaders, ja4, ip, user) => {
   const userAgent = requestHeaders["user-agent"] ? requestHeaders["user-agent"].toString() : void 0;
@@ -8,13 +8,12 @@ const getRequestUserScope = (requestHeaders, ja4, ip, user) => {
     ...ja4 && { ja4Hash: ja4 },
     ...userAgent && { userAgent },
     ...ip && { ip }
+    // TODO more things with headers
   };
 };
-const getPrioritisedAccessRule = async (userAccessRulesStorage, userScope, clientId) => {
-  const userScopeKeys = Object.keys(userScope).filter(
-    (key) => userScope[key] !== void 0
-  );
-  const prioritisedUserScopes = uniqueSubsets(userScopeKeys).map(
+const getPrioritisedUserScopes = (userScope) => {
+  const userScopeKeys = Object.keys(userScope);
+  return uniqueSubsets(userScopeKeys).map(
     (subset) => subset.reduce(
       (acc, key) => {
         acc[key] = userScope[key];
@@ -22,22 +21,29 @@ const getPrioritisedAccessRule = async (userAccessRulesStorage, userScope, clien
       },
       {}
     )
-  ).filter((us) => Object.keys(us).length > 0).filter((us) => Object.values(us).some((value) => value !== void 0));
+  );
+};
+const getPrioritisedAccessRule = async (userAccessRulesStorage, userScope, clientId) => {
+  const prioritisedUserScopes = getPrioritisedUserScopes(userScope);
   const policyPromises = [];
-  for (const clientOrUndefined of [clientId, void 0]) {
+  const clientLoop = clientId ? [clientId, void 0] : [void 0];
+  for (const clientOrUndefined of clientLoop) {
     for (const scope of prioritisedUserScopes) {
-      policyPromises.push(
-        userAccessRulesStorage.findRules({
-          ...clientOrUndefined && {
-            policyScope: {
-              clientId: clientOrUndefined
-            }
-          },
-          policyScopeMatch: ScopeMatch.Exact,
-          userScope: userScopeInputSchema.parse(scope),
-          userScopeMatch: ScopeMatch.Exact
-        })
-      );
+      if (Object.values(scope).every((value) => value === void 0)) {
+        continue;
+      }
+      const parsedUserScope = userScopeInputSchema.parse(scope);
+      const filter = {
+        ...clientOrUndefined && {
+          policyScope: {
+            clientId: clientOrUndefined
+          }
+        },
+        policyScopeMatch: ScopeMatch.Exact,
+        userScope: parsedUserScope,
+        userScopeMatch: ScopeMatch.Exact
+      };
+      policyPromises.push(userAccessRulesStorage.findRules(filter, true, true));
     }
   }
   return (await Promise.all(policyPromises)).flat();