@prosopo/user-access-policy 3.5.19 → 3.5.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +67 -0
- package/coverage/base.css +224 -0
- package/coverage/block-navigation.js +87 -0
- package/coverage/clover.xml +786 -0
- package/coverage/coverage-final.json +15 -0
- package/coverage/favicon.png +0 -0
- package/coverage/index.html +146 -0
- package/coverage/prettify.css +1 -0
- package/coverage/prettify.js +2 -0
- package/coverage/sort-arrow-sprite.png +0 -0
- package/coverage/sorter.js +210 -0
- package/coverage/src/accessPolicy.ts.html +457 -0
- package/coverage/src/accessPolicyResolver.ts.html +211 -0
- package/coverage/src/accessRules.ts.html +265 -0
- package/coverage/src/api/accessRuleApiRoutes.ts.html +379 -0
- package/coverage/src/api/accessRulesApiClient.ts.html +274 -0
- package/coverage/src/api/deleteAllRulesEndpoint.ts.html +229 -0
- package/coverage/src/api/deleteRulesEndpoint.ts.html +301 -0
- package/coverage/src/api/index.html +176 -0
- package/coverage/src/api/insertRulesEndpoint.ts.html +436 -0
- package/coverage/src/index.html +176 -0
- package/coverage/src/index.ts.html +277 -0
- package/coverage/src/redis/index.html +161 -0
- package/coverage/src/redis/redisRulesIndex.ts.html +769 -0
- package/coverage/src/redis/redisRulesReader.ts.html +652 -0
- package/coverage/src/redis/redisRulesStorage.ts.html +229 -0
- package/coverage/src/redis/redisRulesWriter.ts.html +424 -0
- package/coverage/src/util.ts.html +136 -0
- package/dist/.export.d.ts +6 -0
- package/dist/.export.d.ts.map +1 -0
- package/dist/.export.js +21 -0
- package/dist/.export.js.map +1 -0
- package/dist/accessPolicy.d.ts +169 -0
- package/dist/accessPolicy.d.ts.map +1 -0
- package/dist/accessPolicy.js.map +1 -0
- package/dist/accessPolicyResolver.d.ts +110 -0
- package/dist/accessPolicyResolver.d.ts.map +1 -0
- package/dist/accessPolicyResolver.js.map +1 -0
- package/dist/accessRules.d.ts +16 -0
- package/dist/accessRules.d.ts.map +1 -0
- package/dist/accessRules.js.map +1 -0
- package/dist/api/.export.d.ts +7 -0
- package/dist/api/.export.d.ts.map +1 -0
- package/dist/api/.export.js +11 -0
- package/dist/api/.export.js.map +1 -0
- package/dist/api/accessRuleApiRoutes.d.ts +27 -0
- package/dist/api/accessRuleApiRoutes.d.ts.map +1 -0
- package/dist/api/accessRuleApiRoutes.js.map +1 -0
- package/dist/api/accessRulesApiClient.d.ts +10 -0
- package/dist/api/accessRulesApiClient.d.ts.map +1 -0
- package/dist/api/accessRulesApiClient.js.map +1 -0
- package/dist/api/delete/.export.d.ts +2 -0
- package/dist/api/delete/.export.d.ts.map +1 -0
- package/dist/api/delete/.export.js +1 -0
- package/dist/api/delete/.export.js.map +1 -0
- package/dist/api/delete/deleteAllRules.d.ts +11 -0
- package/dist/api/delete/deleteAllRules.d.ts.map +1 -0
- package/dist/api/delete/deleteAllRules.js +25 -0
- package/dist/api/delete/deleteAllRules.js.map +1 -0
- package/dist/api/delete/deleteRuleGroups.d.ts +19 -0
- package/dist/api/delete/deleteRuleGroups.d.ts.map +1 -0
- package/dist/api/delete/deleteRuleGroups.js +52 -0
- package/dist/api/delete/deleteRuleGroups.js.map +1 -0
- package/dist/api/delete/deleteRules.d.ts +15 -0
- package/dist/api/delete/deleteRules.d.ts.map +1 -0
- package/dist/api/delete/deleteRules.js +43 -0
- package/dist/api/delete/deleteRules.js.map +1 -0
- package/dist/api/deleteAllRulesEndpoint.d.ts +12 -0
- package/dist/api/deleteAllRulesEndpoint.d.ts.map +1 -0
- package/dist/api/deleteAllRulesEndpoint.js.map +1 -0
- package/dist/api/deleteRulesEndpoint.d.ts +116 -0
- package/dist/api/deleteRulesEndpoint.d.ts.map +1 -0
- package/dist/api/deleteRulesEndpoint.js.map +1 -0
- package/dist/api/insertRulesEndpoint.d.ts +22 -0
- package/dist/api/insertRulesEndpoint.d.ts.map +1 -0
- package/dist/api/insertRulesEndpoint.js.map +1 -0
- package/dist/api/read/.export.d.ts +4 -0
- package/dist/api/read/.export.d.ts.map +1 -0
- package/dist/api/read/.export.js +1 -0
- package/dist/api/read/.export.js.map +1 -0
- package/dist/api/read/fetchRules.d.ts +53 -0
- package/dist/api/read/fetchRules.d.ts.map +1 -0
- package/dist/api/read/fetchRules.js +43 -0
- package/dist/api/read/fetchRules.js.map +1 -0
- package/dist/api/read/findRuleIds.d.ts +28 -0
- package/dist/api/read/findRuleIds.d.ts.map +1 -0
- package/dist/api/read/findRuleIds.js +50 -0
- package/dist/api/read/findRuleIds.js.map +1 -0
- package/dist/api/read/getMissingIds.d.ts +28 -0
- package/dist/api/read/getMissingIds.d.ts.map +1 -0
- package/dist/api/read/getMissingIds.js +41 -0
- package/dist/api/read/getMissingIds.js.map +1 -0
- package/dist/api/ruleApiRoutes.d.ts +43 -0
- package/dist/api/ruleApiRoutes.d.ts.map +1 -0
- package/dist/api/ruleApiRoutes.js +131 -0
- package/dist/api/ruleApiRoutes.js.map +1 -0
- package/dist/api/rulesApiClient.d.ts +20 -0
- package/dist/api/rulesApiClient.d.ts.map +1 -0
- package/dist/api/rulesApiClient.js +93 -0
- package/dist/api/rulesApiClient.js.map +1 -0
- package/dist/api/write/.export.d.ts +2 -0
- package/dist/api/write/.export.d.ts.map +1 -0
- package/dist/api/write/.export.js +1 -0
- package/dist/api/write/.export.js.map +1 -0
- package/dist/api/write/insertRules.d.ts +29 -0
- package/dist/api/write/insertRules.d.ts.map +1 -0
- package/dist/api/write/insertRules.js +102 -0
- package/dist/api/write/insertRules.js.map +1 -0
- package/dist/api/write/rehashRules.d.ts +11 -0
- package/dist/api/write/rehashRules.d.ts.map +1 -0
- package/dist/api/write/rehashRules.js +57 -0
- package/dist/api/write/rehashRules.js.map +1 -0
- package/dist/cjs/.export.cjs +21 -0
- package/dist/cjs/api/.export.cjs +11 -0
- package/dist/cjs/api/delete/.export.cjs +1 -0
- package/dist/cjs/api/delete/deleteAllRules.cjs +25 -0
- package/dist/cjs/api/delete/deleteRuleGroups.cjs +52 -0
- package/dist/cjs/api/delete/deleteRules.cjs +43 -0
- package/dist/cjs/api/read/.export.cjs +1 -0
- package/dist/cjs/api/read/fetchRules.cjs +43 -0
- package/dist/cjs/api/read/findRuleIds.cjs +50 -0
- package/dist/cjs/api/read/getMissingIds.cjs +41 -0
- package/dist/cjs/api/ruleApiRoutes.cjs +131 -0
- package/dist/cjs/api/rulesApiClient.cjs +93 -0
- package/dist/cjs/api/write/.export.cjs +1 -0
- package/dist/cjs/api/write/insertRules.cjs +102 -0
- package/dist/cjs/api/write/rehashRules.cjs +57 -0
- package/dist/cjs/index.cjs +4 -6
- package/dist/cjs/mongoose/.export.cjs +4 -0
- package/dist/cjs/mongoose/mongooseRuleSchema.cjs +36 -0
- package/dist/cjs/redis/.export.cjs +6 -0
- package/dist/cjs/redis/reader/redisAggregate.cjs +60 -0
- package/dist/cjs/redis/reader/redisRulesQuery.cjs +99 -0
- package/dist/cjs/redis/reader/redisRulesReader.cjs +230 -0
- package/dist/cjs/redis/{redisRulesReader.cjs → redisAccessRules.cjs} +38 -28
- package/dist/cjs/redis/{redisRulesIndex.cjs → redisAccessRulesIndex.cjs} +45 -12
- package/dist/cjs/redis/redisClient.cjs +67 -0
- package/dist/cjs/redis/redisIndex.cjs +22 -0
- package/dist/cjs/redis/redisRuleIndex.cjs +50 -0
- package/dist/cjs/redis/redisRulesStorage.cjs +22 -9
- package/dist/cjs/redis/redisRulesWriter.cjs +91 -64
- package/dist/cjs/rule.cjs +8 -0
- package/dist/cjs/ruleInput/.export.cjs +9 -0
- package/dist/cjs/ruleInput/policyInput.cjs +25 -0
- package/dist/cjs/ruleInput/ruleInput.cjs +50 -0
- package/dist/cjs/ruleInput/userScopeInput.cjs +55 -0
- package/dist/cjs/ruleRecord.cjs +23 -0
- package/dist/cjs/rulesStorage.cjs +8 -0
- package/dist/cjs/transformRule.cjs +77 -0
- package/dist/index.d.ts +15 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js.map +1 -0
- package/dist/mongoose/.export.d.ts +2 -0
- package/dist/mongoose/.export.d.ts.map +1 -0
- package/dist/mongoose/.export.js +4 -0
- package/dist/mongoose/.export.js.map +1 -0
- package/dist/mongoose/mongooseRuleSchema.d.ts +4 -0
- package/dist/mongoose/mongooseRuleSchema.d.ts.map +1 -0
- package/dist/mongoose/mongooseRuleSchema.js +36 -0
- package/dist/mongoose/mongooseRuleSchema.js.map +1 -0
- package/dist/redis/.export.d.ts +3 -0
- package/dist/redis/.export.d.ts.map +1 -0
- package/dist/redis/.export.js +6 -0
- package/dist/redis/.export.js.map +1 -0
- package/dist/redis/reader/redisAggregate.d.ts +4 -0
- package/dist/redis/reader/redisAggregate.d.ts.map +1 -0
- package/dist/redis/reader/redisAggregate.js +60 -0
- package/dist/redis/reader/redisAggregate.js.map +1 -0
- package/dist/redis/reader/redisRulesQuery.d.ts +4 -0
- package/dist/redis/reader/redisRulesQuery.d.ts.map +1 -0
- package/dist/redis/reader/redisRulesQuery.js +99 -0
- package/dist/redis/reader/redisRulesQuery.js.map +1 -0
- package/dist/redis/reader/redisRulesReader.d.ts +26 -0
- package/dist/redis/reader/redisRulesReader.d.ts.map +1 -0
- package/dist/redis/reader/redisRulesReader.js +213 -0
- package/dist/redis/reader/redisRulesReader.js.map +1 -0
- package/dist/redis/redisAccessRules.d.ts +7 -0
- package/dist/redis/redisAccessRules.d.ts.map +1 -0
- package/dist/redis/redisAccessRules.js +119 -0
- package/dist/redis/redisAccessRules.js.map +1 -0
- package/dist/redis/redisAccessRulesIndex.d.ts +13 -0
- package/dist/redis/redisAccessRulesIndex.d.ts.map +1 -0
- package/dist/redis/redisAccessRulesIndex.js +140 -0
- package/dist/redis/redisAccessRulesIndex.js.map +1 -0
- package/dist/redis/redisClient.d.ts +11 -0
- package/dist/redis/redisClient.d.ts.map +1 -0
- package/dist/redis/redisClient.js +67 -0
- package/dist/redis/redisClient.js.map +1 -0
- package/dist/redis/redisIndex.d.ts +9 -0
- package/dist/redis/redisIndex.d.ts.map +1 -0
- package/dist/redis/redisIndex.js +23 -0
- package/dist/redis/redisIndex.js.map +1 -0
- package/dist/redis/redisRuleIndex.d.ts +13 -0
- package/dist/redis/redisRuleIndex.d.ts.map +1 -0
- package/dist/redis/redisRuleIndex.js +50 -0
- package/dist/redis/redisRuleIndex.js.map +1 -0
- package/dist/redis/redisRulesIndex.d.ts +9 -0
- package/dist/redis/redisRulesIndex.d.ts.map +1 -0
- package/dist/redis/redisRulesIndex.js.map +1 -0
- package/dist/redis/redisRulesReader.d.ts +6 -0
- package/dist/redis/redisRulesReader.d.ts.map +1 -0
- package/dist/redis/redisRulesReader.js.map +1 -0
- package/dist/redis/redisRulesStorage.d.ts +5 -0
- package/dist/redis/redisRulesStorage.d.ts.map +1 -0
- package/dist/redis/redisRulesStorage.js +23 -10
- package/dist/redis/redisRulesStorage.js.map +1 -0
- package/dist/redis/redisRulesWriter.d.ts +22 -0
- package/dist/redis/redisRulesWriter.d.ts.map +1 -0
- package/dist/redis/redisRulesWriter.js +91 -64
- package/dist/redis/redisRulesWriter.js.map +1 -0
- package/dist/rule.d.ts +34 -0
- package/dist/rule.d.ts.map +1 -0
- package/dist/rule.js +8 -0
- package/dist/rule.js.map +1 -0
- package/dist/ruleInput/.export.d.ts +4 -0
- package/dist/ruleInput/.export.d.ts.map +1 -0
- package/dist/ruleInput/.export.js +9 -0
- package/dist/ruleInput/.export.js.map +1 -0
- package/dist/ruleInput/policyInput.d.ts +38 -0
- package/dist/ruleInput/policyInput.d.ts.map +1 -0
- package/dist/ruleInput/policyInput.js +25 -0
- package/dist/ruleInput/policyInput.js.map +1 -0
- package/dist/ruleInput/ruleInput.d.ts +145 -0
- package/dist/ruleInput/ruleInput.d.ts.map +1 -0
- package/dist/ruleInput/ruleInput.js +50 -0
- package/dist/ruleInput/ruleInput.js.map +1 -0
- package/dist/ruleInput/userScopeInput.d.ts +93 -0
- package/dist/ruleInput/userScopeInput.d.ts.map +1 -0
- package/dist/ruleInput/userScopeInput.js +55 -0
- package/dist/ruleInput/userScopeInput.js.map +1 -0
- package/dist/ruleRecord.d.ts +18 -0
- package/dist/ruleRecord.d.ts.map +1 -0
- package/dist/ruleRecord.js +23 -0
- package/dist/ruleRecord.js.map +1 -0
- package/dist/rulesStorage.d.ts +30 -0
- package/dist/rulesStorage.d.ts.map +1 -0
- package/dist/rulesStorage.js +8 -0
- package/dist/rulesStorage.js.map +1 -0
- package/dist/tests/accessPolicy.test.d.ts +2 -0
- package/dist/tests/accessPolicy.test.d.ts.map +1 -0
- package/dist/tests/accessPolicy.test.js +27 -0
- package/dist/tests/accessPolicy.test.js.map +1 -0
- package/dist/tests/redis/reader/redisRulesQuery.unit.test.d.ts +2 -0
- package/dist/tests/redis/reader/redisRulesQuery.unit.test.d.ts.map +1 -0
- package/dist/tests/redis/reader/redisRulesQuery.unit.test.js +101 -0
- package/dist/tests/redis/reader/redisRulesQuery.unit.test.js.map +1 -0
- package/dist/tests/redis/redisAccessRules.integration.test.d.ts +2 -0
- package/dist/tests/redis/redisAccessRules.integration.test.d.ts.map +1 -0
- package/dist/tests/redis/redisAccessRules.integration.test.js +586 -0
- package/dist/tests/redis/redisAccessRules.integration.test.js.map +1 -0
- package/dist/tests/redis/redisAccessRules.unit.test.d.ts +2 -0
- package/dist/tests/redis/redisAccessRules.unit.test.d.ts.map +1 -0
- package/dist/tests/redis/redisAccessRules.unit.test.js +198 -0
- package/dist/tests/redis/redisAccessRules.unit.test.js.map +1 -0
- package/dist/tests/redis/redisIndex.integration.test.d.ts +2 -0
- package/dist/tests/redis/redisIndex.integration.test.d.ts.map +1 -0
- package/dist/tests/redis/redisIndex.integration.test.js +80 -0
- package/dist/tests/redis/redisIndex.integration.test.js.map +1 -0
- package/dist/tests/redis/redisRulesIndex.unit.test.d.ts +2 -0
- package/dist/tests/redis/redisRulesIndex.unit.test.d.ts.map +1 -0
- package/dist/tests/redis/redisRulesIndex.unit.test.js +101 -0
- package/dist/tests/redis/redisRulesIndex.unit.test.js.map +1 -0
- package/dist/tests/redis/redisRulesStorage.integration.test.d.ts +2 -0
- package/dist/tests/redis/redisRulesStorage.integration.test.d.ts.map +1 -0
- package/dist/tests/redis/redisRulesStorage.integration.test.js +611 -0
- package/dist/tests/redis/redisRulesStorage.integration.test.js.map +1 -0
- package/dist/tests/redis/testRedisClient.d.ts +3 -0
- package/dist/tests/redis/testRedisClient.d.ts.map +1 -0
- package/dist/tests/redis/testRedisClient.js +8 -0
- package/dist/tests/redis/testRedisClient.js.map +1 -0
- package/dist/tests/testLogger.d.ts +4 -0
- package/dist/tests/testLogger.d.ts.map +1 -0
- package/dist/tests/testLogger.js +22 -0
- package/dist/tests/testLogger.js.map +1 -0
- package/dist/tests/transformRule.unit.test.d.ts +2 -0
- package/dist/tests/transformRule.unit.test.d.ts.map +1 -0
- package/dist/tests/transformRule.unit.test.js +188 -0
- package/dist/tests/transformRule.unit.test.js.map +1 -0
- package/dist/transformRule.d.ts +7 -0
- package/dist/transformRule.d.ts.map +1 -0
- package/dist/transformRule.js +77 -0
- package/dist/transformRule.js.map +1 -0
- package/dist/util.d.ts +2 -0
- package/dist/util.d.ts.map +1 -0
- package/dist/util.js.map +1 -0
- package/entries.ts +20 -0
- package/package.json +34 -18
- package/vite.cjs.config.ts +4 -1
- package/vite.esm.config.ts +6 -1
- package/dist/cjs/api/accessRulesApiClient.cjs +0 -38
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"testLogger.d.ts","sourceRoot":"","sources":["../../src/tests/testLogger.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG9C,QAAA,MAAM,oBAAoB,EAAE,MAkB3B,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { vi } from "vitest";
|
|
2
|
+
const loggerMockedInstance = {
|
|
3
|
+
trace: vi.fn(),
|
|
4
|
+
debug: vi.fn(),
|
|
5
|
+
info: vi.fn(),
|
|
6
|
+
warn: vi.fn(),
|
|
7
|
+
error: vi.fn(),
|
|
8
|
+
fatal: vi.fn(),
|
|
9
|
+
log: vi.fn(),
|
|
10
|
+
setLogLevel: vi.fn(),
|
|
11
|
+
getLogLevel: vi.fn(),
|
|
12
|
+
with: vi.fn().mockReturnThis(),
|
|
13
|
+
getScope: vi.fn().mockReturnValue("test-scope"),
|
|
14
|
+
getPretty: vi.fn().mockReturnValue(false),
|
|
15
|
+
setPretty: vi.fn(),
|
|
16
|
+
getPrintStack: vi.fn().mockReturnValue(false),
|
|
17
|
+
setPrintStack: vi.fn(),
|
|
18
|
+
getFormat: vi.fn().mockReturnValue("json"),
|
|
19
|
+
setFormat: vi.fn(),
|
|
20
|
+
};
|
|
21
|
+
export { loggerMockedInstance };
|
|
22
|
+
//# sourceMappingURL=testLogger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"testLogger.js","sourceRoot":"","sources":["../../src/tests/testLogger.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5B,MAAM,oBAAoB,GAAW;IACpC,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;IACd,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;IACd,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;IACb,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;IACb,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;IACd,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;IACd,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;IACZ,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;IACpB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;IACpB,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,EAAE;IAC9B,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC;IAC/C,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;IACzC,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;IAClB,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;IAC7C,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;IACtB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC;IAC1C,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;CAClB,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transformRule.unit.test.d.ts","sourceRoot":"","sources":["../../src/tests/transformRule.unit.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
import { CaptchaType } from "@prosopo/types";
|
|
2
|
+
import { Address4 } from "ip-address";
|
|
3
|
+
import { describe, expect, it } from "vitest";
|
|
4
|
+
import { AccessPolicyType } from "#policy/rule.js";
|
|
5
|
+
import { getCidrFromNumericIpRange, makeAccessRuleHash, transformAccessRuleIntoRecord, transformAccessRuleRecordIntoRule, } from "#policy/transformRule.js";
|
|
6
|
+
describe("makeAccessRuleHash", () => {
|
|
7
|
+
it("should make md5 rule hash", () => {
|
|
8
|
+
const rule = {
|
|
9
|
+
type: AccessPolicyType.Restrict,
|
|
10
|
+
};
|
|
11
|
+
const hash = makeAccessRuleHash(rule);
|
|
12
|
+
expect(hash).toEqual("755f7123e8f766b6692218b1014b85ca");
|
|
13
|
+
});
|
|
14
|
+
it("should handle bigint rule properties", () => {
|
|
15
|
+
const rule = {
|
|
16
|
+
type: AccessPolicyType.Restrict,
|
|
17
|
+
numericIp: 100n,
|
|
18
|
+
};
|
|
19
|
+
const hash = makeAccessRuleHash(rule);
|
|
20
|
+
expect(hash).toEqual("ab3fea02b8ef3309fb3fa6f6f703c55a");
|
|
21
|
+
});
|
|
22
|
+
it("should make same hash for same values regardless of properties order", () => {
|
|
23
|
+
const rule1 = {
|
|
24
|
+
type: AccessPolicyType.Restrict,
|
|
25
|
+
description: "description",
|
|
26
|
+
};
|
|
27
|
+
const rule2 = {
|
|
28
|
+
description: "description",
|
|
29
|
+
type: AccessPolicyType.Restrict,
|
|
30
|
+
};
|
|
31
|
+
const hash1 = makeAccessRuleHash(rule1);
|
|
32
|
+
const hash2 = makeAccessRuleHash(rule2);
|
|
33
|
+
expect(hash1).toEqual("5ed2f7de7ba1c6acc617f9246f19d35b");
|
|
34
|
+
expect(hash1).toEqual(hash2);
|
|
35
|
+
});
|
|
36
|
+
it("should make same hash for 'undefined' and missing properties", () => {
|
|
37
|
+
const rule1 = {
|
|
38
|
+
type: AccessPolicyType.Restrict,
|
|
39
|
+
description: undefined,
|
|
40
|
+
};
|
|
41
|
+
const rule2 = {
|
|
42
|
+
type: AccessPolicyType.Restrict,
|
|
43
|
+
};
|
|
44
|
+
const hash1 = makeAccessRuleHash(rule1);
|
|
45
|
+
const hash2 = makeAccessRuleHash(rule2);
|
|
46
|
+
expect(hash1).toEqual("755f7123e8f766b6692218b1014b85ca");
|
|
47
|
+
expect(hash1).toEqual(hash2);
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
describe("transformRule", () => {
|
|
51
|
+
const commonProperties = {
|
|
52
|
+
type: AccessPolicyType.Restrict,
|
|
53
|
+
captchaType: CaptchaType.frictionless,
|
|
54
|
+
description: "test",
|
|
55
|
+
solvedImagesCount: 1,
|
|
56
|
+
imageThreshold: 1,
|
|
57
|
+
powDifficulty: 1,
|
|
58
|
+
unsolvedImagesCount: 1,
|
|
59
|
+
frictionlessScore: 1,
|
|
60
|
+
headersHash: "headersHash",
|
|
61
|
+
ja4Hash: "js4Hash",
|
|
62
|
+
clientId: "client",
|
|
63
|
+
userId: "user",
|
|
64
|
+
};
|
|
65
|
+
it("should transform access rule record into rule", () => {
|
|
66
|
+
const ruleRecord = {
|
|
67
|
+
...commonProperties,
|
|
68
|
+
ruleGroupId: "ruleGroupId",
|
|
69
|
+
ipMask: "127.0.0.0/20",
|
|
70
|
+
ip: "127.0.0.0",
|
|
71
|
+
userAgent: "test",
|
|
72
|
+
};
|
|
73
|
+
const accessRule = transformAccessRuleRecordIntoRule({
|
|
74
|
+
...ruleRecord,
|
|
75
|
+
unwantedProperty: "bloatware",
|
|
76
|
+
});
|
|
77
|
+
expect(accessRule).toEqual({
|
|
78
|
+
...commonProperties,
|
|
79
|
+
groupId: "ruleGroupId",
|
|
80
|
+
numericIp: 2130706432n,
|
|
81
|
+
numericIpMaskMax: 2130710527n,
|
|
82
|
+
numericIpMaskMin: 2130706432n,
|
|
83
|
+
userAgentHash: "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08",
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
it("should transform access rule into record", () => {
|
|
87
|
+
const accessRule = {
|
|
88
|
+
...commonProperties,
|
|
89
|
+
groupId: "ruleGroupId",
|
|
90
|
+
numericIp: 2130706432n,
|
|
91
|
+
numericIpMaskMax: 2130710527n,
|
|
92
|
+
numericIpMaskMin: 2130706432n,
|
|
93
|
+
userAgentHash: "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08",
|
|
94
|
+
};
|
|
95
|
+
const accessRuleRecord = transformAccessRuleIntoRecord({
|
|
96
|
+
...accessRule,
|
|
97
|
+
unwantedProperty: "bloatware",
|
|
98
|
+
});
|
|
99
|
+
expect(accessRuleRecord).toEqual({
|
|
100
|
+
...commonProperties,
|
|
101
|
+
ruleGroupId: "ruleGroupId",
|
|
102
|
+
ipMask: "127.0.0.0/20",
|
|
103
|
+
ip: "127.0.0.0",
|
|
104
|
+
userAgent: "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08",
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
it("should throw error if cannot transform access rule record into rule", () => {
|
|
108
|
+
expect(() => transformAccessRuleRecordIntoRule({
|
|
109
|
+
ip: "127.0.0.1",
|
|
110
|
+
userAgent: "test",
|
|
111
|
+
})).toThrow();
|
|
112
|
+
});
|
|
113
|
+
it("should throw error if cannot transform access rule into record", () => {
|
|
114
|
+
expect(() => transformAccessRuleIntoRecord({
|
|
115
|
+
ip: "127.0.0.1",
|
|
116
|
+
userAgent: "test",
|
|
117
|
+
})).toThrow();
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
describe("getCidrFromNumericIpRange", () => {
|
|
121
|
+
const cirdsSet = [
|
|
122
|
+
{
|
|
123
|
+
cidr: "127.0.0.0/20",
|
|
124
|
+
startIp: "127.0.0.0",
|
|
125
|
+
endIp: "127.0.15.255",
|
|
126
|
+
description: "/20 network - 4096 addresses",
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
cidr: "192.168.1.0/24",
|
|
130
|
+
startIp: "192.168.1.0",
|
|
131
|
+
endIp: "192.168.1.255",
|
|
132
|
+
description: "/24 network - 256 addresses (Class C)",
|
|
133
|
+
},
|
|
134
|
+
{
|
|
135
|
+
cidr: "10.0.0.0/8",
|
|
136
|
+
startIp: "10.0.0.0",
|
|
137
|
+
endIp: "10.255.255.255",
|
|
138
|
+
description: "/8 network - 16M addresses (Class A)",
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
cidr: "172.16.0.0/12",
|
|
142
|
+
startIp: "172.16.0.0",
|
|
143
|
+
endIp: "172.31.255.255",
|
|
144
|
+
description: "/12 network - 1M addresses",
|
|
145
|
+
},
|
|
146
|
+
{
|
|
147
|
+
cidr: "192.168.0.0/16",
|
|
148
|
+
startIp: "192.168.0.0",
|
|
149
|
+
endIp: "192.168.255.255",
|
|
150
|
+
description: "/16 network - 65536 addresses (Class B)",
|
|
151
|
+
},
|
|
152
|
+
{
|
|
153
|
+
cidr: "192.168.1.128/25",
|
|
154
|
+
startIp: "192.168.1.128",
|
|
155
|
+
endIp: "192.168.1.255",
|
|
156
|
+
description: "/25 network - 128 addresses (subnet)",
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
cidr: "10.20.30.0/28",
|
|
160
|
+
startIp: "10.20.30.0",
|
|
161
|
+
endIp: "10.20.30.15",
|
|
162
|
+
description: "/28 network - 16 addresses (small subnet)",
|
|
163
|
+
},
|
|
164
|
+
{
|
|
165
|
+
cidr: "8.8.8.8/32",
|
|
166
|
+
startIp: "8.8.8.8",
|
|
167
|
+
endIp: "8.8.8.8",
|
|
168
|
+
description: "/32 network - single IP address",
|
|
169
|
+
},
|
|
170
|
+
{
|
|
171
|
+
cidr: "203.0.113.0/30",
|
|
172
|
+
startIp: "203.0.113.0",
|
|
173
|
+
endIp: "203.0.113.3",
|
|
174
|
+
description: "/30 network - 4 addresses (point-to-point)",
|
|
175
|
+
},
|
|
176
|
+
{
|
|
177
|
+
cidr: "198.51.100.64/26",
|
|
178
|
+
startIp: "198.51.100.64",
|
|
179
|
+
endIp: "198.51.100.127",
|
|
180
|
+
description: "/26 network - 64 addresses",
|
|
181
|
+
},
|
|
182
|
+
];
|
|
183
|
+
it.each(cirdsSet)("should convert $description to $cidr", (cirdExample) => {
|
|
184
|
+
const cird = getCidrFromNumericIpRange(new Address4(cirdExample.startIp).bigInt(), new Address4(cirdExample.endIp).bigInt());
|
|
185
|
+
expect(cird).toEqual(cirdExample.cidr);
|
|
186
|
+
});
|
|
187
|
+
});
|
|
188
|
+
//# sourceMappingURL=transformRule.unit.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transformRule.unit.test.js","sourceRoot":"","sources":["../../src/tests/transformRule.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { AccessRule } from "./rule.js";
|
|
2
|
+
import type { AccessRuleRecord } from "./ruleRecord.js";
|
|
3
|
+
export declare const makeAccessRuleHash: (rule: AccessRule) => string;
|
|
4
|
+
export declare const transformAccessRuleRecordIntoRule: (ruleRecord: AccessRuleRecord) => AccessRule;
|
|
5
|
+
export declare const transformAccessRuleIntoRecord: (rule: AccessRule) => AccessRuleRecord;
|
|
6
|
+
export declare const getCidrFromNumericIpRange: (startIp: bigint, endIp: bigint) => string | undefined;
|
|
7
|
+
//# sourceMappingURL=transformRule.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transformRule.d.ts","sourceRoot":"","sources":["../src/transformRule.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAO5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAIxD,eAAO,MAAM,kBAAkB,SAAU,UAAU,KAAG,MAYrD,CAAC;AAEF,eAAO,MAAM,iCAAiC,eACjC,gBAAgB,KAC1B,UAE+B,CAAC;AAEnC,eAAO,MAAM,6BAA6B,SACnC,UAAU,KACd,gBAAwD,CAAC;AAgE5D,eAAO,MAAM,yBAAyB,YAC5B,MAAM,SACR,MAAM,KACX,MAAM,GAAG,SASX,CAAC"}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import crypto from "node:crypto";
|
|
2
|
+
import { IpRange, IpAddress } from "cidr-calc";
|
|
3
|
+
import { Address4 } from "ip-address";
|
|
4
|
+
import { z } from "zod";
|
|
5
|
+
import { policyScopeInput, accessPolicyInput } from "./ruleInput/policyInput.js";
|
|
6
|
+
import { accessRuleInput } from "./ruleInput/ruleInput.js";
|
|
7
|
+
import { userScopeSchema } from "./ruleInput/userScopeInput.js";
|
|
8
|
+
const RULE_HASH_ALGORITHM = "md5";
|
|
9
|
+
const makeAccessRuleHash = (rule) => {
|
|
10
|
+
const valueProperties = Object.entries(rule).filter(
|
|
11
|
+
([key, value]) => "undefined" !== typeof value
|
|
12
|
+
);
|
|
13
|
+
const orderedProperties = valueProperties.sort();
|
|
14
|
+
const objectToHash = Object.fromEntries(orderedProperties);
|
|
15
|
+
return hashObject(objectToHash, RULE_HASH_ALGORITHM);
|
|
16
|
+
};
|
|
17
|
+
const transformAccessRuleRecordIntoRule = (ruleRecord) => (
|
|
18
|
+
// accessRuleInput does all the record field transformations
|
|
19
|
+
accessRuleInput.parse(ruleRecord)
|
|
20
|
+
);
|
|
21
|
+
const transformAccessRuleIntoRecord = (rule) => accessRuleToRecordScheme.parse(rule);
|
|
22
|
+
const accessRuleToRecordScheme = z.object({
|
|
23
|
+
...accessPolicyInput.shape,
|
|
24
|
+
...policyScopeInput.shape,
|
|
25
|
+
...userScopeSchema.shape,
|
|
26
|
+
groupId: z.coerce.string().optional()
|
|
27
|
+
}).transform((ruleInput) => {
|
|
28
|
+
const {
|
|
29
|
+
groupId,
|
|
30
|
+
numericIp,
|
|
31
|
+
numericIpMaskMin,
|
|
32
|
+
numericIpMaskMax,
|
|
33
|
+
userAgentHash,
|
|
34
|
+
...rule
|
|
35
|
+
} = ruleInput;
|
|
36
|
+
const record = rule;
|
|
37
|
+
if ("string" === typeof groupId) {
|
|
38
|
+
record.ruleGroupId = groupId;
|
|
39
|
+
}
|
|
40
|
+
if ("string" === typeof userAgentHash) {
|
|
41
|
+
record.userAgent = userAgentHash;
|
|
42
|
+
}
|
|
43
|
+
if ("bigint" === typeof numericIp) {
|
|
44
|
+
record.ip = getStringIpFromNumeric(numericIp);
|
|
45
|
+
}
|
|
46
|
+
if ("bigint" === typeof numericIpMaskMin && "bigint" === typeof numericIpMaskMax) {
|
|
47
|
+
record.ipMask = getCidrFromNumericIpRange(
|
|
48
|
+
numericIpMaskMin,
|
|
49
|
+
numericIpMaskMax
|
|
50
|
+
);
|
|
51
|
+
}
|
|
52
|
+
return record;
|
|
53
|
+
});
|
|
54
|
+
const hashObject = (object, algorithm) => crypto.createHash(algorithm).update(
|
|
55
|
+
JSON.stringify(
|
|
56
|
+
object,
|
|
57
|
+
(key, value) => (
|
|
58
|
+
// JSON.stringify can't handle BigInt itself: throws "Do not know how to serialize a BigInt"
|
|
59
|
+
"bigint" === typeof value ? value.toString() : value
|
|
60
|
+
)
|
|
61
|
+
)
|
|
62
|
+
).digest("hex");
|
|
63
|
+
const getStringIpFromNumeric = (numericIp) => Address4.fromInteger(Number(numericIp)).address;
|
|
64
|
+
const getCidrFromNumericIpRange = (startIp, endIp) => {
|
|
65
|
+
const ipRange = new IpRange(
|
|
66
|
+
IpAddress.of(getStringIpFromNumeric(startIp)),
|
|
67
|
+
IpAddress.of(getStringIpFromNumeric(endIp))
|
|
68
|
+
);
|
|
69
|
+
const cidr = ipRange.toCidrs()[0];
|
|
70
|
+
return cidr ? `${cidr.prefix.toString()}/${cidr.prefixLen}` : void 0;
|
|
71
|
+
};
|
|
72
|
+
export {
|
|
73
|
+
getCidrFromNumericIpRange,
|
|
74
|
+
makeAccessRuleHash,
|
|
75
|
+
transformAccessRuleIntoRecord,
|
|
76
|
+
transformAccessRuleRecordIntoRule
|
|
77
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transformRule.js","sourceRoot":"","sources":["../src/transformRule.ts"],"names":[],"mappings":"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"}
|
package/dist/util.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,aAAa,cAAe,MAAM,KAAG,MACU,CAAC"}
|
package/dist/util.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAaA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,SAAiB,EAAU,EAAE,CAC1D,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC"}
|
package/entries.ts
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
// Copyright 2021-2025 Prosopo (UK) Ltd.
|
|
2
|
+
//
|
|
3
|
+
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
// you may not use this file except in compliance with the License.
|
|
5
|
+
// You may obtain a copy of the License at
|
|
6
|
+
//
|
|
7
|
+
// http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
+
//
|
|
9
|
+
// Unless required by applicable law or agreed to in writing, software
|
|
10
|
+
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
+
// See the License for the specific language governing permissions and
|
|
13
|
+
// limitations under the License.
|
|
14
|
+
|
|
15
|
+
export const entries: Record<string, string> = {
|
|
16
|
+
".export": "src/.export.ts",
|
|
17
|
+
"api/.export": "src/api/.export.ts",
|
|
18
|
+
"redis/.export": "src/redis/.export.ts",
|
|
19
|
+
"mongoose/.export": "src/mongoose/.export.ts",
|
|
20
|
+
};
|
package/package.json
CHANGED
|
@@ -1,18 +1,31 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/user-access-policy",
|
|
3
|
-
"version": "3.5.
|
|
4
|
-
"main": "dist/index.js",
|
|
5
|
-
"types": "dist/index.d.ts",
|
|
3
|
+
"version": "3.5.27",
|
|
6
4
|
"type": "module",
|
|
7
5
|
"engines": {
|
|
8
|
-
"node": "
|
|
9
|
-
"npm": "10.
|
|
6
|
+
"node": ">=v20.0.0",
|
|
7
|
+
"npm": ">=10.6.0"
|
|
10
8
|
},
|
|
11
9
|
"exports": {
|
|
12
10
|
".": {
|
|
13
|
-
"types": "./dist
|
|
14
|
-
"import": "./dist
|
|
15
|
-
"require": "./dist/cjs
|
|
11
|
+
"types": "./dist/.export.d.ts",
|
|
12
|
+
"import": "./dist/.export.js",
|
|
13
|
+
"require": "./dist/cjs/.export.cjs"
|
|
14
|
+
},
|
|
15
|
+
"./api": {
|
|
16
|
+
"types": "./dist/api/.export.d.ts",
|
|
17
|
+
"import": "./dist/api/.export.js",
|
|
18
|
+
"require": "./dist/cjs/api/.export.cjs"
|
|
19
|
+
},
|
|
20
|
+
"./redis": {
|
|
21
|
+
"types": "./dist/redis/.export.d.ts",
|
|
22
|
+
"import": "./dist/redis/.export.js",
|
|
23
|
+
"require": "./dist/cjs/redis/.export.cjs"
|
|
24
|
+
},
|
|
25
|
+
"./mongoose": {
|
|
26
|
+
"types": "./dist/mongoose/.export.d.ts",
|
|
27
|
+
"import": "./dist/mongoose/.export.js",
|
|
28
|
+
"require": "./dist/cjs/mongoose/.export.cjs"
|
|
16
29
|
}
|
|
17
30
|
},
|
|
18
31
|
"imports": {
|
|
@@ -29,24 +42,27 @@
|
|
|
29
42
|
"test": "npm run test:unit && npm run test:integration"
|
|
30
43
|
},
|
|
31
44
|
"dependencies": {
|
|
32
|
-
"@prosopo/api": "3.1.
|
|
33
|
-
"@prosopo/api-route": "2.6.
|
|
34
|
-
"@prosopo/common": "3.1.
|
|
35
|
-
"@prosopo/redis-client": "1.0.
|
|
36
|
-
"@prosopo/types": "3.5.
|
|
37
|
-
"@prosopo/util": "3.1.
|
|
45
|
+
"@prosopo/api": "3.1.32",
|
|
46
|
+
"@prosopo/api-route": "2.6.29",
|
|
47
|
+
"@prosopo/common": "3.1.21",
|
|
48
|
+
"@prosopo/redis-client": "1.0.6",
|
|
49
|
+
"@prosopo/types": "3.5.11",
|
|
50
|
+
"@prosopo/util": "3.1.7",
|
|
38
51
|
"@redis/search": "5.0.0",
|
|
52
|
+
"@redis/client": "5.0.0",
|
|
53
|
+
"cidr-calc": "1.0.4",
|
|
39
54
|
"dotenv": "16.4.5",
|
|
40
55
|
"ip-address": "10.0.1",
|
|
41
56
|
"redis": "5.0.0",
|
|
42
57
|
"zod": "3.23.8"
|
|
43
58
|
},
|
|
44
59
|
"devDependencies": {
|
|
45
|
-
"@prosopo/config": "3.1.
|
|
46
|
-
"@prosopo/util-crypto": "13.5.
|
|
60
|
+
"@prosopo/config": "3.1.21",
|
|
61
|
+
"@prosopo/util-crypto": "13.5.23",
|
|
47
62
|
"@types/node": "22.10.2",
|
|
48
|
-
"
|
|
49
|
-
"
|
|
63
|
+
"mongoose": "8.13.0",
|
|
64
|
+
"vite": "6.4.1",
|
|
65
|
+
"vitest": "3.2.4",
|
|
50
66
|
"yargs": "17.7.2"
|
|
51
67
|
},
|
|
52
68
|
"author": "PROSOPO LIMITED <info@prosopo.io>",
|
package/vite.cjs.config.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import path from "node:path";
|
|
2
1
|
// Copyright 2021-2025 Prosopo (UK) Ltd.
|
|
3
2
|
//
|
|
4
3
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
@@ -12,11 +11,15 @@ import path from "node:path";
|
|
|
12
11
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
12
|
// See the License for the specific language governing permissions and
|
|
14
13
|
// limitations under the License.
|
|
14
|
+
|
|
15
|
+
import path from "node:path";
|
|
15
16
|
import { ViteCommonJSConfig } from "@prosopo/config";
|
|
17
|
+
import { entries } from "./entries.js";
|
|
16
18
|
|
|
17
19
|
export default function () {
|
|
18
20
|
return ViteCommonJSConfig(
|
|
19
21
|
path.basename("."),
|
|
20
22
|
path.resolve("./tsconfig.json"),
|
|
23
|
+
entries,
|
|
21
24
|
);
|
|
22
25
|
}
|
package/vite.esm.config.ts
CHANGED
|
@@ -14,7 +14,12 @@
|
|
|
14
14
|
|
|
15
15
|
import path from "node:path";
|
|
16
16
|
import { ViteEsmConfig } from "@prosopo/config";
|
|
17
|
+
import { entries } from "./entries.js";
|
|
17
18
|
|
|
18
19
|
export default function () {
|
|
19
|
-
return ViteEsmConfig(
|
|
20
|
+
return ViteEsmConfig(
|
|
21
|
+
path.basename("."),
|
|
22
|
+
path.resolve("./tsconfig.json"),
|
|
23
|
+
entries,
|
|
24
|
+
);
|
|
20
25
|
}
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
-
const api = require("@prosopo/api");
|
|
4
|
-
const accessRuleApiRoutes = require("./accessRuleApiRoutes.cjs");
|
|
5
|
-
class AccessRulesApiClient extends api.ApiClient {
|
|
6
|
-
insertMany(toInsert, timestamp, signature) {
|
|
7
|
-
return this.post(accessRuleApiRoutes.accessRuleApiPaths.INSERT_MANY, toInsert, {
|
|
8
|
-
headers: {
|
|
9
|
-
"Prosopo-Site-Key": this.account,
|
|
10
|
-
timestamp,
|
|
11
|
-
signature
|
|
12
|
-
}
|
|
13
|
-
});
|
|
14
|
-
}
|
|
15
|
-
deleteMany(toDelete, timestamp, signature) {
|
|
16
|
-
return this.post(accessRuleApiRoutes.accessRuleApiPaths.DELETE_MANY, toDelete, {
|
|
17
|
-
headers: {
|
|
18
|
-
"Prosopo-Site-Key": this.account,
|
|
19
|
-
timestamp,
|
|
20
|
-
signature
|
|
21
|
-
}
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
deleteAll(timestamp, signature) {
|
|
25
|
-
return this.post(
|
|
26
|
-
accessRuleApiRoutes.accessRuleApiPaths.DELETE_ALL,
|
|
27
|
-
{},
|
|
28
|
-
{
|
|
29
|
-
headers: {
|
|
30
|
-
"Prosopo-Site-Key": this.account,
|
|
31
|
-
timestamp,
|
|
32
|
-
signature
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
);
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
exports.AccessRulesApiClient = AccessRulesApiClient;
|