@prosopo/procaptcha-pow 2.1.0 → 2.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/components/ProcaptchaWidget.cjs +4 -3
- package/dist/cjs/services/Manager.cjs +50 -43
- package/dist/components/ProcaptchaWidget.d.ts.map +1 -1
- package/dist/components/ProcaptchaWidget.js +2 -2
- package/dist/components/ProcaptchaWidget.js.map +1 -1
- package/dist/services/Manager.d.ts.map +1 -1
- package/dist/services/Manager.js +43 -36
- package/dist/services/Manager.js.map +1 -1
- package/package.json +11 -10
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const jsxRuntime = require("@emotion/react/jsx-runtime");
|
|
3
|
-
const
|
|
3
|
+
const localeBrowser = require("@prosopo/locale-browser");
|
|
4
4
|
const procaptchaCommon = require("@prosopo/procaptcha-common");
|
|
5
5
|
const webComponents = require("@prosopo/web-components");
|
|
6
6
|
const react = require("react");
|
|
7
7
|
const Manager = require("../services/Manager.cjs");
|
|
8
8
|
const Procaptcha = (props) => {
|
|
9
|
-
const { t } =
|
|
9
|
+
const { t } = localeBrowser.useTranslation();
|
|
10
10
|
const config = props.config;
|
|
11
11
|
const themeColor = config.theme === "light" ? "light" : "dark";
|
|
12
12
|
const theme = props.config.theme === "light" ? webComponents.lightTheme : webComponents.darkTheme;
|
|
@@ -25,7 +25,7 @@ const Procaptcha = (props) => {
|
|
|
25
25
|
};
|
|
26
26
|
form.addEventListener("submit", handleSubmit);
|
|
27
27
|
if (config.language) {
|
|
28
|
-
|
|
28
|
+
localeBrowser.i18n.changeLanguage(config.language);
|
|
29
29
|
}
|
|
30
30
|
return () => {
|
|
31
31
|
form.removeEventListener("submit", handleSubmit);
|
|
@@ -100,6 +100,7 @@ const Procaptcha = (props) => {
|
|
|
100
100
|
onChange: manager.current.start,
|
|
101
101
|
themeColor,
|
|
102
102
|
labelText: t("WIDGET.I_AM_HUMAN"),
|
|
103
|
+
error: state.error,
|
|
103
104
|
"aria-label": "human checkbox"
|
|
104
105
|
}
|
|
105
106
|
) })
|
|
@@ -25,11 +25,11 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
|
|
|
25
25
|
};
|
|
26
26
|
};
|
|
27
27
|
const clearTimeout = () => {
|
|
28
|
-
window.clearTimeout(state.timeout);
|
|
28
|
+
window.clearTimeout(Number(state.timeout));
|
|
29
29
|
updateState({ timeout: void 0 });
|
|
30
30
|
};
|
|
31
31
|
const clearSuccessfulChallengeTimeout = () => {
|
|
32
|
-
window.clearTimeout(state.successfullChallengeTimeout);
|
|
32
|
+
window.clearTimeout(Number(state.successfullChallengeTimeout));
|
|
33
33
|
updateState({ successfullChallengeTimeout: void 0 });
|
|
34
34
|
};
|
|
35
35
|
const getConfig = () => {
|
|
@@ -88,7 +88,8 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
|
|
|
88
88
|
updateState({ attemptCount: state.attemptCount + 1 });
|
|
89
89
|
const config = getConfig();
|
|
90
90
|
const ext = config.web2 ? new account.ExtensionWeb2() : new account.ExtensionWeb3();
|
|
91
|
-
const
|
|
91
|
+
const user = await ext.getAccount(config);
|
|
92
|
+
const userAccount = user.account.address;
|
|
92
93
|
updateState({
|
|
93
94
|
account: { account: { address: userAccount } }
|
|
94
95
|
});
|
|
@@ -111,51 +112,57 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
|
|
|
111
112
|
userAccount,
|
|
112
113
|
getDappAccount()
|
|
113
114
|
);
|
|
114
|
-
|
|
115
|
-
const user = await ext.getAccount(getConfig());
|
|
116
|
-
const signer = user.extension?.signer;
|
|
117
|
-
if (!signer || !signer.signRaw) {
|
|
118
|
-
throw new common.ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
|
|
119
|
-
context: {
|
|
120
|
-
error: "Signer is not defined, cannot sign message to prove account ownership"
|
|
121
|
-
}
|
|
122
|
-
});
|
|
123
|
-
}
|
|
124
|
-
const userTimestampSignature = await signer.signRaw({
|
|
125
|
-
address: userAccount,
|
|
126
|
-
data: string.stringToHex(challenge[types.ApiParams.timestamp].toString()),
|
|
127
|
-
type: "bytes"
|
|
128
|
-
});
|
|
129
|
-
const verifiedSolution = await providerApi.submitPowCaptchaSolution(
|
|
130
|
-
challenge,
|
|
131
|
-
getAccount().account.account.address,
|
|
132
|
-
getDappAccount(),
|
|
133
|
-
solution,
|
|
134
|
-
userTimestampSignature.signature.toString(),
|
|
135
|
-
config.captchas.pow.verifiedTimeout
|
|
136
|
-
);
|
|
137
|
-
if (verifiedSolution[types.ApiParams.verified]) {
|
|
115
|
+
if (challenge.error) {
|
|
138
116
|
updateState({
|
|
139
|
-
|
|
117
|
+
error: challenge.error,
|
|
140
118
|
loading: false
|
|
141
119
|
});
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
[types.ApiParams.timestamp]: challenge.timestamp,
|
|
150
|
-
[types.ApiParams.signature]: {
|
|
151
|
-
[types.ApiParams.provider]: challenge.signature.provider,
|
|
152
|
-
[types.ApiParams.user]: {
|
|
153
|
-
[types.ApiParams.timestamp]: userTimestampSignature.signature.toString()
|
|
154
|
-
}
|
|
120
|
+
} else {
|
|
121
|
+
const solution = util.solvePoW(challenge.challenge, challenge.difficulty);
|
|
122
|
+
const signer = user.extension?.signer;
|
|
123
|
+
if (!signer || !signer.signRaw) {
|
|
124
|
+
throw new common.ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
|
|
125
|
+
context: {
|
|
126
|
+
error: "Signer is not defined, cannot sign message to prove account ownership"
|
|
155
127
|
}
|
|
156
|
-
})
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
const userTimestampSignature = await signer.signRaw({
|
|
131
|
+
address: userAccount,
|
|
132
|
+
data: string.stringToHex(challenge[types.ApiParams.timestamp].toString()),
|
|
133
|
+
type: "bytes"
|
|
134
|
+
});
|
|
135
|
+
const verifiedSolution = await providerApi.submitPowCaptchaSolution(
|
|
136
|
+
challenge,
|
|
137
|
+
getAccount().account.account.address,
|
|
138
|
+
getDappAccount(),
|
|
139
|
+
solution,
|
|
140
|
+
userTimestampSignature.signature.toString(),
|
|
141
|
+
config.captchas.pow.verifiedTimeout
|
|
157
142
|
);
|
|
158
|
-
|
|
143
|
+
if (verifiedSolution[types.ApiParams.verified]) {
|
|
144
|
+
updateState({
|
|
145
|
+
isHuman: true,
|
|
146
|
+
loading: false
|
|
147
|
+
});
|
|
148
|
+
events2.onHuman(
|
|
149
|
+
types.encodeProcaptchaOutput({
|
|
150
|
+
[types.ApiParams.providerUrl]: providerUrl,
|
|
151
|
+
[types.ApiParams.user]: getAccount().account.account.address,
|
|
152
|
+
[types.ApiParams.dapp]: getDappAccount(),
|
|
153
|
+
[types.ApiParams.challenge]: challenge.challenge,
|
|
154
|
+
[types.ApiParams.nonce]: solution,
|
|
155
|
+
[types.ApiParams.timestamp]: challenge.timestamp,
|
|
156
|
+
[types.ApiParams.signature]: {
|
|
157
|
+
[types.ApiParams.provider]: challenge.signature.provider,
|
|
158
|
+
[types.ApiParams.user]: {
|
|
159
|
+
[types.ApiParams.timestamp]: userTimestampSignature.signature.toString()
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
})
|
|
163
|
+
);
|
|
164
|
+
setValidChallengeTimeout();
|
|
165
|
+
}
|
|
159
166
|
}
|
|
160
167
|
},
|
|
161
168
|
start,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcaptchaWidget.d.ts","sourceRoot":"","sources":["../../src/components/ProcaptchaWidget.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ProcaptchaWidget.d.ts","sourceRoot":"","sources":["../../src/components/ProcaptchaWidget.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAqBtD,QAAA,MAAM,UAAU,UAAW,eAAe,qDAkIzC,CAAC;AACF,eAAe,UAAU,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
2
|
-
import { i18n, useTranslation } from "@prosopo/
|
|
2
|
+
import { i18n, useTranslation } from "@prosopo/locale-browser";
|
|
3
3
|
import { buildUpdateState, useProcaptcha } from "@prosopo/procaptcha-common";
|
|
4
4
|
import { Checkbox, ContainerDiv, LoadingSpinner, Logo, WIDGET_BORDER, WIDGET_BORDER_RADIUS, WIDGET_DIMENSIONS, WIDGET_INNER_HEIGHT, WIDGET_MAX_WIDTH, WIDGET_PADDING, WIDGET_URL, WIDGET_URL_TEXT, WidthBasedStylesDiv, darkTheme, lightTheme, } from "@prosopo/web-components";
|
|
5
5
|
import { useEffect, useRef, useState } from "react";
|
|
@@ -61,7 +61,7 @@ const Procaptcha = (props) => {
|
|
|
61
61
|
verticalAlign: "middle",
|
|
62
62
|
}, children: _jsx("div", { style: {
|
|
63
63
|
display: "flex",
|
|
64
|
-
}, children: _jsx("div", { style: { flex: 1 }, children: state.loading ? (_jsx(LoadingSpinner, { themeColor: themeColor, "aria-label": "Loading spinner" })) : (_jsx(Checkbox, { checked: state.isHuman, onChange: manager.current.start, themeColor: themeColor, labelText: t("WIDGET.I_AM_HUMAN"), "aria-label": "human checkbox" })) }) }) }) }) }), _jsx("div", { style: { display: "inline-flex", flexDirection: "column" }, children: _jsx("a", { href: WIDGET_URL, target: "_blank", "aria-label": WIDGET_URL_TEXT, rel: "noreferrer", children: _jsx("div", { style: { flex: 1 }, children: _jsx(Logo, { themeColor: themeColor, "aria-label": "Prosopo logo" }) }) }) })] })] }) }) }) }) }));
|
|
64
|
+
}, children: _jsx("div", { style: { flex: 1 }, children: state.loading ? (_jsx(LoadingSpinner, { themeColor: themeColor, "aria-label": "Loading spinner" })) : (_jsx(Checkbox, { checked: state.isHuman, onChange: manager.current.start, themeColor: themeColor, labelText: t("WIDGET.I_AM_HUMAN"), error: state.error, "aria-label": "human checkbox" })) }) }) }) }) }), _jsx("div", { style: { display: "inline-flex", flexDirection: "column" }, children: _jsx("a", { href: WIDGET_URL, target: "_blank", "aria-label": WIDGET_URL_TEXT, rel: "noreferrer", children: _jsx("div", { style: { flex: 1 }, children: _jsx(Logo, { themeColor: themeColor, "aria-label": "Prosopo logo" }) }) }) })] })] }) }) }) }) }));
|
|
65
65
|
};
|
|
66
66
|
export default Procaptcha;
|
|
67
67
|
//# sourceMappingURL=ProcaptchaWidget.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcaptchaWidget.js","sourceRoot":"","sources":["../../src/components/ProcaptchaWidget.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"ProcaptchaWidget.js","sourceRoot":"","sources":["../../src/components/ProcaptchaWidget.tsx"],"names":[],"mappings":";AAcA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE7E,OAAO,EACN,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,IAAI,EACJ,aAAa,EACb,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,SAAS,EACT,UAAU,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,UAAU,GAAG,CAAC,KAAsB,EAAE,EAAE;IAC7C,MAAM,EAAE,CAAC,EAAE,GAAG,cAAc,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;IACtE,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC;IACxC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,GAAG,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE9D,MAAM,WAAW,GAAG,gBAAgB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAC;IAElD,SAAS,CAAC,GAAG,EAAE;QACd,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QACnC,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,YAAY,GAAG,GAAG,EAAE;YACzB,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QAC9B,CAAC,CAAC;QAEF,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAE9C,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,GAAG,EAAE;YACX,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAClD,CAAC,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEtB,OAAO,CACN,cAAK,GAAG,EAAE,UAAU,YACnB,cACC,KAAK,EAAE;gBACN,QAAQ,EAAE,gBAAgB;gBAC1B,SAAS,EAAE,MAAM;gBACjB,SAAS,EAAE,MAAM;aACjB,YAED,KAAC,YAAY,cACZ,KAAC,mBAAmB,cACnB,eAAK,KAAK,EAAE,iBAAiB,aAAW,cAAc,aACpD,GAAG,EACJ,eACC,KAAK,EAAE;oCACN,OAAO,EAAE,cAAc;oCACvB,MAAM,EAAE,aAAa;oCACrB,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO;oCACjD,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;oCACpC,YAAY,EAAE,oBAAoB;oCAClC,OAAO,EAAE,MAAM;oCACf,UAAU,EAAE,QAAQ;oCACpB,QAAQ,EAAE,MAAM;oCAChB,cAAc,EAAE,eAAe;oCAC/B,SAAS,EAAE,GAAG,mBAAmB,IAAI;oCACrC,QAAQ,EAAE,QAAQ;iCAClB,aAED,cACC,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAE1D,cACC,KAAK,EAAE;gDACN,OAAO,EAAE,MAAM;gDACf,cAAc,EAAE,YAAY;gDAC5B,UAAU,EAAE,QAAQ;gDACpB,QAAQ,EAAE,MAAM;6CAChB,YAED,cACC,KAAK,EAAE;oDACN,OAAO,EAAE,MAAM;oDACf,UAAU,EAAE,QAAQ;oDACpB,cAAc,EAAE,QAAQ;oDACxB,aAAa,EAAE,QAAQ;oDACvB,aAAa,EAAE,QAAQ;iDACvB,YAED,cACC,KAAK,EAAE;wDACN,OAAO,EAAE,MAAM;qDACf,YAED,cAAK,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,YACrB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAChB,KAAC,cAAc,IACd,UAAU,EAAE,UAAU,gBACX,iBAAiB,GAC3B,CACF,CAAC,CAAC,CAAC,CACH,KAAC,QAAQ,IACR,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,EAC/B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,CAAC,CAAC,mBAAmB,CAAC,EACjC,KAAK,EAAE,KAAK,CAAC,KAAK,gBACP,gBAAgB,GAC1B,CACF,GACI,GACD,GACD,GACD,GACD,EAEN,cACC,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAE1D,YACC,IAAI,EAAE,UAAU,EAChB,MAAM,EAAC,QAAQ,gBACH,eAAe,EAC3B,GAAG,EAAC,YAAY,YAEhB,cAAK,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,YACtB,KAAC,IAAI,IAAC,UAAU,EAAE,UAAU,gBAAa,cAAc,GAAG,GACrD,GACH,GACC,IACD,IACD,GACe,GACR,GACV,GACD,CACN,CAAC;AACH,CAAC,CAAC;AACF,eAAe,UAAU,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/services/Manager.ts"],"names":[],"mappings":"AAwBA,OAAO,EAGN,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAEhC,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAE5B,MAAM,gBAAgB,CAAC;AAGxB,eAAO,MAAM,OAAO,gBACN,2BAA2B,SACjC,eAAe,iBACP,uBAAuB,aAC3B,mBAAmB;;;
|
|
1
|
+
{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/services/Manager.ts"],"names":[],"mappings":"AAwBA,OAAO,EAGN,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAEhC,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAE5B,MAAM,gBAAgB,CAAC;AAGxB,eAAO,MAAM,OAAO,gBACN,2BAA2B,SACjC,eAAe,iBACP,uBAAuB,aAC3B,mBAAmB;;;CA+N9B,CAAC"}
|
package/dist/services/Manager.js
CHANGED
|
@@ -21,11 +21,11 @@ export const Manager = (configInput, state, onStateUpdate, callbacks) => {
|
|
|
21
21
|
};
|
|
22
22
|
};
|
|
23
23
|
const clearTimeout = () => {
|
|
24
|
-
window.clearTimeout(state.timeout);
|
|
24
|
+
window.clearTimeout(Number(state.timeout));
|
|
25
25
|
updateState({ timeout: undefined });
|
|
26
26
|
};
|
|
27
27
|
const clearSuccessfulChallengeTimeout = () => {
|
|
28
|
-
window.clearTimeout(state.successfullChallengeTimeout);
|
|
28
|
+
window.clearTimeout(Number(state.successfullChallengeTimeout));
|
|
29
29
|
updateState({ successfullChallengeTimeout: undefined });
|
|
30
30
|
};
|
|
31
31
|
const getConfig = () => {
|
|
@@ -83,8 +83,8 @@ export const Manager = (configInput, state, onStateUpdate, callbacks) => {
|
|
|
83
83
|
updateState({ attemptCount: state.attemptCount + 1 });
|
|
84
84
|
const config = getConfig();
|
|
85
85
|
const ext = config.web2 ? new ExtensionWeb2() : new ExtensionWeb3();
|
|
86
|
-
const
|
|
87
|
-
|
|
86
|
+
const user = await ext.getAccount(config);
|
|
87
|
+
const userAccount = user.account.address;
|
|
88
88
|
updateState({
|
|
89
89
|
account: { account: { address: userAccount } },
|
|
90
90
|
});
|
|
@@ -102,42 +102,49 @@ export const Manager = (configInput, state, onStateUpdate, callbacks) => {
|
|
|
102
102
|
const providerUrl = getRandomProviderResponse.provider.url;
|
|
103
103
|
const providerApi = new ProviderApi(providerUrl, getDappAccount());
|
|
104
104
|
const challenge = await providerApi.getPowCaptchaChallenge(userAccount, getDappAccount());
|
|
105
|
-
|
|
106
|
-
const user = await ext.getAccount(getConfig());
|
|
107
|
-
const signer = user.extension?.signer;
|
|
108
|
-
if (!signer || !signer.signRaw) {
|
|
109
|
-
throw new ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
|
|
110
|
-
context: {
|
|
111
|
-
error: "Signer is not defined, cannot sign message to prove account ownership",
|
|
112
|
-
},
|
|
113
|
-
});
|
|
114
|
-
}
|
|
115
|
-
const userTimestampSignature = await signer.signRaw({
|
|
116
|
-
address: userAccount,
|
|
117
|
-
data: stringToHex(challenge[ApiParams.timestamp].toString()),
|
|
118
|
-
type: "bytes",
|
|
119
|
-
});
|
|
120
|
-
const verifiedSolution = await providerApi.submitPowCaptchaSolution(challenge, getAccount().account.account.address, getDappAccount(), solution, userTimestampSignature.signature.toString(), config.captchas.pow.verifiedTimeout);
|
|
121
|
-
if (verifiedSolution[ApiParams.verified]) {
|
|
105
|
+
if (challenge.error) {
|
|
122
106
|
updateState({
|
|
123
|
-
|
|
107
|
+
error: challenge.error,
|
|
124
108
|
loading: false,
|
|
125
109
|
});
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
[ApiParams.provider]: challenge.signature.provider,
|
|
135
|
-
[ApiParams.user]: {
|
|
136
|
-
[ApiParams.timestamp]: userTimestampSignature.signature.toString(),
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
const solution = solvePoW(challenge.challenge, challenge.difficulty);
|
|
113
|
+
const signer = user.extension?.signer;
|
|
114
|
+
if (!signer || !signer.signRaw) {
|
|
115
|
+
throw new ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
|
|
116
|
+
context: {
|
|
117
|
+
error: "Signer is not defined, cannot sign message to prove account ownership",
|
|
137
118
|
},
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
const userTimestampSignature = await signer.signRaw({
|
|
122
|
+
address: userAccount,
|
|
123
|
+
data: stringToHex(challenge[ApiParams.timestamp].toString()),
|
|
124
|
+
type: "bytes",
|
|
125
|
+
});
|
|
126
|
+
const verifiedSolution = await providerApi.submitPowCaptchaSolution(challenge, getAccount().account.account.address, getDappAccount(), solution, userTimestampSignature.signature.toString(), config.captchas.pow.verifiedTimeout);
|
|
127
|
+
if (verifiedSolution[ApiParams.verified]) {
|
|
128
|
+
updateState({
|
|
129
|
+
isHuman: true,
|
|
130
|
+
loading: false,
|
|
131
|
+
});
|
|
132
|
+
events.onHuman(encodeProcaptchaOutput({
|
|
133
|
+
[ApiParams.providerUrl]: providerUrl,
|
|
134
|
+
[ApiParams.user]: getAccount().account.account.address,
|
|
135
|
+
[ApiParams.dapp]: getDappAccount(),
|
|
136
|
+
[ApiParams.challenge]: challenge.challenge,
|
|
137
|
+
[ApiParams.nonce]: solution,
|
|
138
|
+
[ApiParams.timestamp]: challenge.timestamp,
|
|
139
|
+
[ApiParams.signature]: {
|
|
140
|
+
[ApiParams.provider]: challenge.signature.provider,
|
|
141
|
+
[ApiParams.user]: {
|
|
142
|
+
[ApiParams.timestamp]: userTimestampSignature.signature.toString(),
|
|
143
|
+
},
|
|
144
|
+
},
|
|
145
|
+
}));
|
|
146
|
+
setValidChallengeTimeout();
|
|
147
|
+
}
|
|
141
148
|
}
|
|
142
149
|
}, start, resetState, state.attemptCount, 10);
|
|
143
150
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../src/services/Manager.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EACN,gBAAgB,EAChB,gBAAgB,EAChB,uBAAuB,EACvB,aAAa,GACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEN,SAAS,EAGT,sBAAsB,EAGtB,sBAAsB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,MAAM,CAAC,MAAM,OAAO,GAAG,CACtB,WAAwC,EACxC,KAAsB,EACtB,aAAsC,EACtC,SAA8B,EAC7B,EAAE;IACH,MAAM,MAAM,GAAG,gBAAgB,CAAC,aAAa,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAEjE,MAAM,YAAY,GAAG,GAA6B,EAAE;QACnD,OAAO;YAEN,SAAS,EAAE,KAAK;YAChB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,CAAC;YACR,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,SAAS;SAElB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,GAAG,EAAE;QAEzB,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../src/services/Manager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/procaptcha-pow",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.1",
|
|
4
4
|
"author": "PROSOPO LIMITED <info@prosopo.io>",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -27,14 +27,15 @@
|
|
|
27
27
|
"browserslist": ["> 0.5%, last 2 versions, not dead"],
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@polkadot/util": "12.6.2",
|
|
30
|
-
"@prosopo/account": "2.1.
|
|
31
|
-
"@prosopo/api": "2.1.
|
|
32
|
-
"@prosopo/common": "2.1.
|
|
33
|
-
"@prosopo/
|
|
34
|
-
"@prosopo/procaptcha
|
|
35
|
-
"@prosopo/
|
|
36
|
-
"@prosopo/
|
|
37
|
-
"@prosopo/
|
|
30
|
+
"@prosopo/account": "2.1.1",
|
|
31
|
+
"@prosopo/api": "2.1.1",
|
|
32
|
+
"@prosopo/common": "2.1.1",
|
|
33
|
+
"@prosopo/locale-browser": "2.1.1",
|
|
34
|
+
"@prosopo/procaptcha": "2.1.1",
|
|
35
|
+
"@prosopo/procaptcha-common": "2.1.1",
|
|
36
|
+
"@prosopo/types": "2.1.1",
|
|
37
|
+
"@prosopo/util": "2.1.1",
|
|
38
|
+
"@prosopo/web-components": "2.1.1",
|
|
38
39
|
"react": "18.3.1"
|
|
39
40
|
},
|
|
40
41
|
"overrides": {
|
|
@@ -45,7 +46,7 @@
|
|
|
45
46
|
}
|
|
46
47
|
},
|
|
47
48
|
"devDependencies": {
|
|
48
|
-
"@prosopo/config": "2.1.
|
|
49
|
+
"@prosopo/config": "2.1.1",
|
|
49
50
|
"@vitest/coverage-v8": "2.1.1",
|
|
50
51
|
"concurrently": "9.0.1",
|
|
51
52
|
"npm-run-all": "4.1.5",
|