@social-mail/social-mail-web-server 1.7.737 → 1.7.739
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/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/services/captcha/CaptchaService.d.ts +3 -1
- package/dist/server/services/captcha/CaptchaService.d.ts.map +1 -1
- package/dist/server/services/captcha/CaptchaService.js +13 -3
- package/dist/server/services/captcha/CaptchaService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/api/users/captcha/post.d.ts +2 -2
- package/dist/wwwroot/routes/api/users/captcha/post.d.ts.map +1 -1
- package/dist/wwwroot/routes/api/users/captcha/post.js.map +1 -1
- package/package.json +1 -1
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/captcha/CaptchaService.ts +14 -4
- package/src/wwwroot/routes/api/users/captcha/post.tsx +2 -2
|
@@ -3,7 +3,7 @@ export default async function seedUI(config) {
|
|
|
3
3
|
await config.saveVersion(UIPackageConfig, {
|
|
4
4
|
package: "@social-mail/social-mail-client",
|
|
5
5
|
view: "dist/web/AppIndex",
|
|
6
|
-
version: "1.8.
|
|
6
|
+
version: "1.8.194"
|
|
7
7
|
});
|
|
8
8
|
await config.saveVersion(WebComponentsPackageConfig, {
|
|
9
9
|
package: "@social-mail/web-components",
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { IVerification } from "./IVerification.js";
|
|
2
|
+
import VerificationToken from "../../model/entities/VerificationToken.js";
|
|
2
3
|
export default class CaptchaService {
|
|
3
4
|
private diskCache;
|
|
4
5
|
private db;
|
|
5
6
|
private tfs;
|
|
6
|
-
|
|
7
|
+
private ss;
|
|
8
|
+
verify(v: VerificationToken): Promise<boolean>;
|
|
7
9
|
delete(v: IVerification): Promise<boolean>;
|
|
8
10
|
generatePair(ip?: string): Promise<{
|
|
9
11
|
id: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CaptchaService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/captcha/CaptchaService.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"CaptchaService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/captcha/CaptchaService.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMnD,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAwB1E,MAAM,CAAC,OAAO,OAAO,cAAc;IAE/B,OAAO,CAAC,SAAS,CAKb;IAGJ,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,GAAG,CAAkB;IAG7B,OAAO,CAAC,EAAE,CAAkB;IAEtB,MAAM,CAAC,CAAC,EAAE,iBAAiB;IAc3B,MAAM,CAAC,CAAC,EAAE,aAAa;IAMvB,YAAY,CAAC,EAAE,SAAK;;;;IAkBpB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAIrB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CA8BlD"}
|
|
@@ -18,6 +18,7 @@ import { randomUUID } from "crypto";
|
|
|
18
18
|
import BaseDiskCache from "../../../common/BaseDiskCache.js";
|
|
19
19
|
import { globalEnv } from "../../../common/globalEnv.js";
|
|
20
20
|
import FileSize from "../../../common/FileSize.js";
|
|
21
|
+
import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
|
|
21
22
|
const captchaCache = "/cache/captcha";
|
|
22
23
|
ensureDir(captchaCache);
|
|
23
24
|
const tempSize = FileSize.parse(globalEnv.tmpSize);
|
|
@@ -43,11 +44,16 @@ let CaptchaService = class CaptchaService {
|
|
|
43
44
|
});
|
|
44
45
|
}
|
|
45
46
|
async verify(v) {
|
|
46
|
-
const {
|
|
47
|
-
const
|
|
48
|
-
|
|
47
|
+
const { verificationID } = this.ss.decryptKey(v.$key);
|
|
48
|
+
const { verifyCode } = v;
|
|
49
|
+
const vt = await this.db.verificationTokens.statements.select({}, { verificationID });
|
|
50
|
+
if (vt.verified) {
|
|
51
|
+
return true;
|
|
52
|
+
}
|
|
53
|
+
if (vt?.code !== verifyCode) {
|
|
49
54
|
throw new EntityAccessError(`Invalid code`);
|
|
50
55
|
}
|
|
56
|
+
await this.db.verificationTokens.statements.update({ verified: true }, { verificationID });
|
|
51
57
|
return true;
|
|
52
58
|
}
|
|
53
59
|
async delete(v) {
|
|
@@ -106,6 +112,10 @@ __decorate([
|
|
|
106
112
|
Inject,
|
|
107
113
|
__metadata("design:type", TempFileService)
|
|
108
114
|
], CaptchaService.prototype, "tfs", void 0);
|
|
115
|
+
__decorate([
|
|
116
|
+
Inject,
|
|
117
|
+
__metadata("design:type", SessionSecurity)
|
|
118
|
+
], CaptchaService.prototype, "ss", void 0);
|
|
109
119
|
CaptchaService = __decorate([
|
|
110
120
|
RegisterScoped
|
|
111
121
|
], CaptchaService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CaptchaService.js","sourceRoot":"","sources":["../../../../src/server/services/captcha/CaptchaService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,QAAQ,MAAM,6BAA6B,CAAC;AAEnD,MAAM,YAAY,GAAG,gBAAgB,CAAC;AACtC,SAAS,CAAC,YAAY,CAAC,CAAC;AAExB,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACnD,MAAM,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;AAG7B,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;AAE/B,MAAM,MAAM,GAAG,sDAAsD;MAC/D,4BAA4B;MAC5B,uDAAuD;MACvD,+BAA+B;MAC/B,uDAAuD;MACvD,kCAAkC;MAClC,uDAAuD;MACvD,qCAAqC;MACrC,uDAAuD;MACvD,sDAAsD,CAAC;AAG9C,IAAM,cAAc,GAApB,MAAM,cAAc;IAApB;QAEH,cAAS,GAAkB,IAAI,aAAa,CAAC;YACjD,IAAI,EAAE,YAAY;YAClB,cAAc,EAAE,KAAK;YACrB,OAAO;YACP,MAAM,EAAE,CAAC;SACZ,CAAC,CAAE;
|
|
1
|
+
{"version":3,"file":"CaptchaService.js","sourceRoot":"","sources":["../../../../src/server/services/captcha/CaptchaService.ts"],"names":[],"mappings":"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"}
|