@prosopo/provider 2.9.8 → 3.0.5

package/CHANGELOG.md

@@ -1,5 +1,184 @@
 # @prosopo/provider
 
+## 3.0.5
+### Patch Changes
+
+- Updated dependencies [745cc89]
+  - @prosopo/config@3.1.0
+  - @prosopo/database@3.0.5
+  - @prosopo/datasets@3.0.5
+  - @prosopo/env@3.0.5
+  - @prosopo/types-database@3.0.5
+  - @prosopo/types-env@2.7.9
+  - @prosopo/util@3.0.2
+  - @prosopo/user-access-policy@3.1.4
+
+## 3.0.4
+### Patch Changes
+
+- Updated dependencies [5619b4b]
+  - @prosopo/config@3.0.1
+  - @prosopo/database@3.0.4
+  - @prosopo/datasets@3.0.4
+  - @prosopo/env@3.0.4
+  - @prosopo/types-database@3.0.4
+  - @prosopo/types-env@2.7.8
+  - @prosopo/util@3.0.1
+  - @prosopo/user-access-policy@3.1.3
+
+## 3.0.3
+### Patch Changes
+
+- Updated dependencies [f682f0c]
+  - @prosopo/types-database@3.0.3
+  - @prosopo/database@3.0.3
+  - @prosopo/types@3.0.2
+  - @prosopo/datasets@3.0.3
+  - @prosopo/env@3.0.3
+  - @prosopo/types-env@2.7.7
+  - @prosopo/common@3.0.2
+  - @prosopo/keyring@2.8.5
+  - @prosopo/user-access-policy@3.1.2
+  - @prosopo/api-express-router@3.0.2
+  - @prosopo/api-route@2.6.7
+
+## 3.0.2
+### Patch Changes
+
+  - @prosopo/common@3.0.1
+  - @prosopo/types@3.0.1
+  - @prosopo/api-express-router@3.0.1
+  - @prosopo/api-route@2.6.6
+  - @prosopo/database@3.0.2
+  - @prosopo/datasets@3.0.2
+  - @prosopo/env@3.0.2
+  - @prosopo/keyring@2.8.4
+  - @prosopo/types-database@3.0.2
+  - @prosopo/types-env@2.7.6
+  - @prosopo/user-access-policy@3.1.1
+
+## 3.0.1
+### Patch Changes
+
+- Updated dependencies [913f2a6]
+  - @prosopo/user-access-policy@3.1.0
+  - @prosopo/types-database@3.0.1
+  - @prosopo/database@3.0.1
+  - @prosopo/datasets@3.0.1
+  - @prosopo/env@3.0.1
+  - @prosopo/types-env@2.7.5
+
+## 3.0.0
+### Major Changes
+
+- 64b5bcd: Access Controls
+
+### Patch Changes
+
+- Updated dependencies [64b5bcd]
+  - @prosopo/api-express-router@3.0.0
+  - @prosopo/user-access-policy@3.0.0
+  - @prosopo/types-database@3.0.0
+  - @prosopo/database@3.0.0
+  - @prosopo/datasets@3.0.0
+  - @prosopo/common@3.0.0
+  - @prosopo/types@3.0.0
+  - @prosopo/util@3.0.0
+  - @prosopo/env@3.0.0
+  - @prosopo/config@3.0.0
+  - @prosopo/types-env@2.7.4
+  - @prosopo/api-route@2.6.5
+  - @prosopo/keyring@2.8.3
+
+## 2.14.0
+### Minor Changes
+
+- aee3efe: Add healthz endpoint
+
+### Patch Changes
+
+- Updated dependencies [aee3efe]
+  - @prosopo/types@2.10.0
+  - @prosopo/database@2.6.9
+  - @prosopo/datasets@2.7.3
+  - @prosopo/env@2.7.3
+  - @prosopo/keyring@2.8.2
+  - @prosopo/types-database@2.7.6
+  - @prosopo/types-env@2.7.3
+  - @prosopo/user-access-policy@2.6.8
+
+## 2.13.0
+### Minor Changes
+
+- d5f2e95: Fix ip checking logic
+
+## 2.12.1
+### Patch Changes
+
+- 86c22b8: structured logging
+- Updated dependencies [86c22b8]
+  - @prosopo/api-express-router@2.6.4
+  - @prosopo/user-access-policy@2.6.7
+  - @prosopo/types-database@2.7.5
+  - @prosopo/util-crypto@13.5.1
+  - @prosopo/api-route@2.6.4
+  - @prosopo/types-env@2.7.2
+  - @prosopo/database@2.6.8
+  - @prosopo/datasets@2.7.2
+  - @prosopo/keyring@2.8.1
+  - @prosopo/common@2.7.2
+  - @prosopo/types@2.9.1
+  - @prosopo/env@2.7.2
+  - @prosopo/config@2.6.1
+  - @prosopo/util@2.6.1
+
+## 2.12.0
+### Minor Changes
+
+- d6de900: ip pass through
+
+## 2.11.0
+### Minor Changes
+
+- 30bb383: Making sure verify works and derived accounts
+
+### Patch Changes
+
+- Updated dependencies [30bb383]
+  - @prosopo/util-crypto@13.5.0
+  - @prosopo/keyring@2.8.0
+  - @prosopo/types@2.9.0
+  - @prosopo/common@2.7.1
+  - @prosopo/datasets@2.7.1
+  - @prosopo/database@2.6.7
+  - @prosopo/env@2.7.1
+  - @prosopo/types-database@2.7.4
+  - @prosopo/types-env@2.7.1
+  - @prosopo/user-access-policy@2.6.6
+  - @prosopo/api-express-router@2.6.3
+  - @prosopo/api-route@2.6.3
+
+## 2.10.0
+### Minor Changes
+
+- 8f0644a: Taking required functions from polkadot/keyring and polkadot/util-crypto in-house and removing WASM dependencies. Adding @scure JS-based sr25519 function instead.
+
+### Patch Changes
+
+- Updated dependencies [8f0644a]
+  - @prosopo/util-crypto@13.4.0
+  - @prosopo/types-env@2.7.0
+  - @prosopo/datasets@2.7.0
+  - @prosopo/keyring@2.7.0
+  - @prosopo/common@2.7.0
+  - @prosopo/types@2.8.0
+  - @prosopo/env@2.7.0
+  - @prosopo/api-express-router@2.6.2
+  - @prosopo/api-route@2.6.2
+  - @prosopo/database@2.6.6
+  - @prosopo/types-database@2.7.3
+  - @prosopo/user-access-policy@2.6.5
+
 ## 2.9.8
 
 ### Patch Changes

