@prosopo/provider 3.12.14 → 3.13.0

package/dist/tests/integration/imgCaptcha.integration.test.js

@@ -1,272 +0,0 @@
-import { stringToU8a, u8aToHex } from "@polkadot/util";
-import { datasetWithSolutionHashes } from "@prosopo/datasets";
-import { generateMnemonic, getDefaultProviders, getPair, } from "@prosopo/keyring";
-import { ApiParams, CaptchaType, ClientApiPaths, } from "@prosopo/types";
-import { at, embedData } from "@prosopo/util";
-import { randomAsHex } from "@prosopo/util-crypto";
-import { beforeEach, describe, expect, it } from "vitest";
-import { dummyUserAccount } from "./mocks/solvedTestCaptchas.js";
-import { registerSiteKey } from "./registerSitekey.js";
-const solutions = datasetWithSolutionHashes;
-const baseUrl = "http://localhost:9229";
-const userAccount = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty";
-describe("Image Captcha Integration Tests", () => {
-    let dappAccount;
-    let mnemonic;
-    const adminPair = at(getDefaultProviders(), 0).pair;
-    beforeEach(async () => {
-        [mnemonic, dappAccount] = await generateMnemonic();
-        await registerSiteKey(dappAccount, CaptchaType.image, adminPair);
-    });
-    describe("GetImageCaptchaChallenge", () => {
-        it("should supply an image captcha challenge to a Dapp User", async () => {
-            const origin = "http://localhost";
-            const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
-            const getImgCaptchaBody = {
-                [ApiParams.dapp]: dappAccount,
-                [ApiParams.user]: userAccount,
-                [ApiParams.datasetId]: solutions.datasetId,
-            };
-            const response = await fetch(getImageCaptchaURL, {
-                method: "POST",
-                body: JSON.stringify(getImgCaptchaBody),
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": dappAccount,
-                    "Prosopo-User": userAccount,
-                },
-            });
-            console.log(response);
-            expect(response.status).toBe(200);
-            const data = await response.json();
-            expect(data).toHaveProperty("captchas");
-        });
-        it("should not supply an image captcha challenge to a Dapp User if the site key is not registered", async () => {
-            const origin = "http://localhost";
-            const [_mnemonic, unregisteredAccount] = await generateMnemonic();
-            const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
-            const body = {
-                [ApiParams.dapp]: unregisteredAccount,
-                [ApiParams.user]: userAccount,
-                [ApiParams.datasetId]: solutions.datasetId,
-            };
-            const response = await fetch(getImageCaptchaURL, {
-                method: "POST",
-                body: JSON.stringify(body),
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": unregisteredAccount,
-                    "Prosopo-User": userAccount,
-                },
-            });
-            expect(response.status).toBe(400);
-            const data = (await response.json());
-            expect(data).toHaveProperty("error");
-            expect(data.error?.message).toBe("Site key not registered");
-        });
-        it("should not supply an image captcha challenge to a Dapp User if an invalid site key is provided", async () => {
-            const invalidSiteKey = "junk";
-            const origin = "http://localhost";
-            const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
-            const body = {
-                [ApiParams.dapp]: invalidSiteKey,
-                [ApiParams.user]: userAccount,
-                [ApiParams.datasetId]: solutions.datasetId,
-            };
-            const response = await fetch(getImageCaptchaURL, {
-                method: "POST",
-                body: JSON.stringify(body),
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": invalidSiteKey,
-                    "Prosopo-User": userAccount,
-                },
-            });
-            const data = (await response.json());
-            expect(response.status).toBe(400);
-            expect(data).toHaveProperty("error");
-            expect(data.error?.message).toBe("Invalid site key");
-        });
-        it("should fail if datasetID is incorrect", async () => {
-            const datasetId = "thewrongdsetId";
-            const origin = "http://localhost";
-            const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
-            const body = {
-                [ApiParams.dapp]: dappAccount,
-                [ApiParams.user]: userAccount,
-                [ApiParams.datasetId]: datasetId,
-            };
-            const response = await fetch(getImageCaptchaURL, {
-                method: "POST",
-                body: JSON.stringify(body),
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": dappAccount,
-                    "Prosopo-User": userAccount,
-                },
-            });
-            expect(response.status).toBe(500);
-        });
-        it("should return an error if the captcha type is set to pow", async () => {
-            const origin = "http://localhost";
-            const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
-            const adminPair = at(getDefaultProviders(), 0).pair;
-            await registerSiteKey(dappAccount, CaptchaType.pow, adminPair);
-            const body = {
-                [ApiParams.dapp]: dappAccount,
-                [ApiParams.user]: userAccount,
-                [ApiParams.datasetId]: solutions.datasetId,
-            };
-            const response = await fetch(getImageCaptchaURL, {
-                method: "POST",
-                body: JSON.stringify(body),
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": dappAccount,
-                    "Prosopo-User": userAccount,
-                },
-            });
-            expect(response.status).toBe(400);
-            const data = (await response.json());
-            expect(data).toHaveProperty("error");
-            expect(data.error?.message).toBe("Incorrect CAPTCHA type");
-            expect(data.error?.code).toBe(400);
-        });
-        it("should return a translated error if the captcha type is set to pow and the language is set to es", async () => {
-            const origin = "http://localhost";
-            const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
-            const adminPair = at(getDefaultProviders(), 0).pair;
-            await registerSiteKey(dappAccount, CaptchaType.pow, adminPair);
-            const body = {
-                [ApiParams.dapp]: dappAccount,
-                [ApiParams.user]: userAccount,
-                [ApiParams.datasetId]: solutions.datasetId,
-            };
-            const response = await fetch(getImageCaptchaURL, {
-                method: "POST",
-                body: JSON.stringify(body),
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": dappAccount,
-                    "Prosopo-User": userAccount,
-                    "Accept-Language": "es",
-                },
-            });
-            expect(response.status).toBe(400);
-            const data = (await response.json());
-            expect(data).toHaveProperty("error");
-            expect(data.error?.message).toBe("Tipo di CAPTCHA errato");
-            expect(data.error?.code).toBe(400);
-        });
-    });
-    it("should return an error if the captcha type is set to frictionless and no sessionID is sent", async () => {
-        const origin = "http://localhost";
-        const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
-        const adminPair = at(getDefaultProviders(), 0).pair;
-        await registerSiteKey(dappAccount, CaptchaType.frictionless, adminPair);
-        const body = {
-            [ApiParams.dapp]: dappAccount,
-            [ApiParams.user]: userAccount,
-            [ApiParams.datasetId]: solutions.datasetId,
-        };
-        const response = await fetch(getImageCaptchaURL, {
-            method: "POST",
-            body: JSON.stringify(body),
-            headers: {
-                "Content-Type": "application/json",
-                Origin: origin,
-                "Prosopo-Site-Key": dappAccount,
-                "Prosopo-User": userAccount,
-            },
-        });
-        expect(response.status).toBe(400);
-        const data = (await response.json());
-        expect(data).toHaveProperty("error");
-        expect(data.error?.message).toBe("Incorrect CAPTCHA type");
-        expect(data.error?.code).toBe(400);
-    });
-    describe("SubmitImageCaptchaSolution", () => {
-        it("should verify a correctly completed image captcha as true", async () => {
-            const pair = getPair(dummyUserAccount.seed, undefined, "sr25519", 42);
-            const adminPair = at(getDefaultProviders(), 0).pair;
-            await registerSiteKey(pair.address, CaptchaType.image, adminPair);
-            const userAccount = dummyUserAccount.address;
-            const origin = "http://localhost";
-            const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
-            const getImgCaptchaBody = {
-                [ApiParams.dapp]: dappAccount,
-                [ApiParams.user]: userAccount,
-                [ApiParams.datasetId]: solutions.datasetId,
-            };
-            const response = await fetch(getImageCaptchaURL, {
-                method: "POST",
-                body: JSON.stringify(getImgCaptchaBody),
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": dappAccount,
-                    "Prosopo-User": userAccount,
-                },
-            });
-            expect(response.status).toBe(200);
-            const data = (await response.json());
-            const solvedCaptchas = datasetWithSolutionHashes.captchas.map((captcha, index) => ({
-                captchaContentId: captcha.captchaContentId,
-                solution: captcha.solution
-                    ? captcha.solution.map((s) => s.toString())
-                    : captcha.solution,
-                salt: embedData(randomAsHex(), [
-                    1 + index,
-                    2 + index,
-                    3 + index,
-                    4 + index,
-                ]),
-            }));
-            const temp = data.captchas.map((captcha) => {
-                const solvedCaptcha = solvedCaptchas.find((solvedCaptcha) => solvedCaptcha.captchaContentId === captcha.captchaContentId);
-                if (!solvedCaptcha || !solvedCaptcha.solution) {
-                    throw new Error("wtf?");
-                }
-                return {
-                    captchaContentId: captcha.captchaContentId,
-                    captchaId: captcha.captchaId,
-                    salt: solvedCaptcha.salt,
-                    solution: solvedCaptcha.solution,
-                };
-            });
-            const solveImgCaptchaBody = {
-                [ApiParams.captchas]: temp,
-                [ApiParams.dapp]: dappAccount,
-                [ApiParams.requestHash]: data.requestHash,
-                [ApiParams.signature]: {
-                    [ApiParams.user]: {
-                        [ApiParams.timestamp]: u8aToHex(pair.sign(stringToU8a(data.timestamp))),
-                    },
-                    [ApiParams.provider]: data[ApiParams.signature][ApiParams.provider],
-                },
-                [ApiParams.timestamp]: data.timestamp,
-                [ApiParams.user]: userAccount,
-            };
-            const solveThatCaptcha = await fetch(`${baseUrl}${ClientApiPaths.SubmitImageCaptchaSolution}`, {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": dappAccount,
-                    "Prosopo-User": userAccount,
-                },
-                body: JSON.stringify(solveImgCaptchaBody),
-            });
-            const jsonRes = await solveThatCaptcha.json();
-            const res = jsonRes;
-            expect(res.status).toBe("You correctly answered the captchas");
-        });
-    });
-});
-//# sourceMappingURL=imgCaptcha.integration.test.js.map

