@prosopo/provider 2.3.2 → 2.4.2

package/dist/tasks/frictionless/frictionlessTasks.js

@@ -1,33 +1,74 @@
-import { ApiParams, } from "@prosopo/types";
+import { CaptchaType } from "@prosopo/types";
+import { ApiParams } from "@prosopo/types";
 import { v4 as uuidv4 } from "uuid";
 import { checkLangRules } from "../../rules/lang.js";
-export class FrictionlessManager {
-    constructor(config, pair, db) {
+import { CaptchaManager } from "../captchaManager.js";
+const DEFAULT_MAX_TIMESTAMP_AGE = 60 * 10 * 1000;
+export class FrictionlessManager extends CaptchaManager {
+    constructor(db, pair, config, logger) {
+        super(db, pair, logger);
         this.config = config;
-        this.pair = pair;
-        this.db = db;
     }
     checkLangRules(acceptLanguage) {
         return checkLangRules(this.config, acceptLanguage);
     }
-    sendImageCaptcha() {
-        return {
-            [ApiParams.captchaType]: "image",
-            [ApiParams.status]: "ok",
-        };
-    }
-    async sendPowCaptcha(tokenId) {
+    async createSession(tokenId, captchaType) {
         const sessionRecord = {
             sessionId: uuidv4(),
             createdAt: new Date(),
             tokenId: tokenId,
+            captchaType,
         };
         await this.db.storeSessionRecord(sessionRecord);
+        return sessionRecord;
+    }
+    async sendImageCaptcha(tokenId) {
+        const sessionRecord = await this.createSession(tokenId, CaptchaType.image);
         return {
-            [ApiParams.captchaType]: "pow",
+            [ApiParams.captchaType]: CaptchaType.image,
             [ApiParams.sessionId]: sessionRecord.sessionId,
             [ApiParams.status]: "ok",
         };
     }
+    async sendPowCaptcha(tokenId) {
+        const sessionRecord = await this.createSession(tokenId, CaptchaType.pow);
+        return {
+            [ApiParams.captchaType]: CaptchaType.pow,
+            [ApiParams.sessionId]: sessionRecord.sessionId,
+            [ApiParams.status]: "ok",
+        };
+    }
+    async scoreIncreaseAccessPolicy(accessRule, baseBotScore, botScore, tokenId) {
+        const accessPolicyPenalty = accessRule?.score || this.config.penalties.PENALTY_ACCESS_RULE;
+        botScore += accessPolicyPenalty;
+        this.logger.info({
+            message: "Address has an image captcha config defined",
+        });
+        await this.db.updateFrictionlessTokenRecord(tokenId, {
+            score: botScore,
+            scoreComponents: {
+                baseScore: baseBotScore,
+                accessPolicy: accessPolicyPenalty,
+            },
+        });
+        return botScore;
+    }
+    async scoreIncreaseTimestamp(timestamp, baseBotScore, botScore, tokenId) {
+        this.logger.info("Timestamp is older than 10 minutes", new Date(timestamp));
+        botScore += this.config.penalties.PENALTY_OLD_TIMESTAMP;
+        await this.db.updateFrictionlessTokenRecord(tokenId, {
+            score: botScore,
+            scoreComponents: {
+                baseScore: baseBotScore,
+                timeout: this.config.penalties.PENALTY_OLD_TIMESTAMP,
+            },
+        });
+        return botScore;
+    }
+    static timestampTooOld(timestamp) {
+        const now = Date.now();
+        const diff = now - timestamp;
+        return diff > DEFAULT_MAX_TIMESTAMP_AGE;
+    }
 }
 //# sourceMappingURL=frictionlessTasks.js.map

package/dist/tasks/frictionless/frictionlessTasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"frictionlessTasks.js","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,SAAS,GAGT,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,OAAO,mBAAmB;IAK/B,YACC,MAA2B,EAC3B,IAAiB,EACjB,EAAqB;QAErB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACd,CAAC;IAED,cAAc,CAAC,cAAsB;QACpC,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACpD,CAAC;IAED,gBAAgB;QACf,OAAO;YACN,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO;YAChC,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI;SACxB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CACnB,OAAiB;QAEjB,MAAM,aAAa,GAAY;YAC9B,SAAS,EAAE,MAAM,EAAE;YACnB,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,OAAO,EAAE,OAAO;SAChB,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAEhD,OAAO;YACN,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,KAAK;YAC9B,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,SAAS;YAC9C,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI;SACxB,CAAC;IACH,CAAC;CACD"}
+{"version":3,"file":"frictionlessTasks.js","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"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"}

package/dist/tasks/frictionless/frictionlessTasksUtils.d.ts

@@ -0,0 +1,5 @@
+import type { ScoreComponents } from "@prosopo/types-database";
+export declare const computeFrictionlessScore: (scoreComponents: {
+    [key: string]: number;
+} | ScoreComponents) => number;
+//# sourceMappingURL=frictionlessTasksUtils.d.ts.map

package/dist/tasks/frictionless/frictionlessTasksUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"frictionlessTasksUtils.d.ts","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasksUtils.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAGX,eAAe,EACf,MAAM,yBAAyB,CAAC;AAEjC,eAAO,MAAM,wBAAwB,oBAEjC;IACA,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,GACD,eAAe,KAChB,MASF,CAAC"}

package/dist/tasks/frictionless/frictionlessTasksUtils.js

@@ -0,0 +1,6 @@
+export const computeFrictionlessScore = (scoreComponents) => {
+    return Number(Math.min(1, Object.values(scoreComponents)
+        .filter((x) => x !== undefined)
+        .reduce((acc, val) => acc + val, 0)).toFixed(2));
+};
+//# sourceMappingURL=frictionlessTasksUtils.js.map

package/dist/tasks/frictionless/frictionlessTasksUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"frictionlessTasksUtils.js","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasksUtils.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACvC,eAIkB,EACT,EAAE;IACX,OAAO,MAAM,CACZ,IAAI,CAAC,GAAG,CACP,CAAC,EACD,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;SAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;SAC9B,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,CACpC,CAAC,OAAO,CAAC,CAAC,CAAC,CACZ,CAAC;AACH,CAAC,CAAC"}

package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts

@@ -1,15 +1,13 @@
 import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
-import { type Captcha, type CaptchaSolution, type DappUserSolutionResult, type Hash, type IPAddress, type ImageVerificationResponse, type PendingCaptchaRequest, type ProsopoCaptchaCountConfigSchemaOutput, type ProsopoConfigOutput, type RequestHeaders } from "@prosopo/types";
-import type { IProviderDatabase, UserCommitment } from "@prosopo/types-database";
-export declare class ImgCaptchaManager {
-    db: IProviderDatabase;
-    pair: KeyringPair;
-    logger: Logger;
+import { type Captcha, type CaptchaSolution, type DappUserSolutionResult, type Hash, type IPAddress, type ImageVerificationResponse, type ProsopoCaptchaCountConfigSchemaOutput, type ProsopoConfigOutput, type RequestHeaders } from "@prosopo/types";
+import type { ClientRecord, FrictionlessTokenId, IProviderDatabase, PendingCaptchaRequest, UserCommitment } from "@prosopo/types-database";
+import { CaptchaManager } from "../captchaManager.js";
+export declare class ImgCaptchaManager extends CaptchaManager {
     config: ProsopoConfigOutput;
-    constructor(db: IProviderDatabase, pair: KeyringPair, logger: Logger, config: ProsopoConfigOutput);
+    constructor(db: IProviderDatabase, pair: KeyringPair, config: ProsopoConfigOutput, logger?: Logger);
     getCaptchaWithProof(datasetId: Hash, solved: boolean, size: number): Promise<Captcha[]>;
-    getRandomCaptchasAndRequestHash(datasetId: Hash, userAccount: string, ipAddress: IPAddress, headers: RequestHeaders, captchaConfig: ProsopoCaptchaCountConfigSchemaOutput): Promise<{
+    getRandomCaptchasAndRequestHash(datasetId: Hash, userAccount: string, ipAddress: IPAddress, headers: RequestHeaders, captchaConfig: ProsopoCaptchaCountConfigSchemaOutput, frictionlessTokenId?: FrictionlessTokenId): Promise<{
         captchas: Captcha[];
         requestHash: string;
         timestamp: number;
@@ -26,5 +24,6 @@ export declare class ImgCaptchaManager {
     getDappUserCommitmentByAccount(userAccount: string, dappAccount: string): Promise<UserCommitment | undefined>;
     verifyImageCaptchaSolution(user: string, dapp: string, commitmentId: string | undefined, maxVerifiedTime?: number): Promise<ImageVerificationResponse>;
     checkLangRules(acceptLanguage: string): number;
+    getVerificationResponse(verified: boolean, clientRecord: ClientRecord, translateFn: (key: string) => string, score?: number, commitmentId?: Hash): ImageVerificationResponse;
 }
 //# sourceMappingURL=imgCaptchaTasks.d.ts.map

package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imgCaptchaTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAM/D,OAAO,EACN,KAAK,OAAO,EACZ,KAAK,eAAe,EAGpB,KAAK,sBAAsB,EAC3B,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,EAC1B,KAAK,qCAAqC,EAC1C,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACX,iBAAiB,EACjB,cAAc,EACd,MAAM,yBAAyB,CAAC;AAMjC,qBAAa,iBAAiB;IAC7B,EAAE,EAAE,iBAAiB,CAAC;IACtB,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,mBAAmB,CAAC;gBAG3B,EAAE,EAAE,iBAAiB,EACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,mBAAmB;IAQtB,mBAAmB,CACxB,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,OAAO,EAAE,CAAC;IAgBf,+BAA+B,CACpC,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,qCAAqC,GAClD,OAAO,CAAC;QACV,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;KAC1B,CAAC;IAmFI,gBAAgB,CACrB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,MAAM,EACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,sBAAsB,CAAC;IAkH5B,6CAA6C,CAClD,QAAQ,EAAE,eAAe,EAAE,GACzB,OAAO,CAAC;QACV,cAAc,EAAE,OAAO,EAAE,CAAC;QAC1B,gBAAgB,EAAE,eAAe,EAAE,CAAC;QACpC,UAAU,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAqCI,wCAAwC,CAC7C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,qBAAqB,EACpC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,OAAO,CAAC;IA2Bb,yBAAyB,CAC9B,YAAY,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC;IAepB,8BAA8B,CACnC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAehC,0BAA0B,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,eAAe,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,yBAAyB,CAAC;IA+CrC,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;CAG9C"}
+{"version":3,"file":"imgCaptchaTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAM/D,OAAO,EAEN,KAAK,OAAO,EACZ,KAAK,eAAe,EAGpB,KAAK,sBAAsB,EAC3B,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,qCAAqC,EAC1C,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACX,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,qBAAa,iBAAkB,SAAQ,cAAc;IACpD,MAAM,EAAE,mBAAmB,CAAC;gBAG3B,EAAE,EAAE,iBAAiB,EACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,EAC3B,MAAM,CAAC,EAAE,MAAM;IAMV,mBAAmB,CACxB,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,OAAO,EAAE,CAAC;IAgBf,+BAA+B,CACpC,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,qCAAqC,EACpD,mBAAmB,CAAC,EAAE,mBAAmB,GACvC,OAAO,CAAC;QACV,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;KAC1B,CAAC;IAmFI,gBAAgB,CACrB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,MAAM,EACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,sBAAsB,CAAC;IAmH5B,6CAA6C,CAClD,QAAQ,EAAE,eAAe,EAAE,GACzB,OAAO,CAAC;QACV,cAAc,EAAE,OAAO,EAAE,CAAC;QAC1B,gBAAgB,EAAE,eAAe,EAAE,CAAC;QACpC,UAAU,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAqCI,wCAAwC,CAC7C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,qBAAqB,EACpC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,OAAO,CAAC;IA2Bb,yBAAyB,CAC9B,YAAY,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC;IAepB,8BAA8B,CACnC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAehC,0BAA0B,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,eAAe,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,yBAAyB,CAAC;IA+DrC,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAIrC,uBAAuB,CAC/B,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,EACpC,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,IAAI,GACjB,yBAAyB;CAa5B"}

package/dist/tasks/imgCaptcha/imgCaptchaTasks.js

@@ -2,16 +2,16 @@ import { stringToHex, u8aToHex } from "@polkadot/util";
 import { randomAsHex, signatureVerify } from "@polkadot/util-crypto";
 import { ProsopoEnvError } from "@prosopo/common";
 import { compareCaptchaSolutions, computePendingRequestHash, parseAndSortCaptchaSolutions, } from "@prosopo/datasets";
-import { CaptchaStatus, DEFAULT_IMAGE_CAPTCHA_TIMEOUT, } from "@prosopo/types";
+import { ApiParams, CaptchaStatus, DEFAULT_IMAGE_CAPTCHA_TIMEOUT, } from "@prosopo/types";
 import { at } from "@prosopo/util";
 import { checkLangRules } from "../../rules/lang.js";
 import { shuffleArray } from "../../util.js";
+import { CaptchaManager } from "../captchaManager.js";
+import { computeFrictionlessScore } from "../frictionless/frictionlessTasksUtils.js";
 import { buildTreeAndGetCommitmentId } from "./imgCaptchaTasksUtils.js";
-export class ImgCaptchaManager {
-    constructor(db, pair, logger, config) {
-        this.db = db;
-        this.pair = pair;
-        this.logger = logger;
+export class ImgCaptchaManager extends CaptchaManager {
+    constructor(db, pair, config, logger) {
+        super(db, pair, logger);
         this.config = config;
     }
     async getCaptchaWithProof(datasetId, solved, size) {
@@ -28,7 +28,7 @@ export class ImgCaptchaManager {
         }
         return captchaDocs;
     }
-    async getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress, headers, captchaConfig) {
+    async getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress, headers, captchaConfig, frictionlessTokenId) {
         const dataset = await this.db.getDatasetDetails(datasetId);
         if (!dataset) {
             throw new ProsopoEnvError("DATABASE.DATASET_GET_FAILED", {
@@ -45,7 +45,6 @@ export class ImgCaptchaManager {
             throw new ProsopoEnvError("CONFIG.INVALID_CAPTCHA_NUMBER");
         }
         const solved = await this.getCaptchaWithProof(datasetId, true, solvedCount);
-        console.log("solved", solved);
         let unsolved = [];
         if (unsolvedCount) {
             unsolved = await this.getCaptchaWithProof(datasetId, false, unsolvedCount);
@@ -59,7 +58,7 @@ export class ImgCaptchaManager {
             .map((captcha) => captcha.timeLimitMs || DEFAULT_IMAGE_CAPTCHA_TIMEOUT)
             .reduce((a, b) => a + b, 0);
         const deadlineTs = timeLimit + currentTime;
-        await this.db.storeDappUserPending(userAccount, requestHash, salt, deadlineTs, currentTime, ipAddress.bigInt(), headers);
+        await this.db.storePendingImageCommitment(userAccount, requestHash, salt, deadlineTs, currentTime, ipAddress.bigInt(), frictionlessTokenId);
         return {
             captchas,
             requestHash,
@@ -90,7 +89,7 @@ export class ImgCaptchaManager {
             captchas: [],
             verified: false,
         };
-        const pendingRecord = await this.db.getDappUserPending(requestHash);
+        const pendingRecord = await this.db.getPendingImageCommitment(requestHash);
         const unverifiedCaptchaIds = captchas.map((captcha) => captcha.captchaId);
         const pendingRequest = await this.validateDappUserSolutionRequestIsPending(requestHash, pendingRecord, userAccount, unverifiedCaptchaIds);
         if (pendingRequest) {
@@ -102,7 +101,7 @@ export class ImgCaptchaManager {
                     context: { failedFuncName: this.dappUserSolution.name },
                 });
             }
-            await this.db.updateDappUserPendingStatus(requestHash);
+            await this.db.updatePendingImageCommitmentStatus(requestHash);
             const commit = {
                 id: commitmentId,
                 userAccount: userAccount,
@@ -116,8 +115,9 @@ export class ImgCaptchaManager {
                 requestedAtTimestamp: timestamp,
                 ipAddress,
                 headers,
+                frictionlessTokenId: pendingRecord.frictionlessTokenId,
             };
-            await this.db.storeDappUserSolution(receivedCaptchas, commit);
+            await this.db.storeUserImageCaptchaSolution(receivedCaptchas, commit);
             if (compareCaptchaSolutions(receivedCaptchas, storedCaptchas)) {
                 response = {
                     captchas: captchaIds.map((id) => ({
@@ -233,14 +233,34 @@ export class ImgCaptchaManager {
             }
         }
         const isApproved = solution.result.status === CaptchaStatus.approved;
+        let score;
+        if (solution.frictionlessTokenId) {
+            const tokenRecord = await this.db.getFrictionlessTokenRecordByTokenId(solution.frictionlessTokenId);
+            if (tokenRecord) {
+                score = computeFrictionlessScore(tokenRecord?.scoreComponents);
+                this.logger.info({
+                    tscoreComponents: tokenRecord?.scoreComponents,
+                    score: score,
+                });
+            }
+        }
         return {
             status: isApproved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED",
             verified: isApproved,
             commitmentId: solution.id.toString(),
+            ...(score && { score }),
         };
     }
     checkLangRules(acceptLanguage) {
         return checkLangRules(this.config, acceptLanguage);
     }
+    getVerificationResponse(verified, clientRecord, translateFn, score, commitmentId) {
+        return {
+            ...super.getVerificationResponse(verified, clientRecord, translateFn, score),
+            ...(commitmentId && {
+                [ApiParams.commitmentId]: commitmentId,
+            }),
+        };
+    }
 }
 //# sourceMappingURL=imgCaptchaTasks.js.map

package/dist/tasks/imgCaptcha/imgCaptchaTasks.js.map

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

package/dist/tasks/powCaptcha/powTasks.d.ts

@@ -1,13 +1,16 @@
 import type { KeyringPair } from "@polkadot/keyring/types";
+import type { Logger } from "@prosopo/common";
 import { type IPAddress, type PoWCaptcha, type PoWChallengeId, type RequestHeaders } from "@prosopo/types";
 import type { IProviderDatabase } from "@prosopo/types-database";
-export declare class PowCaptchaManager {
-    pair: KeyringPair;
-    db: IProviderDatabase;
+import { CaptchaManager } from "../captchaManager.js";
+export declare class PowCaptchaManager extends CaptchaManager {
     POW_SEPARATOR: string;
-    constructor(pair: KeyringPair, db: IProviderDatabase);
+    constructor(db: IProviderDatabase, pair: KeyringPair, logger?: Logger);
     getPowCaptchaChallenge(userAccount: string, dappAccount: string, origin: string, powDifficulty?: number): Promise<PoWCaptcha>;
     verifyPowCaptchaSolution(challenge: PoWChallengeId, difficulty: number, providerChallengeSignature: string, nonce: number, timeout: number, userTimestampSignature: string, ipAddress: IPAddress, headers: RequestHeaders): Promise<boolean>;
-    serverVerifyPowCaptchaSolution(dappAccount: string, challenge: string, timeout: number): Promise<boolean>;
+    serverVerifyPowCaptchaSolution(dappAccount: string, challenge: string, timeout: number): Promise<{
+        verified: boolean;
+        score?: number;
+    }>;
 }
 //# sourceMappingURL=powTasks.d.ts.map

package/dist/tasks/powCaptcha/powTasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/powCaptcha/powTasks.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAO3D,OAAO,EAIN,KAAK,SAAS,EAEd,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAOjE,qBAAa,iBAAiB;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,iBAAiB,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;gBAEV,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,iBAAiB;IAa9C,sBAAsB,CAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,CAAC;IA8BhB,wBAAwB,CAC7B,SAAS,EAAE,cAAc,EACzB,UAAU,EAAE,MAAM,EAClB,0BAA0B,EAAE,MAAM,EAClC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,OAAO,CAAC;IAuEb,8BAA8B,CACnC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;CA2CnB"}
+{"version":3,"file":"powTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/powCaptcha/powTasks.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAO3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAIN,KAAK,SAAS,EAEd,KAAK,UAAU,EACf,KAAK,cAAc,EAEnB,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAMtD,qBAAa,iBAAkB,SAAQ,cAAc;IACpD,aAAa,EAAE,MAAM,CAAC;gBAEV,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;IAa/D,sBAAsB,CAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,CAAC;IA8BhB,wBAAwB,CAC7B,SAAS,EAAE,cAAc,EACzB,UAAU,EAAE,MAAM,EAClB,0BAA0B,EAAE,MAAM,EAClC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,OAAO,CAAC;IAuEb,8BAA8B,CACnC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACb,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAsDjD"}

package/dist/tasks/powCaptcha/powTasks.js

@@ -1,14 +1,14 @@
 import { stringToHex, u8aToHex } from "@polkadot/util";
-import { ProsopoApiError, ProsopoEnvError, getLoggerDefault, } from "@prosopo/common";
+import { ProsopoApiError, ProsopoEnvError, } from "@prosopo/common";
 import { ApiParams, CaptchaStatus, POW_SEPARATOR, } from "@prosopo/types";
 import { at, verifyRecency } from "@prosopo/util";
+import { CaptchaManager } from "../captchaManager.js";
+import { computeFrictionlessScore } from "../frictionless/frictionlessTasksUtils.js";
 import { checkPowSignature, validateSolution } from "./powTasksUtils.js";
-const logger = getLoggerDefault();
 const DEFAULT_POW_DIFFICULTY = 4;
-export class PowCaptchaManager {
-    constructor(pair, db) {
-        this.pair = pair;
-        this.db = db;
+export class PowCaptchaManager extends CaptchaManager {
+    constructor(db, pair, logger) {
+        super(db, pair, logger);
         this.POW_SEPARATOR = POW_SEPARATOR;
     }
     async getPowCaptchaChallenge(userAccount, dappAccount, origin, powDifficulty) {
@@ -32,7 +32,7 @@ export class PowCaptchaManager {
         checkPowSignature(timestamp.toString(), userTimestampSignature, userAccount, ApiParams.timestamp);
         const challengeRecord = await this.db.getPowCaptchaRecordByChallenge(challenge);
         if (!challengeRecord) {
-            logger.debug("No record of this challenge");
+            this.logger.debug("No record of this challenge");
             return false;
         }
         if (!verifyRecency(challenge, timeout)) {
@@ -56,12 +56,8 @@ export class PowCaptchaManager {
     async serverVerifyPowCaptchaSolution(dappAccount, challenge, timeout) {
         const challengeRecord = await this.db.getPowCaptchaRecordByChallenge(challenge);
         if (!challengeRecord) {
-            throw new ProsopoEnvError("DATABASE.CAPTCHA_GET_FAILED", {
-                context: {
-                    failedFuncName: this.serverVerifyPowCaptchaSolution.name,
-                    challenge,
-                },
-            });
+            this.logger.debug(`No record of this challenge: ${challenge}`);
+            return { verified: false };
         }
         if (challengeRecord.result.status !== CaptchaStatus.approved) {
             throw new ProsopoApiError("CAPTCHA.INVALID_SOLUTION", {
@@ -72,7 +68,7 @@ export class PowCaptchaManager {
             });
         }
         if (challengeRecord.serverChecked)
-            return false;
+            return { verified: false };
         const challengeDappAccount = challengeRecord.dappAccount;
         if (dappAccount !== challengeDappAccount) {
             throw new ProsopoEnvError("CAPTCHA.DAPP_USER_SOLUTION_NOT_FOUND", {
@@ -87,7 +83,18 @@ export class PowCaptchaManager {
         await this.db.markDappUserPoWCommitmentsChecked([
             challengeRecord.challenge,
         ]);
-        return true;
+        let score;
+        if (challengeRecord.frictionlessTokenId) {
+            const tokenRecord = await this.db.getFrictionlessTokenRecordByTokenId(challengeRecord.frictionlessTokenId);
+            if (tokenRecord) {
+                score = computeFrictionlessScore(tokenRecord?.scoreComponents);
+                this.logger.info({
+                    tscoreComponents: tokenRecord?.scoreComponents,
+                    score: score,
+                });
+            }
+        }
+        return { verified: true, ...(score ? { score } : {}) };
     }
 }
 //# sourceMappingURL=powTasks.js.map

package/dist/tasks/powCaptcha/powTasks.js.map

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

package/dist/tasks/tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/tasks/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAA8B,MAAM,iBAAiB,CAAC;AAc1E,OAAO,KAAK,EACX,qCAAqC,EACrC,mBAAmB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK7D,qBAAa,KAAK;IACjB,EAAE,EAAE,iBAAiB,CAAC;IACtB,aAAa,EAAE,qCAAqC,CAAC;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,mBAAmB,CAAC;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,cAAc,EAAE,cAAc,CAAC;IAC/B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,EAAE,mBAAmB,CAAC;gBAE7B,GAAG,EAAE,mBAAmB;CAoCpC"}
+{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/tasks/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAA8B,MAAM,iBAAiB,CAAC;AAc1E,OAAO,KAAK,EACX,qCAAqC,EACrC,mBAAmB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK7D,qBAAa,KAAK;IACjB,EAAE,EAAE,iBAAiB,CAAC;IACtB,aAAa,EAAE,qCAAqC,CAAC;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,mBAAmB,CAAC;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,cAAc,EAAE,cAAc,CAAC;IAC/B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,EAAE,mBAAmB,CAAC;gBAE7B,GAAG,EAAE,mBAAmB;CAyCpC"}

package/dist/tasks/tasks.js

@@ -16,11 +16,11 @@ export class Tasks {
             });
         }
         this.pair = env.pair;
-        this.powCaptchaManager = new PowCaptchaManager(this.pair, this.db);
+        this.powCaptchaManager = new PowCaptchaManager(this.db, this.pair, this.logger);
         this.datasetManager = new DatasetManager(this.config, this.logger, this.captchaConfig, this.db);
-        this.imgCaptchaManager = new ImgCaptchaManager(this.db, this.pair, this.logger, this.config);
+        this.imgCaptchaManager = new ImgCaptchaManager(this.db, this.pair, this.config, this.logger);
         this.clientTaskManager = new ClientTaskManager(this.config, this.logger, this.db);
-        this.frictionlessManager = new FrictionlessManager(this.config, this.pair, this.db);
+        this.frictionlessManager = new FrictionlessManager(this.db, this.pair, this.config, this.logger);
     }
 }
 //# sourceMappingURL=tasks.js.map

package/dist/tasks/tasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../src/tasks/tasks.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAoB1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK7D,MAAM,OAAO,KAAK;IAYjB,YAAY,GAAwB;QACnC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,eAAe,CAAC,iCAAiC,EAAE;gBAC5D,OAAO,EAAE,EAAE,cAAc,EAAE,mBAAmB,EAAE;aAChD,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAErB,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CACvC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,EAAE,CACP,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,CACX,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,EAAE,CACP,CAAC;QACF,IAAI,CAAC,mBAAmB,GAAG,IAAI,mBAAmB,CACjD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,EAAE,CACP,CAAC;IACH,CAAC;CACD"}
+{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../src/tasks/tasks.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAoB1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK7D,MAAM,OAAO,KAAK;IAYjB,YAAY,GAAwB;QACnC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,eAAe,CAAC,iCAAiC,EAAE;gBAC5D,OAAO,EAAE,EAAE,cAAc,EAAE,mBAAmB,EAAE;aAChD,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAErB,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,MAAM,CACX,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CACvC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,EAAE,CACP,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,CACX,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,EAAE,CACP,CAAC;QACF,IAAI,CAAC,mBAAmB,GAAG,IAAI,mBAAmB,CACjD,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,CACX,CAAC;IACH,CAAC;CACD"}

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

@@ -1,20 +1,22 @@
 import { stringToU8a, u8aToHex } from "@polkadot/util";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
 import { generateMnemonic, getPairAsync } from "@prosopo/keyring";
-import { ApiParams, ApiPaths, } from "@prosopo/types";
+import { ApiParams, ApiPaths, CaptchaType, } from "@prosopo/types";
 import fetch from "node-fetch";
-import { beforeAll, describe, expect, it } from "vitest";
+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 dappAccount = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";
 const userAccount = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty";
 describe("Image Captcha Integration Tests", () => {
+    let dappAccount;
+    let mnemonic;
+    beforeEach(async () => {
+        [mnemonic, dappAccount] = await generateMnemonic();
+        await registerSiteKey(dappAccount, CaptchaType.image);
+    });
     describe("GetImageCaptchaChallenge", () => {
-        beforeAll(async () => {
-            await registerSiteKey(dappAccount);
-        });
         it("should supply an image captcha challenge to a Dapp User", async () => {
             const origin = "http://localhost";
             const getImageCaptchaURL = `${baseUrl}${ApiPaths.GetImageCaptchaChallenge}`;
@@ -80,8 +82,8 @@ describe("Image Captcha Integration Tests", () => {
                     "Prosopo-User": userAccount,
                 },
             });
-            expect(response.status).toBe(400);
             const data = (await response.json());
+            expect(response.status).toBe(400);
             expect(data).toHaveProperty("error");
             expect(data.error?.message).toBe("Invalid site key");
         });
@@ -106,6 +108,56 @@ describe("Image Captcha Integration Tests", () => {
             });
             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}${ApiPaths.GetImageCaptchaChallenge}`;
+            await registerSiteKey(dappAccount, CaptchaType.pow);
+            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 an error if the captcha type is set to frictionless and no sessionID is sent", async () => {
+        const origin = "http://localhost";
+        const getImageCaptchaURL = `${baseUrl}${ApiPaths.GetImageCaptchaChallenge}`;
+        await registerSiteKey(dappAccount, CaptchaType.frictionless);
+        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 () => {