package/dist/api/admin/apiRegisterSiteKeyEndpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiRegisterSiteKeyEndpoint.d.ts","sourceRoot":"","sources":["../../../src/api/admin/apiRegisterSiteKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAwB,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,KAAK,uBAAuB,GAAG,OAAO,mBAAmB,CAAC;AAE1D,cAAM,0BACL,YAAW,WAAW,CAAC,uBAAuB,CAAC;IAE5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAAjB,iBAAiB,EAAE,iBAAiB;IAElE,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,EACtC,MAAM,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC;IAkBxB,oBAAoB,IAAI,uBAAuB;CAGtD;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}
+{"version":3,"file":"apiRegisterSiteKeyEndpoint.d.ts","sourceRoot":"","sources":["../../../src/api/admin/apiRegisterSiteKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAwB,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,KAAK,uBAAuB,GAAG,OAAO,mBAAmB,CAAC;AAE1D,cAAM,0BACL,YAAW,WAAW,CAAC,uBAAuB,CAAC;IAE5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAAjB,iBAAiB,EAAE,iBAAiB;IAElE,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,EACtC,MAAM,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC;IAkBxB,oBAAoB,IAAI,uBAAuB;CAGtD;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/api/admin/apiRegisterSiteKeyEndpoint.js

@@ -1,5 +1,5 @@
 import { ApiEndpointResponseStatus, } from "@prosopo/api-route";
-import { getLoggerDefault } from "@prosopo/common";
+import { getLogger } from "@prosopo/common";
 import { ClientSettingsSchema, RegisterSitekeyBody } from "@prosopo/types";
 class ApiRegisterSiteKeyEndpoint {
     constructor(clientTaskManager) {
@@ -7,11 +7,11 @@ class ApiRegisterSiteKeyEndpoint {
     }
     async processRequest(args, logger) {
         const { siteKey, tier, settings } = args;
-        logger = logger || getLoggerDefault();
+        logger = logger || getLogger("info", import.meta.url);
         const temp = settings || ClientSettingsSchema.parse({});
-        logger.info(`Registering site key: ${siteKey}`);
+        logger.info(() => ({ data: { siteKey }, msg: "`Registering site key" }));
         await this.clientTaskManager.registerSiteKey(siteKey, tier, temp);
-        logger.info("Site key registered");
+        logger.info(() => ({ msg: "Site key registered" }));
         return {
             status: ApiEndpointResponseStatus.SUCCESS,
         };

package/dist/api/admin/apiRegisterSiteKeyEndpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiRegisterSiteKeyEndpoint.js","sourceRoot":"","sources":["../../../src/api/admin/apiRegisterSiteKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAe,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAM3E,MAAM,0BAA0B;IAG/B,YAAoC,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAE5E,KAAK,CAAC,cAAc,CACnB,IAAsC,EACtC,MAAe;QAEf,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,GAAG,MAAM,IAAI,gBAAgB,EAAE,CAAC;QAEtC,MAAM,IAAI,GAAG,QAAQ,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAExD,MAAM,CAAC,IAAI,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;QAEhD,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAElE,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAEnC,OAAO;YACN,MAAM,EAAE,yBAAyB,CAAC,OAAO;SACzC,CAAC;IACH,CAAC;IAEM,oBAAoB;QAC1B,OAAO,mBAAmB,CAAC;IAC5B,CAAC;CACD;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}
+{"version":3,"file":"apiRegisterSiteKeyEndpoint.js","sourceRoot":"","sources":["../../../src/api/admin/apiRegisterSiteKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAM3E,MAAM,0BAA0B;IAG/B,YAAoC,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAE5E,KAAK,CAAC,cAAc,CACnB,IAAsC,EACtC,MAAe;QAEf,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAG,QAAQ,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAExD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC;QAEzE,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAElE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC;QAEpD,OAAO;YACN,MAAM,EAAE,yBAAyB,CAAC,OAAO;SACzC,CAAC;IACH,CAAC;IAEM,oBAAoB;QAC1B,OAAO,mBAAmB,CAAC;IAC5B,CAAC;CACD;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/api/admin/apiRemoveDetectorKeyEndpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiRemoveDetectorKeyEndpoint.d.ts","sourceRoot":"","sources":["../../../src/api/admin/apiRemoveDetectorKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACN,KAAK,MAAM,EAGX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,KAAK,yBAAyB,GAAG,OAAO,qBAAqB,CAAC;AAE9D,cAAM,4BACL,YAAW,WAAW,CAAC,yBAAyB,CAAC;IAE9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAAjB,iBAAiB,EAAE,iBAAiB;IAElE,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,EACxC,MAAM,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC;IAuBxB,oBAAoB,IAAI,yBAAyB;CAGxD;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAC"}
+{"version":3,"file":"apiRemoveDetectorKeyEndpoint.d.ts","sourceRoot":"","sources":["../../../src/api/admin/apiRemoveDetectorKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,MAAM,EAAmC,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,KAAK,yBAAyB,GAAG,OAAO,qBAAqB,CAAC;AAE9D,cAAM,4BACL,YAAW,WAAW,CAAC,yBAAyB,CAAC;IAE9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAAjB,iBAAiB,EAAE,iBAAiB;IAElE,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,EACxC,MAAM,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC;IAuBxB,oBAAoB,IAAI,yBAAyB;CAGxD;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAC"}

package/dist/api/admin/apiRemoveDetectorKeyEndpoint.js

@@ -1,23 +1,23 @@
 import { ApiEndpointResponseStatus, } from "@prosopo/api-route";
-import { getLoggerDefault, } from "@prosopo/common";
+import { getLogger } from "@prosopo/common";
 import { UpdateDetectorKeyBody } from "@prosopo/types";
 class ApiRemoveDetectorKeyEndpoint {
     constructor(clientTaskManager) {
         this.clientTaskManager = clientTaskManager;
     }
     async processRequest(args, logger) {
-        logger = logger || getLoggerDefault();
+        logger = logger || getLogger("info", import.meta.url);
         try {
             const { detectorKey } = args;
-            logger = logger || getLoggerDefault();
-            logger.info({ message: "Removing detector key" });
+            logger = logger || getLogger("info", import.meta.url);
+            logger.info(() => ({ msg: "Removing detector key" }));
             await this.clientTaskManager.removeDetectorKey(detectorKey);
             return {
                 status: ApiEndpointResponseStatus.SUCCESS,
             };
         }
         catch (error) {
-            logger.error({ message: "Error updating detector key", error });
+            logger.error(() => ({ err: error, msg: "Error updating detector key" }));
             return {
                 status: ApiEndpointResponseStatus.FAIL,
                 error: error.message,

package/dist/api/admin/apiRemoveDetectorKeyEndpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiRemoveDetectorKeyEndpoint.js","sourceRoot":"","sources":["../../../src/api/admin/apiRemoveDetectorKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGN,gBAAgB,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAMvD,MAAM,4BAA4B;IAGjC,YAAoC,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAE5E,KAAK,CAAC,cAAc,CACnB,IAAwC,EACxC,MAAe;QAEf,MAAM,GAAG,MAAM,IAAI,gBAAgB,EAAE,CAAC;QACtC,IAAI,CAAC;YACJ,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;YAE7B,MAAM,GAAG,MAAM,IAAI,gBAAgB,EAAE,CAAC;YAEtC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;YAElD,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAE5D,OAAO;gBACN,MAAM,EAAE,yBAAyB,CAAC,OAAO;aACzC,CAAC;QACH,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,6BAA6B,EAAE,KAAK,EAAE,CAAC,CAAC;YAChE,OAAO;gBACN,MAAM,EAAE,yBAAyB,CAAC,IAAI;gBACtC,KAAK,EAAG,KAAyB,CAAC,OAAO;aACzC,CAAC;QACH,CAAC;IACF,CAAC;IAEM,oBAAoB;QAC1B,OAAO,qBAAqB,CAAC;IAC9B,CAAC;CACD;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAC"}
+{"version":3,"file":"apiRemoveDetectorKeyEndpoint.js","sourceRoot":"","sources":["../../../src/api/admin/apiRemoveDetectorKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAqC,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAMvD,MAAM,4BAA4B;IAGjC,YAAoC,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAE5E,KAAK,CAAC,cAAc,CACnB,IAAwC,EACxC,MAAe;QAEf,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC;YACJ,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;YAE7B,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEtD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC;YAEtD,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAE5D,OAAO;gBACN,MAAM,EAAE,yBAAyB,CAAC,OAAO;aACzC,CAAC;QACH,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,6BAA6B,EAAE,CAAC,CAAC,CAAC;YACzE,OAAO;gBACN,MAAM,EAAE,yBAAyB,CAAC,IAAI;gBACtC,KAAK,EAAG,KAAyB,CAAC,OAAO;aACzC,CAAC;QACH,CAAC;IACF,CAAC;IAEM,oBAAoB;QAC1B,OAAO,qBAAqB,CAAC;IAC9B,CAAC;CACD;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAC"}

package/dist/api/admin/apiUpdateDetectorKeyEndpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiUpdateDetectorKeyEndpoint.d.ts","sourceRoot":"","sources":["../../../src/api/admin/apiUpdateDetectorKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACN,KAAK,MAAM,EAGX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,KAAK,yBAAyB,GAAG,OAAO,qBAAqB,CAAC;AAE9D,cAAM,4BACL,YAAW,WAAW,CAAC,yBAAyB,CAAC;IAE9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAAjB,iBAAiB,EAAE,iBAAiB;IAElE,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,EACxC,MAAM,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC;IAuBxB,oBAAoB,IAAI,yBAAyB;CAGxD;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAC"}
+{"version":3,"file":"apiUpdateDetectorKeyEndpoint.d.ts","sourceRoot":"","sources":["../../../src/api/admin/apiUpdateDetectorKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,MAAM,EAAmC,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,KAAK,yBAAyB,GAAG,OAAO,qBAAqB,CAAC;AAE9D,cAAM,4BACL,YAAW,WAAW,CAAC,yBAAyB,CAAC;IAE9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAAjB,iBAAiB,EAAE,iBAAiB;IAElE,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,EACxC,MAAM,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC;IAuBxB,oBAAoB,IAAI,yBAAyB;CAGxD;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAC"}

package/dist/api/admin/apiUpdateDetectorKeyEndpoint.js

@@ -1,23 +1,23 @@
 import { ApiEndpointResponseStatus, } from "@prosopo/api-route";
-import { getLoggerDefault, } from "@prosopo/common";
+import { getLogger } from "@prosopo/common";
 import { UpdateDetectorKeyBody } from "@prosopo/types";
 class ApiUpdateDetectorKeyEndpoint {
     constructor(clientTaskManager) {
         this.clientTaskManager = clientTaskManager;
     }
     async processRequest(args, logger) {
-        logger = logger || getLoggerDefault();
+        logger = logger || getLogger("info", "");
         try {
             const { detectorKey } = args;
-            logger = logger || getLoggerDefault();
-            logger.info("Updating detector key");
+            logger = logger || getLogger("info", "");
+            logger.info(() => ({ msg: "Updating detector key" }));
             await this.clientTaskManager.updateDetectorKey(detectorKey);
             return {
                 status: ApiEndpointResponseStatus.SUCCESS,
             };
         }
         catch (error) {
-            logger.error("Error updating detector key", error);
+            logger.error(() => ({ msg: "Error updating detector key", err: error }));
             return {
                 status: ApiEndpointResponseStatus.FAIL,
                 error: error.message,

package/dist/api/admin/apiUpdateDetectorKeyEndpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiUpdateDetectorKeyEndpoint.js","sourceRoot":"","sources":["../../../src/api/admin/apiUpdateDetectorKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGN,gBAAgB,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAMvD,MAAM,4BAA4B;IAGjC,YAAoC,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAE5E,KAAK,CAAC,cAAc,CACnB,IAAwC,EACxC,MAAe;QAEf,MAAM,GAAG,MAAM,IAAI,gBAAgB,EAAE,CAAC;QACtC,IAAI,CAAC;YACJ,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;YAE7B,MAAM,GAAG,MAAM,IAAI,gBAAgB,EAAE,CAAC;YAEtC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAErC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAE5D,OAAO;gBACN,MAAM,EAAE,yBAAyB,CAAC,OAAO;aACzC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;YACnD,OAAO;gBACN,MAAM,EAAE,yBAAyB,CAAC,IAAI;gBACtC,KAAK,EAAG,KAAyB,CAAC,OAAO;aACzC,CAAC;QACH,CAAC;IACF,CAAC;IAEM,oBAAoB;QAC1B,OAAO,qBAAqB,CAAC;IAC9B,CAAC;CACD;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAC"}
+{"version":3,"file":"apiUpdateDetectorKeyEndpoint.js","sourceRoot":"","sources":["../../../src/api/admin/apiUpdateDetectorKeyEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAqC,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAMvD,MAAM,4BAA4B;IAGjC,YAAoC,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAE5E,KAAK,CAAC,cAAc,CACnB,IAAwC,EACxC,MAAe;QAEf,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC;YACJ,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;YAE7B,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAEzC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC;YAEtD,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAE5D,OAAO;gBACN,MAAM,EAAE,yBAAyB,CAAC,OAAO;aACzC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,6BAA6B,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACzE,OAAO;gBACN,MAAM,EAAE,yBAAyB,CAAC,IAAI;gBACtC,KAAK,EAAG,KAAyB,CAAC,OAAO;aACzC,CAAC;QACH,CAAC;IACF,CAAC;IAEM,oBAAoB;QAC1B,OAAO,qBAAqB,CAAC;IAC9B,CAAC;CACD;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAC"}

package/dist/api/blacklistRequestInspector.d.ts

@@ -1,19 +1,17 @@
 import type { Logger } from "@prosopo/common";
-import type { BlacklistInspector } from "@prosopo/user-access-policy";
+import { type ResolveAccessPolicy } from "@prosopo/user-access-policy";
 import type { NextFunction, Request, Response } from "express";
-declare class BlacklistRequestInspector {
-    private readonly blacklistInspector;
+export declare class BlacklistRequestInspector {
+    private readonly resolveAccessPolicy;
     private readonly environmentReadinessWaiter;
-    private readonly logger;
-    constructor(blacklistInspector: BlacklistInspector, environmentReadinessWaiter: () => Promise<void>, logger: Logger);
+    constructor(resolveAccessPolicy: ResolveAccessPolicy, environmentReadinessWaiter: () => Promise<void>);
     abortRequestForBlockedUsers(request: Request, res: Response, next: NextFunction): Promise<void>;
     shouldAbortRequest(requestedRoute: string, rawIp: string, ja4: string, requestHeaders: Record<string, unknown>, requestBody: Record<string, unknown>, logger: Logger): Promise<boolean>;
     protected isApiUnrelatedRoute(url: string): boolean;
     protected extractIdsFromRequest(requestHeaders: Record<string, unknown>, requestBody: Record<string, unknown>): {
-        userId: string;
-        clientId: string;
+        userId: string | undefined;
+        clientId: string | undefined;
     };
     protected getObjectValue(object: Record<string, unknown>, key: string): unknown;
 }
-export { BlacklistRequestInspector };
 //# sourceMappingURL=blacklistRequestInspector.d.ts.map

package/dist/api/blacklistRequestInspector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blacklistRequestInspector.d.ts","sourceRoot":"","sources":["../../src/api/blacklistRequestInspector.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG/D,cAAM,yBAAyB;IAE7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,kBAAkB,EAAE,kBAAkB,EACtC,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC/C,MAAM,EAAE,MAAM;IAGnB,2BAA2B,CACvC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GAChB,OAAO,CAAC,IAAI,CAAC;IAsBH,kBAAkB,CAC9B,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAwCnB,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAInD,SAAS,CAAC,qBAAqB,CAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC;QACF,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KACjB;IAgBD,SAAS,CAAC,cAAc,CACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,GAAG,EAAE,MAAM,GACT,OAAO;CAGV;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"blacklistRequestInspector.d.ts","sourceRoot":"","sources":["../../src/api/blacklistRequestInspector.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EACN,KAAK,mBAAmB,EAExB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,qBAAa,yBAAyB;IAEpC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAD1B,mBAAmB,EAAE,mBAAmB,EACxC,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAGpD,2BAA2B,CACvC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GAChB,OAAO,CAAC,IAAI,CAAC;IAwBH,kBAAkB,CAC9B,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAsDnB,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAInD,SAAS,CAAC,qBAAqB,CAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC;QACF,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7B;IAcD,SAAS,CAAC,cAAc,CACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,GAAG,EAAE,MAAM,GACT,OAAO;CAGV"}

package/dist/api/blacklistRequestInspector.js

@@ -1,14 +1,17 @@
 import { ApiPrefix } from "@prosopo/types";
-import { getIPAddress } from "../util.js";
-class BlacklistRequestInspector {
-    constructor(blacklistInspector, environmentReadinessWaiter, logger) {
-        this.blacklistInspector = blacklistInspector;
+import { ScopeMatch, } from "@prosopo/user-access-policy";
+import { AccessPolicyType } from "@prosopo/user-access-policy";
+import { getIPAddress } from "@prosopo/util";
+export class BlacklistRequestInspector {
+    constructor(resolveAccessPolicy, environmentReadinessWaiter) {
+        this.resolveAccessPolicy = resolveAccessPolicy;
         this.environmentReadinessWaiter = environmentReadinessWaiter;
-        this.logger = logger;
     }
     async abortRequestForBlockedUsers(request, res, next) {
         const rawIp = request.ip || "";
-        request.logger.debug("JA4", request.ja4);
+        request.logger.debug(() => ({
+            data: { ja4: request.ja4 },
+        }));
         const shouldAbortRequest = await this.shouldAbortRequest(request.url, rawIp, request.ja4, request.headers, request.body, request.logger);
         if (shouldAbortRequest) {
             res.status(401).json({ error: "Unauthorized" });
@@ -21,21 +24,39 @@ class BlacklistRequestInspector {
             return false;
         }
         if (!rawIp) {
-            logger.info("Request without IP", {
-                requestedRoute: requestedRoute,
-                requestHeaders: requestHeaders,
-                requestBody: requestBody,
-            });
+            logger.info(() => ({
+                data: {
+                    requestedRoute: requestedRoute,
+                    requestHeaders: requestHeaders,
+                    requestBody: requestBody,
+                },
+                msg: "Request without IP",
+            }));
             return true;
         }
         await this.environmentReadinessWaiter();
         try {
             const userIpAddress = getIPAddress(rawIp);
             const { userId, clientId } = this.extractIdsFromRequest(requestHeaders, requestBody);
-            return await this.blacklistInspector.isUserBlacklisted(clientId, userIpAddress, ja4, userId);
+            const accessPolicy = await this.resolveAccessPolicy({
+                policyScope: {
+                    clientId: clientId,
+                },
+                policyScopeMatch: ScopeMatch.Greedy,
+                userScope: {
+                    userId: userId,
+                    numericIp: userIpAddress.bigInt(),
+                    ja4Hash: ja4,
+                },
+                userScopeMatch: ScopeMatch.Greedy,
+            });
+            return AccessPolicyType.Block === accessPolicy?.type;
         }
         catch (err) {
-            logger.error("Block Middleware Error:", err);
+            logger.error(() => ({
+                err,
+                msg: "Block Middleware Error",
+            }));
             return true;
         }
     }
@@ -44,19 +65,16 @@ class BlacklistRequestInspector {
     }
     extractIdsFromRequest(requestHeaders, requestBody) {
         const userId = this.getObjectValue(requestHeaders, "Prosopo-User") ||
-            this.getObjectValue(requestBody, "user") ||
-            "";
+            this.getObjectValue(requestBody, "user");
         const clientId = this.getObjectValue(requestHeaders, "Prosopo-Site-Key") ||
-            this.getObjectValue(requestBody, "dapp") ||
-            "";
+            this.getObjectValue(requestBody, "dapp");
         return {
-            userId: "string" === typeof userId ? userId : "",
-            clientId: "string" === typeof clientId ? clientId : "",
+            userId: "string" === typeof userId ? userId : undefined,
+            clientId: "string" === typeof clientId ? clientId : undefined,
         };
     }
     getObjectValue(object, key) {
         return object[key];
     }
 }
-export { BlacklistRequestInspector };
 //# sourceMappingURL=blacklistRequestInspector.js.map

package/dist/api/blacklistRequestInspector.js.map

@@ -1 +1 @@
-{"version":3,"file":"blacklistRequestInspector.js","sourceRoot":"","sources":["../../src/api/blacklistRequestInspector.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,yBAAyB;IAC9B,YACkB,kBAAsC,EACtC,0BAA+C,EAC/C,MAAc;QAFd,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,+BAA0B,GAA1B,0BAA0B,CAAqB;QAC/C,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEG,KAAK,CAAC,2BAA2B,CACvC,OAAgB,EAChB,GAAa,EACb,IAAkB;QAElB,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC;QAE/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAEzC,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CACvD,OAAO,CAAC,GAAG,EACX,KAAK,EACL,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,MAAM,CACd,CAAC;QAEF,IAAI,kBAAkB,EAAE,CAAC;YACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YAChD,OAAO;QACR,CAAC;QAED,IAAI,EAAE,CAAC;IACR,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC9B,cAAsB,EACtB,KAAa,EACb,GAAW,EACX,cAAuC,EACvC,WAAoC,EACpC,MAAc;QAGd,IAAI,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACd,CAAC;QAGD,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE;gBACjC,cAAc,EAAE,cAAc;gBAC9B,cAAc,EAAE,cAAc;gBAC9B,WAAW,EAAE,WAAW;aACxB,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAExC,IAAI,CAAC;YACJ,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;YAE1C,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,qBAAqB,CACtD,cAAc,EACd,WAAW,CACX,CAAC;YAEF,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CACrD,QAAQ,EACR,aAAa,EACb,GAAG,EACH,MAAM,CACN,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC;YAE7C,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAES,mBAAmB,CAAC,GAAW;QACxC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IAES,qBAAqB,CAC9B,cAAuC,EACvC,WAAoC;QAKpC,MAAM,MAAM,GACX,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,cAAc,CAAC;YACnD,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC;YACxC,EAAE,CAAC;QACJ,MAAM,QAAQ,GACb,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,kBAAkB,CAAC;YACvD,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC;YACxC,EAAE,CAAC;QAEJ,OAAO;YACN,MAAM,EAAE,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YAChD,QAAQ,EAAE,QAAQ,KAAK,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;SACtD,CAAC;IACH,CAAC;IAES,cAAc,CACvB,MAA+B,EAC/B,GAAW;QAEX,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;CACD;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"blacklistRequestInspector.js","sourceRoot":"","sources":["../../src/api/blacklistRequestInspector.ts"],"names":[],"mappings":"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"}

package/dist/api/block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../src/api/block.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,eAAO,MAAM,eAAe,wBAAyB,mBAAmB,iIAyBvE,CAAC"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../src/api/block.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,eAAO,MAAM,eAAe,wBAAyB,mBAAmB,iIAwBvE,CAAC"}

package/dist/api/block.js

@@ -1,15 +1,15 @@
-import { getLogger } from "@prosopo/common";
-import { createBlacklistInspector } from "@prosopo/user-access-policy";
+import { getLogger, parseLogLevel } from "@prosopo/common";
+import { createAccessPolicyResolver } from "@prosopo/user-access-policy";
 import { BlacklistRequestInspector } from "./blacklistRequestInspector.js";
 export const blockMiddleware = (providerEnvironment) => {
-    const logLevel = providerEnvironment.config.logLevel;
+    const logLevel = parseLogLevel(providerEnvironment.config.logLevel);
     const logger = getLogger(logLevel, "blockMiddleware");
     const userAccessRulesStorage = providerEnvironment
         .getDb()
         .getUserAccessRulesStorage();
     const environmentReadinessWaiter = providerEnvironment.isReady.bind(providerEnvironment);
-    const blacklistInspector = createBlacklistInspector(userAccessRulesStorage, logger);
-    const blacklistRequestInspector = new BlacklistRequestInspector(blacklistInspector, environmentReadinessWaiter, logger);
+    const resolveAccessPolicy = createAccessPolicyResolver(userAccessRulesStorage, logger);
+    const blacklistRequestInspector = new BlacklistRequestInspector(resolveAccessPolicy, environmentReadinessWaiter);
     return blacklistRequestInspector.abortRequestForBlockedUsers.bind(blacklistRequestInspector);
 };
 //# sourceMappingURL=block.js.map

package/dist/api/block.js.map

@@ -1 +1 @@
-{"version":3,"file":"block.js","sourceRoot":"","sources":["../../src/api/block.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAoB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,mBAAwC,EAAE,EAAE;IAC3E,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC;IACrD,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAEtD,MAAM,sBAAsB,GAAG,mBAAmB;SAChD,KAAK,EAAE;SACP,yBAAyB,EAAE,CAAC;IAE9B,MAAM,0BAA0B,GAC/B,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAEvD,MAAM,kBAAkB,GAAG,wBAAwB,CAClD,sBAAsB,EACtB,MAAM,CACN,CAAC;IAEF,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,CAC9D,kBAAkB,EAClB,0BAA0B,EAC1B,MAAM,CACN,CAAC;IAEF,OAAO,yBAAyB,CAAC,2BAA2B,CAAC,IAAI,CAChE,yBAAyB,CACzB,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"block.js","sourceRoot":"","sources":["../../src/api/block.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,mBAAwC,EAAE,EAAE;IAC3E,MAAM,QAAQ,GAAG,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAEtD,MAAM,sBAAsB,GAAG,mBAAmB;SAChD,KAAK,EAAE;SACP,yBAAyB,EAAE,CAAC;IAE9B,MAAM,0BAA0B,GAC/B,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAEvD,MAAM,mBAAmB,GAAG,0BAA0B,CACrD,sBAAsB,EACtB,MAAM,CACN,CAAC;IAEF,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,CAC9D,mBAAmB,EACnB,0BAA0B,CAC1B,CAAC;IAEF,OAAO,yBAAyB,CAAC,2BAA2B,CAAC,IAAI,CAChE,yBAAyB,CACzB,CAAC;AACH,CAAC,CAAC"}

package/dist/api/captcha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAe/C,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAwkB9D"}
+{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AAsCA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAO9D,OAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAc/C,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA6pB9D"}