npm - @prosopo/provider - Versions diffs - 5.3.9 → 5.3.10 - Mend

@prosopo/provider 5.3.9 → 5.3.10

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.

Files changed (7) hide show

package/.turbo/turbo-build$colon$cjs.log +2 -2
package/.turbo/turbo-build$colon$tsc.log +25 -25
package/.turbo/turbo-build.log +3 -3
package/CHANGELOG.md +34 -0
package/dist/tests/integration/imgCaptcha.integration.test.js +146 -240
package/dist/tests/integration/imgCaptcha.integration.test.js.map +1 -1
package/package.json +24 -24

package/.turbo/turbo-build$colon$cjs.log CHANGED Viewed

@@ -1,5 +1,5 @@
-> @prosopo/provider@5.3.9 build:cjs
+> @prosopo/provider@5.3.10 build:cjs
 > NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV
 ViteCommonJSConfig: .
@@ -162,7 +162,7 @@ dist/cjs/tasks/detection/decodeBehavior.cjs                                   32
 dist/cjs/tasks/detection/decodeSimd.cjs                                       36.03 kB │ gzip: 11.96 kB
 dist/cjs/tasks/detection/decodePayload.cjs                                    49.79 kB │ gzip: 16.98 kB
-[32m✓ built in 166ms[39m
+[32m✓ built in 156ms[39m
 [copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodeBehavior.js to /home/runner/work/captcha/captcha/packages/provider/dist/cjs/tasks/detection/decodeBehavior.js
 [copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodePayload.js to /home/runner/work/captcha/captcha/packages/provider/dist/cjs/tasks/detection/decodePayload.js
 [copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodeSimd.js to /home/runner/work/captcha/captcha/packages/provider/dist/cjs/tasks/detection/decodeSimd.js

package/.turbo/turbo-build$colon$tsc.log CHANGED Viewed

@@ -1,8 +1,8 @@
-> @prosopo/provider@5.3.9 build:tsc
+> @prosopo/provider@5.3.10 build:tsc
 > tsc --build --verbose
-1:28:39 PM - Projects in this build:
+10:10:56 PM - Projects in this build:
     * ../../dev/config/tsconfig.json
     * ../util/tsconfig.json
     * ../logger/tsconfig.json
@@ -26,49 +26,49 @@
     * ../puzzle-assets/tsconfig.json
     * tsconfig.json
-1:28:39 PM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/webpack/webpack.config.ts' is older than output '../../dev/config/tsconfig.tsbuildinfo'
+10:10:56 PM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/webpack/webpack.config.ts' is older than output '../../dev/config/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/tsconfig.tsbuildinfo'
+10:10:56 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/tests/loggerBrowser.unit.test.ts' is older than output '../logger/tsconfig.tsbuildinfo'
+10:10:56 PM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/index.ts' is older than output '../logger/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../api-route/tsconfig.json' is up to date because newest input '../api-route/src/index.ts' is older than output '../api-route/tsconfig.tsbuildinfo'
+10:10:56 PM - Project '../api-route/tsconfig.json' is up to date because newest input '../api-route/src/apiRoutes.ts' is older than output '../api-route/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/tsconfig.tsbuildinfo'
+10:10:56 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/tsconfig.tsbuildinfo'
+10:10:56 PM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/types.test-d.ts' is older than output '../types/tsconfig.tsbuildinfo'
+10:10:56 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/types.test-d.ts' is older than output '../types/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/error.ts' is older than output '../common/tsconfig.tsbuildinfo'
+10:10:56 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/error.ts' is older than output '../common/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../ipinfo/tsconfig.json' is up to date because newest input '../ipinfo/src/IpInfoService.ts' is older than output '../ipinfo/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../ipinfo/tsconfig.json' is up to date because newest input '../ipinfo/src/IpInfoService.ts' is older than output '../ipinfo/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../redis-client/tsconfig.json' is up to date because newest input '../redis-client/src/redisClient.ts' is older than output '../redis-client/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../redis-client/tsconfig.json' is up to date because newest input '../redis-client/src/index.ts' is older than output '../redis-client/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/tests/apiHarness.ts' is older than output '../api/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/index.ts' is older than output '../api/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../user-access-policy/tsconfig.json' is up to date because newest input '../user-access-policy/src/transformRule.ts' is older than output '../user-access-policy/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../user-access-policy/tsconfig.json' is up to date because newest input '../user-access-policy/src/transformRule.ts' is older than output '../user-access-policy/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../types-database/tsconfig.json' is up to date because newest input '../types-database/src/types/captcha.ts' is older than output '../types-database/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../types-database/tsconfig.json' is up to date because newest input '../types-database/src/types.test-d.ts' is older than output '../types-database/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../database/tsconfig.json' is up to date because newest input '../database/src/tests/unit/redisCacheEscalation.unit.test.ts' is older than output '../database/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../database/tsconfig.json' is up to date because newest input '../database/src/tests/mongoGlobalSetup.ts' is older than output '../database/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../keyring/tsconfig.json' is up to date because newest input '../keyring/src/pair/decode.ts' is older than output '../keyring/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../keyring/tsconfig.json' is up to date because newest input '../keyring/src/keyring/keyring.test.ts' is older than output '../keyring/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../types-env/tsconfig.json' is up to date because newest input '../types-env/src/index.ts' is older than output '../types-env/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../types-env/tsconfig.json' is up to date because newest input '../types-env/src/env.ts' is older than output '../types-env/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../env/tsconfig.json' is up to date because newest input '../env/src/env.ts' is older than output '../env/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../env/tsconfig.json' is up to date because newest input '../env/src/env.ts' is older than output '../env/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../api-express-router/tsconfig.json' is up to date because newest input '../api-express-router/src/tests/unit/testDoubles.ts' is older than output '../api-express-router/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../api-express-router/tsconfig.json' is up to date because newest input '../api-express-router/src/middlewares/requestLoggerMiddleware.ts' is older than output '../api-express-router/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../datasets/tsconfig.json' is up to date because newest input '../datasets/src/index.ts' is older than output '../datasets/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../datasets/tsconfig.json' is up to date because newest input '../datasets/src/tests/dataset.unit.test.ts' is older than output '../datasets/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../load-balancer/tsconfig.json' is up to date because newest input '../load-balancer/src/tests/providers.unit.test.ts' is older than output '../load-balancer/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../load-balancer/tsconfig.json' is up to date because newest input '../load-balancer/src/index.ts' is older than output '../load-balancer/tsconfig.tsbuildinfo'
-1:28:39 PM - Project '../puzzle-assets/tsconfig.json' is up to date because newest input '../puzzle-assets/src/compose.ts' is older than output '../puzzle-assets/tsconfig.tsbuildinfo'
+10:10:57 PM - Project '../puzzle-assets/tsconfig.json' is up to date because newest input '../puzzle-assets/src/background.ts' is older than output '../puzzle-assets/tsconfig.tsbuildinfo'
-1:28:39 PM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
+10:10:57 PM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
-1:28:39 PM - Building project '/home/runner/work/captcha/captcha/packages/provider/tsconfig.json'...
+10:10:57 PM - Building project '/home/runner/work/captcha/captcha/packages/provider/tsconfig.json'...

package/.turbo/turbo-build.log CHANGED Viewed

@@ -1,9 +1,9 @@
-> @prosopo/provider@5.3.9 build
+> @prosopo/provider@5.3.10 build
 > npm run build:cross-env -- --mode ${NODE_ENV:-development}
-> @prosopo/provider@5.3.9 build:cross-env
+> @prosopo/provider@5.3.10 build:cross-env
 > vite build --config vite.esm.config.ts --mode production
 ViteEsmConfig: .
@@ -166,7 +166,7 @@ dist/tasks/detection/decodeBehavior.js                                   32.26 k
 dist/tasks/detection/decodeSimd.js                                       36.06 kB │ gzip: 12.00 kB
 dist/tasks/detection/decodePayload.js                                    49.69 kB │ gzip: 16.96 kB
-[32m✓ built in 144ms[39m
+[32m✓ built in 128ms[39m
 [copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodeBehavior.js to /home/runner/work/captcha/captcha/packages/provider/dist/tasks/detection/decodeBehavior.js
 [copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodePayload.js to /home/runner/work/captcha/captcha/packages/provider/dist/tasks/detection/decodePayload.js
 [copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodeSimd.js to /home/runner/work/captcha/captcha/packages/provider/dist/tasks/detection/decodeSimd.js

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,39 @@
 # @prosopo/provider
+## 5.3.10
+### Patch Changes
+- 68a9b41: chore(deps): bump the npm-minor-and-patch group across 1 directory with 36 updates
+- f850d07: chore(deps): bump body-parser and express
+- 4cd6b04: Extend the failed image captcha integration test to assert the dapp verifies the challenge as disapproved, and add a test that a successful challenge still works after a failed one
+- Updated dependencies [a2f4b13]
+- Updated dependencies [68a9b41]
+- Updated dependencies [68a9b41]
+- Updated dependencies [f850d07]
+- Updated dependencies [ce5a3d7]
+- Updated dependencies [a9c0406]
+- Updated dependencies [179a2b0]
+- Updated dependencies [9bf4570]
+  - @prosopo/database@4.0.18
+  - @prosopo/locale@3.3.1
+  - @prosopo/types@5.2.6
+  - @prosopo/user-access-policy@3.12.25
+  - @prosopo/util@3.3.7
+  - @prosopo/ipinfo@0.3.15
+  - @prosopo/api-express-router@3.1.72
+  - @prosopo/puzzle-assets@0.1.3
+  - @prosopo/env@3.6.41
+  - @prosopo/api@4.0.14
+  - @prosopo/api-route@2.6.56
+  - @prosopo/common@3.1.51
+  - @prosopo/datasets@3.1.70
+  - @prosopo/keyring@2.9.77
+  - @prosopo/load-balancer@2.10.31
+  - @prosopo/logger@2.0.7
+  - @prosopo/redis-client@1.0.33
+  - @prosopo/types-database@5.1.11
+  - @prosopo/types-env@2.10.36
 ## 5.3.9
 ### Patch Changes

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

@@ -1,5 +1,5 @@
 import { stringToU8a, u8aToHex } from "@polkadot/util";
-import { buildDataset, datasetWithSolutionHashes } from "@prosopo/datasets";
+import { CaptchaMerkleTree, buildDataset, computeCaptchaSolutionHash, datasetWithSolutionHashes, parseAndSortCaptchaSolutions, } from "@prosopo/datasets";
 import { ProviderEnvironment } from "@prosopo/env";
 import { generateMnemonic, getPair } from "@prosopo/keyring";
 import { Tasks, isTlsAvailable, startProviderApi } from "@prosopo/provider";
@@ -12,6 +12,7 @@ import { dummyUserAccount } from "./mocks/solvedTestCaptchas.js";
 import { reservePort } from "./testUtils.js";
 const solutions = datasetWithSolutionHashes;
 const userAccount = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty";
+const origin = "https://localhost";
 async function registerSiteKeyInDb(env, siteKey, captchaType) {
     const tasks = new Tasks(env);
     await tasks.clientTaskManager.registerSiteKey(siteKey, Tier.Free, ClientSettingsSchema.parse({
@@ -32,6 +33,117 @@ describe("Image Captcha Integration Tests", () => {
     let testPort;
     let baseUrl;
     let builtDataset;
+    const getCaptchaInfo = () => new Map(builtDataset.captchas
+        .filter((captcha) => captcha.solution)
+        .map((captcha) => [
+        captcha.captchaContentId,
+        {
+            solution: captcha.solution?.map((s) => s.toString()) ?? [],
+            itemHashes: captcha.items.map((item) => item.hash),
+        },
+    ]));
+    const requestChallenge = async (siteKey, user) => {
+        const body = {
+            [ApiParams.dapp]: siteKey,
+            [ApiParams.user]: user,
+            [ApiParams.datasetId]: solutions.datasetId,
+        };
+        const response = await fetch(`${baseUrl}${ClientApiPaths.GetImageCaptchaChallenge}`, {
+            method: "POST",
+            body: JSON.stringify(body),
+            headers: {
+                "Content-Type": "application/json",
+                Origin: origin,
+                "Prosopo-Site-Key": siteKey,
+                "Prosopo-User": user,
+            },
+        });
+        expect(response.status).toBe(200);
+        return (await response.json());
+    };
+    const buildSolution = (challenge, siteKey, user, userPair, answer) => {
+        const captchaInfo = getCaptchaInfo();
+        return {
+            [ApiParams.captchas]: challenge.captchas.map((captcha, index) => {
+                const info = captchaInfo.get(captcha.captchaContentId);
+                if (!info) {
+                    throw new Error(`Captcha info not found for captchaContentId: ${captcha.captchaContentId}`);
+                }
+                return {
+                    captchaContentId: captcha.captchaContentId,
+                    captchaId: captcha.captchaId,
+                    salt: embedData(randomAsHex(), [
+                        1 + index,
+                        2 + index,
+                        3 + index,
+                        4 + index,
+                    ]),
+                    solution: answer === "correct"
+                        ? info.solution
+                        : info.itemHashes.filter((hash) => !info.solution.includes(hash)),
+                };
+            }),
+            [ApiParams.dapp]: siteKey,
+            [ApiParams.requestHash]: challenge.requestHash,
+            [ApiParams.signature]: {
+                [ApiParams.user]: {
+                    [ApiParams.timestamp]: u8aToHex(userPair.sign(stringToU8a(challenge.timestamp))),
+                },
+                [ApiParams.provider]: challenge[ApiParams.signature][ApiParams.provider],
+            },
+            [ApiParams.timestamp]: challenge.timestamp,
+            [ApiParams.user]: user,
+        };
+    };
+    const submitSolution = async (solution, siteKey, user) => {
+        const response = await fetch(`${baseUrl}${ClientApiPaths.SubmitImageCaptchaSolution}`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Origin: origin,
+                "Prosopo-Site-Key": siteKey,
+                "Prosopo-User": user,
+            },
+            body: JSON.stringify(solution),
+        });
+        expect(response.status).toBe(200);
+        return (await response.json());
+    };
+    const getCommitmentId = (solution) => {
+        const tree = new CaptchaMerkleTree();
+        tree.build(parseAndSortCaptchaSolutions(solution[ApiParams.captchas]).map((captcha) => computeCaptchaSolutionHash(captcha)));
+        return tree.getRoot().hash;
+    };
+    const dappVerify = async (siteKey, siteKeyMnemonic, user, commitmentId) => {
+        const dappPair = getPair(siteKeyMnemonic);
+        const verifyTimestamp = Date.now().toString();
+        const token = encodeProcaptchaOutput({
+            [ApiParams.dapp]: siteKey,
+            [ApiParams.user]: user,
+            ...(commitmentId ? { [ApiParams.commitmentId]: commitmentId } : {}),
+            [ApiParams.timestamp]: verifyTimestamp,
+            [ApiParams.signature]: {
+                [ApiParams.provider]: {},
+                [ApiParams.user]: {},
+            },
+        });
+        const verifyBody = {
+            [ApiParams.token]: token,
+            [ApiParams.dappSignature]: u8aToHex(dappPair.sign(stringToU8a(verifyTimestamp))),
+        };
+        const response = await fetch(`${baseUrl}${ClientApiPaths.VerifyImageCaptchaSolutionDapp}`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Origin: origin,
+                "Prosopo-Site-Key": siteKey,
+                "Prosopo-User": user,
+            },
+            body: JSON.stringify(verifyBody),
+        });
+        expect(response.status).toBe(200);
+        return (await response.json());
+    };
     beforeAll(async () => {
         testPort = await reservePort();
         const protocol = isTlsAvailable() ? "https" : "http";
@@ -334,258 +446,52 @@ describe("Image Captcha Integration Tests", () => {
         expect(data.error?.code).toBe(400);
     });
     describe("SubmitImageCaptchaSolution", () => {
+        const getUser = () => ({
+            pair: getPair(dummyUserAccount.seed, undefined, "sr25519", 42),
+            userAccount: dummyUserAccount.address,
+        });
         it("should verify a correctly completed image captcha as true", async () => {
-            const pair = getPair(dummyUserAccount.seed, undefined, "sr25519", 42);
-            const userAccount = dummyUserAccount.address;
-            const origin = "https://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 solutionMap = new Map(builtDataset.captchas
-                .filter((captcha) => captcha.solution)
-                .map((captcha) => [
-                captcha.captchaContentId,
-                captcha.solution?.map((s) => s.toString()) ?? [],
-            ]));
-            const temp = data.captchas.map((captcha, index) => {
-                const solution = solutionMap.get(captcha.captchaContentId);
-                if (!solution) {
-                    throw new Error(`Solution not found for captchaContentId: ${captcha.captchaContentId}`);
-                }
-                return {
-                    captchaContentId: captcha.captchaContentId,
-                    captchaId: captcha.captchaId,
-                    salt: embedData(randomAsHex(), [
-                        1 + index,
-                        2 + index,
-                        3 + index,
-                        4 + index,
-                    ]),
-                    solution: 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;
+            const { pair, userAccount } = getUser();
+            const challenge = await requestChallenge(dappAccount, userAccount);
+            const res = await submitSolution(buildSolution(challenge, dappAccount, userAccount, pair, "correct"), dappAccount, userAccount);
             expect(res.status).toBe("You correctly answered the captchas");
         });
-        it("should mark an incorrectly completed image captcha as disapproved", async () => {
-            const pair = getPair(dummyUserAccount.seed, undefined, "sr25519", 42);
-            const userAccount = dummyUserAccount.address;
-            const origin = "https://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 captchaInfoMap = new Map(builtDataset.captchas
-                .filter((captcha) => captcha.solution)
-                .map((captcha) => [
-                captcha.captchaContentId,
-                {
-                    solution: captcha.solution?.map((s) => s.toString()) ?? [],
-                    itemHashes: captcha.items.map((item) => item.hash),
-                },
-            ]));
-            const temp = data.captchas.map((captcha, index) => {
-                const info = captchaInfoMap.get(captcha.captchaContentId);
-                if (!info) {
-                    throw new Error(`Captcha info not found for captchaContentId: ${captcha.captchaContentId}`);
-                }
-                return {
-                    captchaContentId: captcha.captchaContentId,
-                    captchaId: captcha.captchaId,
-                    salt: embedData(randomAsHex(), [
-                        1 + index,
-                        2 + index,
-                        3 + index,
-                        4 + index,
-                    ]),
-                    solution: info.itemHashes.filter((hash) => !info.solution.includes(hash)),
-                };
-            });
-            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 res = (await solveThatCaptcha.json());
+        it("should mark an incorrectly completed image captcha as disapproved, and the dapp should verify the challenge as disapproved", async () => {
+            const { pair, userAccount } = getUser();
+            const challenge = await requestChallenge(dappAccount, userAccount);
+            const solution = buildSolution(challenge, dappAccount, userAccount, pair, "incorrect");
+            const res = await submitSolution(solution, dappAccount, userAccount);
             expect(res.verified).toBe(false);
             expect(res.status).toBe("You answered one or more captchas incorrectly. Please try again");
+            const verifyResult = await dappVerify(dappAccount, mnemonic, userAccount, getCommitmentId(solution));
+            expect(verifyResult.verified).toBe(false);
+        });
+        it("should allow a successful challenge after a failed one", async () => {
+            const { pair, userAccount } = getUser();
+            const failedChallenge = await requestChallenge(dappAccount, userAccount);
+            const failedRes = await submitSolution(buildSolution(failedChallenge, dappAccount, userAccount, pair, "incorrect"), dappAccount, userAccount);
+            expect(failedRes.verified).toBe(false);
+            const challenge = await requestChallenge(dappAccount, userAccount);
+            const solution = buildSolution(challenge, dappAccount, userAccount, pair, "correct");
+            const res = await submitSolution(solution, dappAccount, userAccount);
+            expect(res.verified).toBe(true);
+            expect(res.status).toBe("You correctly answered the captchas");
+            const verifyResult = await dappVerify(dappAccount, mnemonic, userAccount, getCommitmentId(solution));
+            expect(verifyResult.verified).toBe(true);
         });
         it("should disapprove a correct solution submitted after the time limit, and the dapp should verify the challenge as disapproved", async () => {
-            const pair = getPair(dummyUserAccount.seed, undefined, "sr25519", 42);
-            const userAccount = dummyUserAccount.address;
-            const origin = "https://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 { pair, userAccount } = getUser();
+            const challenge = await requestChallenge(dappAccount, userAccount);
             const expireResult = await env
                 .getDb()
                 .getTables()
-                .commitment.updateOne({ requestHash: data.requestHash, pending: true }, { $set: { deadlineTimestamp: new Date(Date.now() - 60 * 1000) } });
+                .commitment.updateOne({ requestHash: challenge.requestHash, pending: true }, { $set: { deadlineTimestamp: new Date(Date.now() - 60 * 1000) } });
             expect(expireResult.modifiedCount).toBe(1);
-            const solutionMap = new Map(builtDataset.captchas
-                .filter((captcha) => captcha.solution)
-                .map((captcha) => [
-                captcha.captchaContentId,
-                captcha.solution?.map((s) => s.toString()) ?? [],
-            ]));
-            const temp = data.captchas.map((captcha, index) => {
-                const solution = solutionMap.get(captcha.captchaContentId);
-                if (!solution) {
-                    throw new Error(`Solution not found for captchaContentId: ${captcha.captchaContentId}`);
-                }
-                return {
-                    captchaContentId: captcha.captchaContentId,
-                    captchaId: captcha.captchaId,
-                    salt: embedData(randomAsHex(), [
-                        1 + index,
-                        2 + index,
-                        3 + index,
-                        4 + index,
-                    ]),
-                    solution: 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),
-            });
-            expect(solveThatCaptcha.status).toBe(200);
-            const solutionResult = (await solveThatCaptcha.json());
+            const solution = buildSolution(challenge, dappAccount, userAccount, pair, "correct");
+            const solutionResult = await submitSolution(solution, dappAccount, userAccount);
             expect(solutionResult.verified).toBe(false);
             expect(solutionResult.status).toBe("You answered one or more captchas incorrectly. Please try again");
-            const dappPair = getPair(mnemonic);
-            const verifyTimestamp = Date.now().toString();
-            const token = encodeProcaptchaOutput({
-                [ApiParams.dapp]: dappAccount,
-                [ApiParams.user]: userAccount,
-                [ApiParams.timestamp]: verifyTimestamp,
-                [ApiParams.signature]: {
-                    [ApiParams.provider]: {},
-                    [ApiParams.user]: {},
-                },
-            });
-            const dappSignature = u8aToHex(dappPair.sign(stringToU8a(verifyTimestamp)));
-            const verifyBody = {
-                [ApiParams.token]: token,
-                [ApiParams.dappSignature]: dappSignature,
-            };
-            const verifyResponse = await fetch(`${baseUrl}${ClientApiPaths.VerifyImageCaptchaSolutionDapp}`, {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                    Origin: origin,
-                    "Prosopo-Site-Key": dappAccount,
-                    "Prosopo-User": userAccount,
-                },
-                body: JSON.stringify(verifyBody),
-            });
-            expect(verifyResponse.status).toBe(200);
-            const verifyResult = (await verifyResponse.json());
+            const verifyResult = await dappVerify(dappAccount, mnemonic, userAccount);
             expect(verifyResult.verified).toBe(false);
         });
     });

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

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/provider",
-	"version": "5.3.9",
+	"version": "5.3.10",
 	"author": "PROSOPO LIMITED <info@prosopo.io>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -23,32 +23,32 @@
 	"dependencies": {
 		"@noble/hashes": "1.8.0",
 		"@polkadot/util": "13.5.7",
-		"@prosopo/api": "4.0.13",
-		"@prosopo/api-express-router": "3.1.71",
-		"@prosopo/api-route": "2.6.55",
-		"@prosopo/common": "3.1.50",
-		"@prosopo/logger": "2.0.6",
-		"@prosopo/database": "4.0.17",
-		"@prosopo/datasets": "3.1.69",
-		"@prosopo/env": "3.6.40",
-		"@prosopo/ipinfo": "0.3.14",
-		"@prosopo/keyring": "2.9.76",
-		"@prosopo/load-balancer": "2.10.30",
-		"@prosopo/puzzle-assets": "0.1.2",
-		"@prosopo/redis-client": "1.0.32",
-		"@prosopo/locale": "3.3.0",
+		"@prosopo/api": "4.0.14",
+		"@prosopo/api-express-router": "3.1.72",
+		"@prosopo/api-route": "2.6.56",
+		"@prosopo/common": "3.1.51",
+		"@prosopo/database": "4.0.18",
+		"@prosopo/datasets": "3.1.70",
+		"@prosopo/env": "3.6.41",
+		"@prosopo/ipinfo": "0.3.15",
+		"@prosopo/keyring": "2.9.77",
+		"@prosopo/load-balancer": "2.10.31",
+		"@prosopo/locale": "3.3.1",
+		"@prosopo/logger": "2.0.7",
 		"@prosopo/native-ja4": "0.0.3",
 		"@prosopo/native-merkle": "0.0.3",
-		"@prosopo/types": "5.2.5",
-		"@prosopo/types-database": "5.1.10",
-		"@prosopo/types-env": "2.10.35",
-		"@prosopo/user-access-policy": "3.12.24",
-		"@prosopo/util": "3.3.6",
+		"@prosopo/puzzle-assets": "0.1.3",
+		"@prosopo/redis-client": "1.0.33",
+		"@prosopo/types": "5.2.6",
+		"@prosopo/types-database": "5.1.11",
+		"@prosopo/types-env": "2.10.36",
+		"@prosopo/user-access-policy": "3.12.25",
+		"@prosopo/util": "3.3.7",
 		"@prosopo/util-crypto": "13.5.30",
 		"cron": "3.1.7",
-		"express": "4.21.2",
+		"express": "4.22.2",
 		"express-rate-limit": "7.4.0",
-		"geolib": "3.3.4",
+		"geolib": "3.3.14",
 		"i18next": "24.1.0",
 		"ip-address": "10.5.0",
 		"mongoose": "8.24.1",
@@ -57,9 +57,9 @@
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
-		"@prosopo/config": "3.3.11",
+		"@prosopo/config": "3.3.12",
 		"@types/node": "22.5.5",
-		"@types/pg": "8.16.0",
+		"@types/pg": "8.23.1",
 		"@types/uuid": "10.0.0",
 		"@vitest/coverage-v8": "4.1.10",
 		"concurrently": "9.0.1",