@prosopo/provider 5.19.4 → 5.20.1

package/dist/tests/unit/api/validateAddress.unit.test.js

@@ -1,141 +1,67 @@
-import { ProsopoApiError } from "@prosopo/common";
+import { isProsopoError } from "@prosopo/common";
 import { validateAddress } from "@prosopo/util-crypto";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { validateAddr, validateSiteKey } from "../../../api/validateAddress.js";
 vi.mock("@prosopo/util-crypto", () => ({
     validateAddress: vi.fn(),
 }));
+const address = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";
+const thrown = (fn) => {
+    try {
+        fn();
+    }
+    catch (err) {
+        return err;
+    }
+    throw new Error("expected a throw");
+};
+beforeEach(() => {
+    vi.clearAllMocks();
+});
 describe("validateSiteKey", () => {
-    let mockLogger;
-    beforeEach(() => {
-        vi.clearAllMocks();
-        mockLogger = {
-            error: vi.fn(),
-            info: vi.fn(),
-            debug: vi.fn(),
-            warn: vi.fn(),
-        };
-    });
-    it("should validate site key using validateAddr", () => {
-        const siteKey = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";
+    it("accepts a valid site key", () => {
         vi.mocked(validateAddress).mockReturnValue(true);
-        expect(() => validateSiteKey(siteKey, mockLogger)).not.toThrow();
-        expect(validateAddress).toHaveBeenCalledWith(siteKey, false, 42);
+        expect(() => validateSiteKey(address)).not.toThrow();
+        expect(validateAddress).toHaveBeenCalledWith(address, false, 42);
     });
-    it("should throw error for invalid site key", () => {
-        const invalidSiteKey = "invalid-site-key";
+    it("rejects an invalid site key as SITE_KEY_INVALID", () => {
         vi.mocked(validateAddress).mockReturnValue(false);
-        expect(() => validateSiteKey(invalidSiteKey, mockLogger)).toThrow(ProsopoApiError);
-        expect(validateAddress).toHaveBeenCalledWith(invalidSiteKey, false, 42);
-    });
-    it("should work without logger", () => {
-        const siteKey = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";
-        vi.mocked(validateAddress).mockReturnValue(true);
-        expect(() => validateSiteKey(siteKey)).not.toThrow();
-        expect(validateAddress).toHaveBeenCalledWith(siteKey, false, 42);
+        const err = thrown(() => validateSiteKey("invalid"));
+        expect(isProsopoError(err, "SITE_KEY_INVALID")).toBe(true);
     });
 });
 describe("validateAddr", () => {
-    let mockLogger;
-    beforeEach(() => {
-        vi.clearAllMocks();
-        mockLogger = {
-            error: vi.fn(),
-            info: vi.fn(),
-            debug: vi.fn(),
-            warn: vi.fn(),
-        };
-    });
-    it("should validate successfully for valid address", () => {
-        const validAddress = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";
+    it("accepts a valid address", () => {
         vi.mocked(validateAddress).mockReturnValue(true);
-        expect(() => validateAddr(validAddress, "CONTRACT.INVALID_ADDRESS", mockLogger)).not.toThrow();
-        expect(validateAddress).toHaveBeenCalledWith(validAddress, false, 42);
+        expect(() => validateAddr(address)).not.toThrow();
     });
-    it("should throw ProsopoApiError for invalid address", () => {
-        const invalidAddress = "invalid-address";
+    it("rejects an invalid address as INVALID_REQUEST by default", () => {
         vi.mocked(validateAddress).mockReturnValue(false);
-        expect(() => validateAddr(invalidAddress, "CONTRACT.INVALID_ADDRESS", mockLogger)).toThrow(ProsopoApiError);
-        try {
-            validateAddr(invalidAddress, "CONTRACT.INVALID_ADDRESS", mockLogger);
-        }
-        catch (error) {
-            expect(error).toBeInstanceOf(ProsopoApiError);
-            expect(error.context).toEqual({
-                code: 400,
-                siteKey: invalidAddress,
-            });
-        }
+        const err = thrown(() => validateAddr("invalid"));
+        if (!isProsopoError(err, "INVALID_REQUEST"))
+            throw err;
+        expect(err.errorSite).toBe("PROV-35");
+        expect(err.context.siteKey).toBe("invalid");
+        expect(err.cause).toBeUndefined();
     });
-    it("should use default translation key when not provided", () => {
-        const invalidAddress = "invalid-address";
+    it("uses the given code", () => {
         vi.mocked(validateAddress).mockReturnValue(false);
-        expect(() => validateAddr(invalidAddress)).toThrow(ProsopoApiError);
-        try {
-            validateAddr(invalidAddress);
-        }
-        catch (error) {
-            expect(error).toBeInstanceOf(ProsopoApiError);
-            expect(error.context).toEqual({
-                code: 400,
-                siteKey: invalidAddress,
-            });
-        }
+        expect(isProsopoError(thrown(() => validateAddr("x", "FORBIDDEN")), "FORBIDDEN")).toBe(true);
     });
-    it("should handle crypto validation throwing an error", () => {
-        const address = "some-address";
-        const cryptoError = new Error("Crypto validation failed");
+    it("keeps the validator's exception as the cause", () => {
+        const failure = new Error("bad checksum");
         vi.mocked(validateAddress).mockImplementation(() => {
-            throw cryptoError;
+            throw failure;
         });
-        expect(() => validateAddr(address, "CONTRACT.INVALID_ADDRESS", mockLogger)).toThrow(ProsopoApiError);
-        try {
-            validateAddr(address, "CONTRACT.INVALID_ADDRESS", mockLogger);
-        }
-        catch (error) {
-            expect(error).toBeInstanceOf(ProsopoApiError);
-            expect(error.context).toEqual({
-                code: 400,
-                siteKey: address,
-            });
-        }
-    });
-    it("should work without logger parameter", () => {
-        const validAddress = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";
-        vi.mocked(validateAddress).mockReturnValue(true);
-        expect(() => validateAddr(validAddress)).not.toThrow();
-        expect(validateAddress).toHaveBeenCalledWith(validAddress, false, 42);
+        const err = thrown(() => validateAddr("invalid"));
+        if (!isProsopoError(err))
+            throw err;
+        expect(err.cause).toBe(failure);
     });
-    it("should validate with different translation keys", () => {
-        const invalidAddress = "invalid-address";
-        const customTranslationKey = "API.INVALID_SITE_KEY";
+    it("handles an empty address", () => {
         vi.mocked(validateAddress).mockReturnValue(false);
-        expect(() => validateAddr(invalidAddress, customTranslationKey, mockLogger)).toThrow(ProsopoApiError);
-        expect(validateAddress).toHaveBeenCalledWith(invalidAddress, false, 42);
-    });
-    it("should handle empty address string", () => {
-        const emptyAddress = "";
-        vi.mocked(validateAddress).mockReturnValue(false);
-        expect(() => validateAddr(emptyAddress, "CONTRACT.INVALID_ADDRESS", mockLogger)).toThrow(ProsopoApiError);
-        expect(validateAddress).toHaveBeenCalledWith(emptyAddress, false, 42);
-    });
-    it("should handle null address", () => {
-        const nullAddress = null;
-        vi.mocked(validateAddress).mockReturnValue(false);
-        expect(() => validateAddr(nullAddress, "CONTRACT.INVALID_ADDRESS", mockLogger)).toThrow(ProsopoApiError);
-        expect(validateAddress).toHaveBeenCalledWith(nullAddress, false, 42);
-    });
-    it("should validate hex addresses", () => {
-        const hexAddress = "0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d";
-        vi.mocked(validateAddress).mockReturnValue(true);
-        expect(() => validateAddr(hexAddress, "CONTRACT.INVALID_ADDRESS", mockLogger)).not.toThrow();
-        expect(validateAddress).toHaveBeenCalledWith(hexAddress, false, 42);
-    });
-    it("should validate base58 addresses", () => {
-        const base58Address = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty";
-        vi.mocked(validateAddress).mockReturnValue(true);
-        expect(() => validateAddr(base58Address, "CONTRACT.INVALID_ADDRESS", mockLogger)).not.toThrow();
-        expect(validateAddress).toHaveBeenCalledWith(base58Address, false, 42);
+        expect(isProsopoError(thrown(() => validateAddr("")))).toBe(true);
+        expect(validateAddress).toHaveBeenCalledWith("", false, 42);
     });
 });
 //# sourceMappingURL=validateAddress.unit.test.js.map

package/dist/tests/unit/api/validateAddress.unit.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateAddress.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/validateAddress.unit.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEhF,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACtC,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;CACxB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAChC,IAAI,UAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACf,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,UAAU,GAAG;YACZ,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;YACd,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;YACb,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;YACd,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;SACQ,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACtD,MAAM,OAAO,GAAG,kDAAkD,CAAC;QAEnE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACjE,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QAClD,MAAM,cAAc,GAAG,kBAAkB,CAAC;QAE1C,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElD,MAAM,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAChE,eAAe,CACf,CAAC;QACF,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACrC,MAAM,OAAO,GAAG,kDAAkD,CAAC;QAEnE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACrD,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,IAAI,UAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACf,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,UAAU,GAAG;YACZ,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;YACd,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;YACb,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;YACd,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;SACQ,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACzD,MAAM,YAAY,GAAG,kDAAkD,CAAC;QAExE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,EAAE,CACX,YAAY,CAAC,YAAY,EAAE,0BAA0B,EAAE,UAAU,CAAC,CAClE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC3D,MAAM,cAAc,GAAG,iBAAiB,CAAC;QAEzC,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElD,MAAM,CAAC,GAAG,EAAE,CACX,YAAY,CAAC,cAAc,EAAE,0BAA0B,EAAE,UAAU,CAAC,CACpE,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAE3B,IAAI,CAAC;YACJ,YAAY,CAAC,cAAc,EAAE,0BAA0B,EAAE,UAAU,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YAC9C,MAAM,CAAE,KAAyB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBAClD,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,cAAc;aACvB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC/D,MAAM,cAAc,GAAG,iBAAiB,CAAC;QAEzC,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElD,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAEpE,IAAI,CAAC;YACJ,YAAY,CAAC,cAAc,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YAC9C,MAAM,CAAE,KAAyB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBAClD,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,cAAc;aACvB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC5D,MAAM,OAAO,GAAG,cAAc,CAAC;QAC/B,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAE1D,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE;YAClD,MAAM,WAAW,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,EAAE,CACX,YAAY,CAAC,OAAO,EAAE,0BAA0B,EAAE,UAAU,CAAC,CAC7D,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAE3B,IAAI,CAAC;YACJ,YAAY,CAAC,OAAO,EAAE,0BAA0B,EAAE,UAAU,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YAC9C,MAAM,CAAE,KAAyB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBAClD,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,OAAO;aAChB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC/C,MAAM,YAAY,GAAG,kDAAkD,CAAC;QAExE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACvD,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QAC1D,MAAM,cAAc,GAAG,iBAAiB,CAAC;QACzC,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;QAEpD,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElD,MAAM,CAAC,GAAG,EAAE,CACX,YAAY,CAAC,cAAc,EAAE,oBAAoB,EAAE,UAAU,CAAC,CAC9D,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3B,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC7C,MAAM,YAAY,GAAG,EAAE,CAAC;QAExB,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElD,MAAM,CAAC,GAAG,EAAE,CACX,YAAY,CAAC,YAAY,EAAE,0BAA0B,EAAE,UAAU,CAAC,CAClE,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3B,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAErC,MAAM,WAAW,GAAG,IAAW,CAAC;QAEhC,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAElD,MAAM,CAAC,GAAG,EAAE,CACX,YAAY,CAAC,WAAW,EAAE,0BAA0B,EAAE,UAAU,CAAC,CACjE,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3B,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACxC,MAAM,UAAU,GACf,oEAAoE,CAAC;QAEtE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,EAAE,CACX,YAAY,CAAC,UAAU,EAAE,0BAA0B,EAAE,UAAU,CAAC,CAChE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC3C,MAAM,aAAa,GAAG,kDAAkD,CAAC;QAEzE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,EAAE,CACX,YAAY,CAAC,aAAa,EAAE,0BAA0B,EAAE,UAAU,CAAC,CACnE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"validateAddress.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/validateAddress.unit.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/unit/api/verifyMalformedToken.unit.test.js

@@ -78,11 +78,11 @@ describe("verify routes reject a malformed token with 400, not 500", () => {
         ["authenticated", ClientApiPaths.VerifyAuthenticatedSession],
     ];
     for (const [name, path] of routes) {
-        it(`${name}: undecodable token -> 400 CAPTCHA.PARSE_ERROR`, async () => {
+        it(`${name}: undecodable token -> 400 INVALID_REQUEST`, async () => {
             const { status, body } = await callRoute(path, malformedBody);
             expect(status).toBe(400);
-            expect(body?.error?.code).toBe(400);
-            expect(body?.error?.key).toBe("CAPTCHA.PARSE_ERROR");
+            expect(body?.error?.status).toBe(400);
+            expect(body?.error?.errorId).toBe("INVALID_REQUEST:PROV-37");
         });
     }
 });

package/dist/tests/unit/api/verifyMalformedToken.unit.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyMalformedToken.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/verifyMalformedToken.unit.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verifyMalformedToken.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/api/verifyMalformedToken.unit.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/unit/tasks/captchaManager.unit.test.js

@@ -1341,7 +1341,7 @@ describe("CaptchaManager", () => {
         });
         it("should return undefined when there are no matching policies", async () => {
             vi.spyOn(captchaManager, "getPrioritisedAccessPolicies").mockResolvedValue([]);
-            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders);
+            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders, undefined);
             expect(result).toBeUndefined();
         });
         it("should return undefined for a Block policy that has a captchaType (captcha-type selector, not hard block)", async () => {
@@ -1350,7 +1350,7 @@ describe("CaptchaManager", () => {
                 captchaType: CaptchaType.image,
             };
             vi.spyOn(captchaManager, "getPrioritisedAccessPolicies").mockResolvedValue([blockWithCaptchaType]);
-            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders);
+            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders, undefined);
             expect(result).toBeUndefined();
         });
         it("should return the policy for a Block policy without a captchaType (hard block)", async () => {
@@ -1359,7 +1359,7 @@ describe("CaptchaManager", () => {
                 description: "hard block",
             };
             vi.spyOn(captchaManager, "getPrioritisedAccessPolicies").mockResolvedValue([hardBlockPolicy]);
-            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders);
+            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders, undefined);
             expect(result).toEqual(hardBlockPolicy);
         });
         it("should return undefined for a Restrict policy without captchaType (not a Block policy)", async () => {
@@ -1367,7 +1367,7 @@ describe("CaptchaManager", () => {
                 type: AccessPolicyType.Restrict,
             };
             vi.spyOn(captchaManager, "getPrioritisedAccessPolicies").mockResolvedValue([restrictPolicy]);
-            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders);
+            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders, undefined);
             expect(result).toBeUndefined();
         });
         it("should return the policy for a Block policy with deferToVerify=true AND captchaType (verify-time hard block)", async () => {
@@ -1377,7 +1377,7 @@ describe("CaptchaManager", () => {
                 deferToVerify: true,
             };
             vi.spyOn(captchaManager, "getPrioritisedAccessPolicies").mockResolvedValue([deferBlock]);
-            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders);
+            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders, undefined);
             expect(result).toEqual(deferBlock);
         });
         it("should return the policy for a Block policy with deferToVerify=true AND no captchaType", async () => {
@@ -1386,7 +1386,7 @@ describe("CaptchaManager", () => {
                 deferToVerify: true,
             };
             vi.spyOn(captchaManager, "getPrioritisedAccessPolicies").mockResolvedValue([deferBlockNoType]);
-            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders);
+            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders, undefined);
             expect(result).toEqual(deferBlockNoType);
         });
         it("should return the policy for Restrict + deferToVerify=true (verify-time hard block after serving captcha)", async () => {
@@ -1397,7 +1397,7 @@ describe("CaptchaManager", () => {
                 deferToVerify: true,
             };
             vi.spyOn(captchaManager, "getPrioritisedAccessPolicies").mockResolvedValue([restrictDefer]);
-            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders);
+            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders, undefined);
             expect(result).toEqual(restrictDefer);
         });
         it("should return undefined for Restrict without deferToVerify (routing rules are not hard blocks)", async () => {
@@ -1407,7 +1407,7 @@ describe("CaptchaManager", () => {
                 solvedImagesCount: 4,
             };
             vi.spyOn(captchaManager, "getPrioritisedAccessPolicies").mockResolvedValue([restrictRoute]);
-            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders);
+            const result = await captchaManager.checkForHardBlock({}, mockChallengeRecord, "userAccount", mockHeaders, undefined);
             expect(result).toBeUndefined();
         });
     });
@@ -1425,39 +1425,43 @@ describe("CaptchaManager", () => {
             isCrawler: false,
             ...overrides,
         });
-        const mkEnvWithIpLookup = (ipLookup) => ({
-            config: {},
-            ipInfoService: { lookup: ipLookup },
-        });
         it("blocks a datacenter IP at verify time when the site configures datacenter:{action:block}", async () => {
-            const check = await captchaManager.resolveTrafficFilterCheck(mkEnvWithIpLookup(() => Promise.resolve(ipInfoResponse({ isDatacenter: true, providerType: "hosting" }))), undefined, { datacenter: { action: TrafficFilterAction.Block } }, "1.2.3.4");
+            const check = await captchaManager.resolveTrafficFilterCheck(undefined, { datacenter: { action: TrafficFilterAction.Block } }, ipInfoResponse({ isDatacenter: true, providerType: "hosting" }));
             expect(check.isBlocked).toBe(true);
             if (check.isBlocked) {
                 expect(check.reason).toBe(ResultReason.DATACENTER_BLOCKED);
             }
         });
         it("does NOT block at verify time when the operator configured datacenter:{action:challenge} — challenge is a request-time concern", async () => {
-            const check = await captchaManager.resolveTrafficFilterCheck(mkEnvWithIpLookup(() => Promise.resolve(ipInfoResponse({ isDatacenter: true, providerType: "hosting" }))), undefined, {
+            const check = await captchaManager.resolveTrafficFilterCheck(undefined, {
                 datacenter: {
                     action: TrafficFilterAction.Challenge,
                     captchaType: CaptchaType.image,
                 },
-            }, "1.2.3.4");
+            }, ipInfoResponse({ isDatacenter: true, providerType: "hosting" }));
             expect(check.isBlocked).toBe(false);
         });
         it("applies the abuser default at verify time even when the operator did not configure it (protects unconfigured sites)", async () => {
-            const check = await captchaManager.resolveTrafficFilterCheck(mkEnvWithIpLookup(() => Promise.resolve(ipInfoResponse({
+            const check = await captchaManager.resolveTrafficFilterCheck(undefined, {}, ipInfoResponse({
                 isAbuser: true,
                 abuserScore: 0.9,
                 companyAbuserScore: 0.9,
-            }))), undefined, {}, "1.2.3.4");
+            }));
             expect(check.isBlocked).toBe(true);
             if (check.isBlocked) {
                 expect(check.reason).toBe(ResultReason.ABUSER_BLOCKED);
             }
         });
         it("passes when no category is active and the abuser default doesn't match (clean IP)", async () => {
-            const check = await captchaManager.resolveTrafficFilterCheck(mkEnvWithIpLookup(() => Promise.resolve(ipInfoResponse())), undefined, {}, "1.2.3.4");
+            const check = await captchaManager.resolveTrafficFilterCheck(undefined, {}, ipInfoResponse());
+            expect(check.isBlocked).toBe(false);
+        });
+        it("falls back to the record's ip info when the site sent no current ip", async () => {
+            const check = await captchaManager.resolveTrafficFilterCheck(ipInfoResponse({ isDatacenter: true, providerType: "hosting" }), { datacenter: { action: TrafficFilterAction.Block } }, undefined);
+            expect(check.isBlocked).toBe(true);
+        });
+        it("filters on the current ip info over the record's", async () => {
+            const check = await captchaManager.resolveTrafficFilterCheck(ipInfoResponse({ isDatacenter: true, providerType: "hosting" }), { datacenter: { action: TrafficFilterAction.Block } }, ipInfoResponse());
             expect(check.isBlocked).toBe(false);
         });
     });