package/dist/tests/integration/imgCaptcha.integration.test.js.map

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

package/dist/tests/integration/ipValidation.integration.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ipValidation.integration.test.d.ts.map

package/dist/tests/integration/ipValidation.integration.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ipValidation.integration.test.d.ts","sourceRoot":"","sources":["../../../src/tests/integration/ipValidation.integration.test.ts"],"names":[],"mappings":""}

package/dist/tests/integration/ipValidation.integration.test.js

@@ -1,75 +0,0 @@
-import { datasetWithSolutionHashes } from "@prosopo/datasets";
-import { generateMnemonic, getDefaultProviders, getPair, } from "@prosopo/keyring";
-import { ApiParams, CaptchaType, ClientApiPaths, } from "@prosopo/types";
-import { at } from "@prosopo/util";
-import { randomAsHex } from "@prosopo/util-crypto";
-import { beforeEach, describe, expect, it } from "vitest";
-import { registerSiteKey } from "./registerSitekey.js";
-const baseUrl = "http://localhost:9229";
-const solutions = datasetWithSolutionHashes;
-describe("IP Validation Integration Tests", () => {
-    let siteKeyPair;
-    let siteKeyMnemonic;
-    let siteKey;
-    let userPair;
-    let userMnemonic;
-    let userId;
-    const adminPair = at(getDefaultProviders(), 0).pair;
-    beforeEach(async () => {
-        [siteKeyMnemonic, siteKey] = await generateMnemonic();
-        siteKeyPair = getPair(siteKeyMnemonic);
-        await registerSiteKey(siteKey, CaptchaType.frictionless, adminPair);
-        [userMnemonic, userId] = await generateMnemonic();
-        userPair = getPair(userMnemonic);
-    });
-    describe("Frictionless captcha with IP validation", () => {
-        it("should allow image captcha request from same IP after frictionless flow", async () => {
-            const origin = "http://localhost";
-            const initialIP = "127.0.0.1";
-            const getFrictionlessCaptchaUrl = `${baseUrl}${ClientApiPaths.GetFrictionlessCaptchaChallenge}`;
-            const getFrictionlessCaptchaBody = {
-                [ApiParams.dapp]: siteKey,
-                [ApiParams.token]: randomAsHex(16),
-                [ApiParams.user]: userId,
-                [ApiParams.headHash]: randomAsHex(16),
-            };
-            const responseFrictionless = await fetch(getFrictionlessCaptchaUrl, {
-                method: "POST",
-                body: JSON.stringify(getFrictionlessCaptchaBody),
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": siteKey,
-                    "Prosopo-User": userId,
-                    "User-Agent": randomAsHex(16),
-                    "X-Forwarded-For": initialIP,
-                },
-            });
-            expect(responseFrictionless.status).toBe(200);
-            const dataFrictionless = await responseFrictionless.json();
-            expect(dataFrictionless).toHaveProperty("sessionId");
-            const getImageCaptchaURL = `${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`;
-            const getImgCaptchaBody = {
-                [ApiParams.dapp]: siteKey,
-                [ApiParams.user]: userId,
-                [ApiParams.datasetId]: solutions.datasetId,
-                [ApiParams.sessionId]: dataFrictionless.sessionId,
-            };
-            const responseImage = await fetch(getImageCaptchaURL, {
-                method: "POST",
-                body: JSON.stringify(getImgCaptchaBody),
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": siteKey,
-                    "Prosopo-User": userId,
-                    "X-Forwarded-For": initialIP,
-                },
-            });
-            expect(responseImage.status).toBe(200);
-            const dataImage = await responseImage.json();
-            expect(dataImage).toHaveProperty("captchas");
-        });
-    });
-});
-//# sourceMappingURL=ipValidation.integration.test.js.map

package/dist/tests/integration/ipValidation.integration.test.js.map

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

package/dist/tests/integration/mocks/solvedTestCaptchas.d.ts

@@ -1,32 +0,0 @@
-import type { DatasetWithIdsAndTree } from "@prosopo/types";
-export declare const dummyUserAccount: {
-    address: string;
-    seed: string;
-};
-export declare const dummyDappAccount: {
-    address: string;
-    seed: string;
-};
-export declare const datasetWithSolutionHashes: DatasetWithIdsAndTree;
-export declare const datasetWithIndexSolutions: {
-    captchas: {
-        solution: number[] | undefined;
-        captchaId: string;
-        captchaContentId: string;
-        assetURI?: string;
-        datasetId?: string;
-        datasetContentId?: string;
-        unlabelled?: import("@prosopo/types").HashedSolution[] | import("@prosopo/types").RawSolution[];
-        salt: string;
-        items: import("@prosopo/types").HashedItem[];
-        target: string;
-        solved?: boolean;
-        timeLimitMs?: number;
-    }[];
-    contentTree: string[][];
-    datasetId: import("@prosopo/types").Hash;
-    datasetContentId: import("@prosopo/types").Hash;
-    format: import("@prosopo/types").CaptchaTypes;
-    solutionTree?: string[][];
-};
-//# sourceMappingURL=solvedTestCaptchas.d.ts.map

package/dist/tests/integration/mocks/solvedTestCaptchas.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"solvedTestCaptchas.d.ts","sourceRoot":"","sources":["../../../../src/tests/integration/mocks/solvedTestCaptchas.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE5D,eAAO,MAAM,gBAAgB;;;CAG5B,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;CAG5B,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAuiCjC,qBAAqB,CAAC;AAG3B,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;CASrC,CAAC"}