@social-mail/social-mail-web-server 1.4.820 → 1.4.822
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/common/globalEnv.d.ts +5 -0
- package/dist/common/globalEnv.d.ts.map +1 -1
- package/dist/common/globalEnv.js +5 -0
- package/dist/common/globalEnv.js.map +1 -1
- package/dist/server/model/entities/LoginSession.d.ts +1 -5
- package/dist/server/model/entities/LoginSession.d.ts.map +1 -1
- package/dist/server/model/entities/LoginSession.js +1 -1
- package/dist/server/model/entities/LoginSession.js.map +1 -1
- package/dist/server/model/entities/VerificationToken.d.ts +6 -2
- package/dist/server/model/entities/VerificationToken.d.ts.map +1 -1
- package/dist/server/model/entities/VerificationToken.js +23 -13
- package/dist/server/model/entities/VerificationToken.js.map +1 -1
- package/dist/server/model/events/AccessTokenEvents.d.ts.map +1 -1
- package/dist/server/model/events/AccessTokenEvents.js +1 -0
- package/dist/server/model/events/AccessTokenEvents.js.map +1 -1
- package/dist/server/model/events/LoginSessionEvents.d.ts.map +1 -1
- package/dist/server/model/events/LoginSessionEvents.js +4 -5
- package/dist/server/model/events/LoginSessionEvents.js.map +1 -1
- package/dist/server/services/external-otp-in/ExternalOtpInService.d.ts +10 -0
- package/dist/server/services/external-otp-in/ExternalOtpInService.d.ts.map +1 -0
- package/dist/server/services/external-otp-in/ExternalOtpInService.js +41 -0
- package/dist/server/services/external-otp-in/ExternalOtpInService.js.map +1 -0
- package/dist/server/services/incoming-sms/IncomingSmsService.d.ts.map +1 -1
- package/dist/server/services/incoming-sms/IncomingSmsService.js +0 -6
- package/dist/server/services/incoming-sms/IncomingSmsService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/common/globalEnv.ts +5 -0
- package/src/server/model/entities/LoginSession.ts +1 -1
- package/src/server/model/entities/VerificationToken.ts +21 -11
- package/src/server/model/events/AccessTokenEvents.ts +2 -0
- package/src/server/model/events/LoginSessionEvents.ts +4 -3
- package/src/server/services/external-otp-in/ExternalOtpInService.ts +36 -0
- package/src/server/services/incoming-sms/IncomingSmsService.ts +0 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalEnv.d.ts","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,SAAS
|
|
1
|
+
{"version":3,"file":"globalEnv.d.ts","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;kBAyBmC,aAAa,GAAG,YAAY,GAAG,SAAS;;;;;;;;;;;;;;;CAmBhG,CAAC;AAWF,eAAO,MAAM,OAAO,QACR,MAAM,WACQ,CAAC"}
|
package/dist/common/globalEnv.js
CHANGED
|
@@ -21,6 +21,11 @@ export const globalEnv = {
|
|
|
21
21
|
wildcardDomain: process.env.SOCIAL_MAIL_WILDCARD_DOMAIN,
|
|
22
22
|
name: process.env.SOCIAL_MAIL_NAME || "Social Mail",
|
|
23
23
|
secretKey: process.env.SOCIAL_MAIL_SECRET_KEY,
|
|
24
|
+
otpIn: {
|
|
25
|
+
host: process.env.SOCIAL_MAIL_OTP_IN_HOST,
|
|
26
|
+
key: process.env.SOCIAL_MAIL_OTP_IN_KEY,
|
|
27
|
+
secret: process.env.SOCIAL_MAIL_OTP_IN_SECRET,
|
|
28
|
+
},
|
|
24
29
|
port,
|
|
25
30
|
serverID: process.env.SOCIAL_MAIL_SERVER_ID,
|
|
26
31
|
parentApiToken: process.env.SOCIAL_MAIL_PARENT_API_TOKEN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,11 +32,7 @@ export default class LoginSession {
|
|
|
32
32
|
newPassword: string;
|
|
33
33
|
timeToken: string;
|
|
34
34
|
oneTimePassword: string;
|
|
35
|
-
smsConfig:
|
|
36
|
-
prefix: string;
|
|
37
|
-
code: string;
|
|
38
|
-
url: string;
|
|
39
|
-
}[];
|
|
35
|
+
smsConfig: any;
|
|
40
36
|
user: User;
|
|
41
37
|
versions: AppFileVersion[];
|
|
42
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSession.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/LoginSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAKnD,QAAA,MAAM,oBAAoB,iDAAkD,CAAC;AAC7E,MAAM,MAAM,eAAe,GAAG,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;AAoBlE,MAAM,CAAC,OAAO,OAAO,YAAY;IAGtB,SAAS,EAAE,MAAM,CAAC;IAOlB,MAAM,EAAE,MAAM,CAAC;IAIf,KAAK,EAAE,IAAI,CAAC;IAIZ,MAAM,EAAE,IAAI,CAAC;IAGb,OAAO,EAAE,OAAO,CAAC;IAGjB,WAAW,EAAE,QAAQ,CAAC;IAGtB,MAAM,EAAE,eAAe,CAAC;IAGxB,WAAW,EAAE,MAAM,CAAC;IAGpB,eAAe,EAAE,MAAM,CAAC;IAGxB,QAAQ,EAAE,MAAM,CAAC;IAExB;;OAEG;IAEI,QAAQ,EAAE,MAAM,CAAC;IAExB;;;;OAIG;IAEI,aAAa,EAAE,MAAM,CAAC;IAGtB,qBAAqB,EAAE,OAAO,CAAC;IAEtC;;;OAGG;IAEI,WAAW,EAAE,MAAM,CAAE;IAIrB,SAAS,EAAE,MAAM,CAAC;IAGlB,eAAe,EAAE,MAAM,CAAC;IAGxB,SAAS,EAAE
|
|
1
|
+
{"version":3,"file":"LoginSession.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/LoginSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAKnD,QAAA,MAAM,oBAAoB,iDAAkD,CAAC;AAC7E,MAAM,MAAM,eAAe,GAAG,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;AAoBlE,MAAM,CAAC,OAAO,OAAO,YAAY;IAGtB,SAAS,EAAE,MAAM,CAAC;IAOlB,MAAM,EAAE,MAAM,CAAC;IAIf,KAAK,EAAE,IAAI,CAAC;IAIZ,MAAM,EAAE,IAAI,CAAC;IAGb,OAAO,EAAE,OAAO,CAAC;IAGjB,WAAW,EAAE,QAAQ,CAAC;IAGtB,MAAM,EAAE,eAAe,CAAC;IAGxB,WAAW,EAAE,MAAM,CAAC;IAGpB,eAAe,EAAE,MAAM,CAAC;IAGxB,QAAQ,EAAE,MAAM,CAAC;IAExB;;OAEG;IAEI,QAAQ,EAAE,MAAM,CAAC;IAExB;;;;OAIG;IAEI,aAAa,EAAE,MAAM,CAAC;IAGtB,qBAAqB,EAAE,OAAO,CAAC;IAEtC;;;OAGG;IAEI,WAAW,EAAE,MAAM,CAAE;IAIrB,SAAS,EAAE,MAAM,CAAC;IAGlB,eAAe,EAAE,MAAM,CAAC;IAGxB,SAAS,EAAE,GAAG,CAAC;IAEf,IAAI,EAAE,IAAI,CAAC;IAEX,QAAQ,EAAE,cAAc,EAAE,CAAC;CAWrC"}
|
|
@@ -98,7 +98,7 @@ __decorate([
|
|
|
98
98
|
], LoginSession.prototype, "oneTimePassword", void 0);
|
|
99
99
|
__decorate([
|
|
100
100
|
JsonProperty({ help: "SMS URL to Display" }),
|
|
101
|
-
__metadata("design:type",
|
|
101
|
+
__metadata("design:type", Object)
|
|
102
102
|
], LoginSession.prototype, "smsConfig", void 0);
|
|
103
103
|
LoginSession = __decorate([
|
|
104
104
|
Table("LoginSessions"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSession.js","sourceRoot":"","sources":["../../../../src/server/model/entities/LoginSession.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,YAAY,MAAM,2DAA2D,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,2DAA2D,CAAC;AAE7G,MAAM,oBAAoB,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,MAAM,CAAU,CAAC;AAqB9D,IAAM,YAAY,GAAlB,MAAM,YAAY;IA4E7B,CAAC,YAAY,CAAC,aAAa,CAAC;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC;QACxB,OAAO,IAAI,CAAC,eAAe,CAAC;QAC5B,OAAO;YACH,WAAW,EAAE,EAAE;YACf,eAAe,EAAE,EAAE;SACtB,CAAC;IACN,CAAC;CAEJ,CAAA;AAlFU;IADN,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAC,CAAC;;+CACnB;AAOlB;IALN,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE;QACZ,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI;QACzB,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ;KAC3C,CAAC;;4CACoB;AAIf;IAFN,MAAM,CAAC,EAAE,CAAC;IACV,kBAAkB;8BACL,IAAI;2CAAC;AAIZ;IAFN,MAAM,CAAC,EAAE,CAAC;IACV,kBAAkB;8BACJ,IAAI;4CAAC;AAGb;IADN,MAAM,CAAC,EAAE,CAAC;;6CACa;AAGjB;IADN,MAAM,CAAC,EAAG,CAAC;8BACQ,QAAQ;iDAAC;AAGtB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;4CAC9B;AAGxB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;iDACtB;AAGpB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;qDAC9B;AAGxB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACjC;AAMjB;IADN,YAAY,EAAE;;8CACS;AAQjB;IADN,YAAY,EAAE;;mDACc;AAGtB;IADN,YAAY,EAAE;;2DACuB;AAO/B;IADN,YAAY,EAAE;;iDACa;AAIrB;IADN,YAAY,CAAC,EAAE,IAAI,EAAE,yBAAyB,EAAC,CAAC;;+CACxB;AAGlB;IADN,YAAY,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAC,CAAC;;qDACZ;AAGxB;IADN,YAAY,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAC,CAAC;;+
|
|
1
|
+
{"version":3,"file":"LoginSession.js","sourceRoot":"","sources":["../../../../src/server/model/entities/LoginSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
2
2
|
export default class VerificationToken {
|
|
3
3
|
verificationID: number;
|
|
4
|
-
/** Phone Number or Email Address to Verify */
|
|
5
|
-
address: string;
|
|
6
4
|
dateCreated: DateTime;
|
|
7
5
|
expiry: DateTime;
|
|
8
6
|
verified: boolean;
|
|
9
7
|
code: string;
|
|
10
8
|
accessCode: string;
|
|
11
9
|
ipAddress: string;
|
|
10
|
+
addresses: VerificationTokenAddress[];
|
|
11
|
+
}
|
|
12
|
+
export declare class VerificationTokenAddress {
|
|
13
|
+
verificationID: number;
|
|
14
|
+
address: string;
|
|
15
|
+
verificationToken: VerificationToken;
|
|
12
16
|
}
|
|
13
17
|
//# sourceMappingURL=VerificationToken.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerificationToken.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/VerificationToken.ts"],"names":[],"mappings":"AAKA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;
|
|
1
|
+
{"version":3,"file":"VerificationToken.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/VerificationToken.ts"],"names":[],"mappings":"AAKA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAO3E,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAGlC,cAAc,EAAE,MAAM,CAAC;IAGvB,WAAW,EAAE,QAAQ,CAAC;IAGtB,MAAM,EAAE,QAAQ,CAAC;IAGjB,QAAQ,EAAE,OAAO,CAAC;IAGlB,IAAI,EAAE,MAAM,CAAC;IAGb,UAAU,EAAE,MAAM,CAAC;IAGnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,wBAAwB,EAAE,CAAC;CAEzC;AAED,qBACa,wBAAwB;IAUjC,cAAc,EAAE,MAAM,CAAC;IAGvB,OAAO,EAAE,MAAM,CAAC;IAEhB,iBAAiB,EAAE,iBAAiB,CAAC;CACxC"}
|
|
@@ -8,20 +8,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import Column from "@entity-access/entity-access/dist/decorators/Column.js";
|
|
11
|
-
import Index from "@entity-access/entity-access/dist/decorators/Index.js";
|
|
12
11
|
import Table from "@entity-access/entity-access/dist/decorators/Table.js";
|
|
13
12
|
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
14
13
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
14
|
+
import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
|
|
15
15
|
let VerificationToken = class VerificationToken {
|
|
16
16
|
};
|
|
17
17
|
__decorate([
|
|
18
18
|
Column({ dataType: "BigInt", key: true, generated: "identity" }),
|
|
19
19
|
__metadata("design:type", Number)
|
|
20
20
|
], VerificationToken.prototype, "verificationID", void 0);
|
|
21
|
-
__decorate([
|
|
22
|
-
Column({ dataType: "Char", length: 200 }),
|
|
23
|
-
__metadata("design:type", String)
|
|
24
|
-
], VerificationToken.prototype, "address", void 0);
|
|
25
21
|
__decorate([
|
|
26
22
|
Column({ default: () => Sql.date.now() }),
|
|
27
23
|
__metadata("design:type", DateTime)
|
|
@@ -47,14 +43,28 @@ __decorate([
|
|
|
47
43
|
__metadata("design:type", String)
|
|
48
44
|
], VerificationToken.prototype, "ipAddress", void 0);
|
|
49
45
|
VerificationToken = __decorate([
|
|
50
|
-
Table("VerificationTokens")
|
|
51
|
-
Index({
|
|
52
|
-
name: "IX_VerificationTokens_Address",
|
|
53
|
-
columns: [
|
|
54
|
-
{ name: (x) => x.address, descending: false }
|
|
55
|
-
],
|
|
56
|
-
filter: (x) => x.verified === false
|
|
57
|
-
})
|
|
46
|
+
Table("VerificationTokens")
|
|
58
47
|
], VerificationToken);
|
|
59
48
|
export default VerificationToken;
|
|
49
|
+
let VerificationTokenAddress = class VerificationTokenAddress {
|
|
50
|
+
};
|
|
51
|
+
__decorate([
|
|
52
|
+
Column({ dataType: "BigInt", key: true }),
|
|
53
|
+
RelateTo(VerificationToken, {
|
|
54
|
+
property: (x) => x.verificationToken,
|
|
55
|
+
inverseProperty: (x) => x.addresses,
|
|
56
|
+
foreignKeyConstraint: {
|
|
57
|
+
cascade: "delete"
|
|
58
|
+
}
|
|
59
|
+
}),
|
|
60
|
+
__metadata("design:type", Number)
|
|
61
|
+
], VerificationTokenAddress.prototype, "verificationID", void 0);
|
|
62
|
+
__decorate([
|
|
63
|
+
Column({ dataType: "Char", length: 200, key: true }),
|
|
64
|
+
__metadata("design:type", String)
|
|
65
|
+
], VerificationTokenAddress.prototype, "address", void 0);
|
|
66
|
+
VerificationTokenAddress = __decorate([
|
|
67
|
+
Table("VerificationTokenAddresses")
|
|
68
|
+
], VerificationTokenAddress);
|
|
69
|
+
export { VerificationTokenAddress };
|
|
60
70
|
//# sourceMappingURL=VerificationToken.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerificationToken.js","sourceRoot":"","sources":["../../../../src/server/model/entities/VerificationToken.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;
|
|
1
|
+
{"version":3,"file":"VerificationToken.js","sourceRoot":"","sources":["../../../../src/server/model/entities/VerificationToken.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAE5E,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAE1E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAI3E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAGnE,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAwBrC,CAAA;AArBG;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAC,CAAC;;yDACzC;AAGvB;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,EAAC,CAAC;8BAC5B,QAAQ;sDAAC;AAGtB;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,EAAC,CAAC;8BAC1D,QAAQ;iDAAC;AAGjB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,EAAC,CAAC;;mDACnC;AAGlB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAC,CAAC;;+CAC3B;AAGb;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,EAAC,CAAC;;qDAC9E;AAGnB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACvC;AArBD,iBAAiB;IADrC,KAAK,CAAC,oBAAoB,CAAC;GACP,iBAAiB,CAwBrC;eAxBoB,iBAAiB;AA2B/B,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;CAgBpC,CAAA;AANG;IARC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IACzC,QAAQ,CAAC,iBAAiB,EAAE;QACzB,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB;QACpC,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS;QACnC,oBAAoB,EAAC;YACjB,OAAO,EAAE,QAAQ;SACpB;KACJ,CAAC;;gEACqB;AAGvB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAG,GAAG,EAAE,IAAI,EAAE,CAAC;;yDACtC;AAbP,wBAAwB;IADpC,KAAK,CAAC,4BAA4B,CAAC;GACvB,wBAAwB,CAgBpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccessTokenEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/AccessTokenEvents.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,mBAAmB,CAAC,WAAW,CAAC;IAE3E,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"AccessTokenEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/AccessTokenEvents.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,mBAAmB,CAAC,WAAW,CAAC;IAE3E,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC;CAYpE"}
|
|
@@ -5,6 +5,7 @@ export default class AccessTokenEvents extends AuthenticatedEvents {
|
|
|
5
5
|
if (this.verify) {
|
|
6
6
|
this.sessionUser.ensureLoggedIn();
|
|
7
7
|
}
|
|
8
|
+
entity.userID ??= this.sessionUser.userID;
|
|
8
9
|
entity.secret = "sm-at-" + randomUUID().replaceAll("-", "");
|
|
9
10
|
entity.displaySecret = entity.secret;
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccessTokenEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/AccessTokenEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,mBAAgC;IAE3E,YAAY,CAAC,MAAmB,EAAE,KAA+B;QAE7D,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,CAAC,MAAM,GAAG,QAAQ,GAAG,UAAU,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IACzC,CAAC;CAEJ"}
|
|
1
|
+
{"version":3,"file":"AccessTokenEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/AccessTokenEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,mBAAgC;IAE3E,YAAY,CAAC,MAAmB,EAAE,KAA+B;QAE7D,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;QAE1C,MAAM,CAAC,MAAM,GAAG,QAAQ,GAAG,UAAU,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IACzC,CAAC;CAEJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSessionEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/LoginSessionEvents.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,EAAE,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAChH,OAAO,YAAY,MAAM,6BAA6B,CAAC;AACvD,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAMzF,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;
|
|
1
|
+
{"version":3,"file":"LoginSessionEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/LoginSessionEvents.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,EAAE,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAChH,OAAO,YAAY,MAAM,6BAA6B,CAAC;AACvD,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAMzF,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAc/F,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,YAAY,CAAC,YAAY,CAAC;IAGtE,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,WAAW,CAAc;IAGjC,OAAO,CAAC,sBAAsB,CAAyB;IAGvD,WAAW;IAQX,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC;IAQrE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC;IAarE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC;IAI/D,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW;IAMrD,wBAAwB,CAAC,MAAM,EAAE,YAAY;IAwF7C,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW;IAuB1D,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAyFnE,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAkBxE,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,YAAY,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC;CASrF"}
|
|
@@ -20,8 +20,7 @@ import External from "@entity-access/server-pages/dist/decorators/External.js";
|
|
|
20
20
|
import sleep from "../../../common/sleep.js";
|
|
21
21
|
import { globalEnv } from "../../../common/globalEnv.js";
|
|
22
22
|
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
23
|
-
import
|
|
24
|
-
import IncomingSmsService from "../../services/incoming-sms/IncomingSmsService.js";
|
|
23
|
+
import ExternalOtpInService from "../../services/external-otp-in/ExternalOtpInService.js";
|
|
25
24
|
export default class LoginSessionEvents extends EntityEvents {
|
|
26
25
|
currentUser() {
|
|
27
26
|
const { sessionID = 0, userID = 0 } = this.sessionUser;
|
|
@@ -107,9 +106,9 @@ export default class LoginSessionEvents extends EntityEvents {
|
|
|
107
106
|
const otpIn = await this.db.userAuthFactors.where(user, (p) => (x) => x.userID === p.userID && x.method === "otp-in")
|
|
108
107
|
.toArray();
|
|
109
108
|
if (otpIn.length) {
|
|
110
|
-
const
|
|
111
|
-
|
|
112
|
-
entity.
|
|
109
|
+
const idsCodes = otpIn.map((x) => x.phoneNumber);
|
|
110
|
+
entity.smsConfig = await ServiceProvider.resolve(this, ExternalOtpInService).create(idsCodes);
|
|
111
|
+
entity.smsToken = entity.smsConfig.id;
|
|
113
112
|
}
|
|
114
113
|
return;
|
|
115
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSessionEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/LoginSessionEvents.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,YAAkC,MAAM,gEAAgE,CAAC;AAGhH,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,sBAAsB,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AACnF,OAAO,QAAQ,MAAM,yDAAyD,CAAC;AAC/E,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,GAAG,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"LoginSessionEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/LoginSessionEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ExternalOtpInService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/external-otp-in/ExternalOtpInService.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAE/B,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE;;;;IAY7B,GAAG,CAAC,EAAE,KAAA;;;CAQf"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
|
|
8
|
+
import { globalEnv } from "../../../common/globalEnv.js";
|
|
9
|
+
const headers = {
|
|
10
|
+
authorization: `basic ${Buffer.from(`${globalEnv.otpIn.key}:${globalEnv.otpIn.secret}`).toString("base64")}`
|
|
11
|
+
};
|
|
12
|
+
const postHeaders = {
|
|
13
|
+
...headers,
|
|
14
|
+
"content-type": "application/json",
|
|
15
|
+
};
|
|
16
|
+
let ExternalOtpInService = class ExternalOtpInService {
|
|
17
|
+
async create(phoneNumbers) {
|
|
18
|
+
const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/create`, {
|
|
19
|
+
method: "POST",
|
|
20
|
+
headers: postHeaders,
|
|
21
|
+
body: JSON.stringify({
|
|
22
|
+
phoneNumbers
|
|
23
|
+
})
|
|
24
|
+
});
|
|
25
|
+
const { id, ui } = await rs.json();
|
|
26
|
+
return { id, ui };
|
|
27
|
+
}
|
|
28
|
+
async get(id) {
|
|
29
|
+
const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/get/${id}`, {
|
|
30
|
+
method: "GET",
|
|
31
|
+
headers
|
|
32
|
+
});
|
|
33
|
+
const { success } = await rs.json();
|
|
34
|
+
return { success };
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
ExternalOtpInService = __decorate([
|
|
38
|
+
RegisterSingleton
|
|
39
|
+
], ExternalOtpInService);
|
|
40
|
+
export default ExternalOtpInService;
|
|
41
|
+
//# sourceMappingURL=ExternalOtpInService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ExternalOtpInService.js","sourceRoot":"","sources":["../../../../src/server/services/external-otp-in/ExternalOtpInService.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,OAAO,GAAG;IACZ,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;CAC/G,CAAC;AAEF,MAAM,WAAW,GAAG;IAChB,GAAI,OAAO;IACX,cAAc,EAAE,kBAAkB;CACrC,CAAC;AAGa,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAErC,KAAK,CAAC,MAAM,CAAC,YAAsB;QAC/B,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,WAAW,SAAS,CAAC,KAAK,CAAC,IAAI,oBAAoB,EAAE;YACxE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,WAAW;YACpB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,YAAY;aACf,CAAC;SACL,CAAC,CAAC;QACH,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAE;QACR,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,WAAW,SAAS,CAAC,KAAK,CAAC,IAAI,mBAAmB,EAAE,EAAE,EAAE;YAC3E,MAAM,EAAE,KAAK;YACb,OAAO;SACV,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QACpC,OAAO,EAAE,OAAO,EAAE,CAAC;IACvB,CAAC;CACJ,CAAA;AAtBoB,oBAAoB;IADxC,iBAAiB;GACG,oBAAoB,CAsBxC;eAtBoB,oBAAoB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IncomingSmsService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/incoming-sms/IncomingSmsService.ts"],"names":[],"mappings":"AAEA,OAAO,iBAAiB,MAAM,oCAAoC,CAAC;AAMnE,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAInC,iBAAiB,EAAE,iBAAiB,CAAC;IAG/B,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,KAAA,EAAE,QAAQ,KAAA;IAchD,WAAW,CAAC,IAAI,KAAA,EAAE,GAAI,QAAQ,OAAA;cAGH,MAAM;qBAAe,MAAM;gBAAU,MAAM;aAAO,MAAM;iBAAW,MAAM;mBAAa,MAAM;;IAuBvH,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"IncomingSmsService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/incoming-sms/IncomingSmsService.ts"],"names":[],"mappings":"AAEA,OAAO,iBAAiB,MAAM,oCAAoC,CAAC;AAMnE,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAInC,iBAAiB,EAAE,iBAAiB,CAAC;IAG/B,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,KAAA,EAAE,QAAQ,KAAA;IAchD,WAAW,CAAC,IAAI,KAAA,EAAE,GAAI,QAAQ,OAAA;cAGH,MAAM;qBAAe,MAAM;gBAAU,MAAM;aAAO,MAAM;iBAAW,MAAM;mBAAa,MAAM;;IAuBvH,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CA8BjD"}
|
|
@@ -137,12 +137,6 @@ let IncomingSmsService = class IncomingSmsService {
|
|
|
137
137
|
if (updated) {
|
|
138
138
|
// notify...
|
|
139
139
|
}
|
|
140
|
-
await db.verificationTokens.where(px, (p) => (x) => x.address === p.phoneNumber
|
|
141
|
-
&& x.code === p.code
|
|
142
|
-
&& x.verified === false)
|
|
143
|
-
.update(void 0, (p) => (x) => ({
|
|
144
|
-
verified: true
|
|
145
|
-
}));
|
|
146
140
|
await db.userAuthFactors.where(px, (p) => (x) => x.phoneNumber === p.phoneNumber && x.secret === p.code)
|
|
147
141
|
.update(void 0, (p) => (x) => ({
|
|
148
142
|
verified: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IncomingSmsService.js","sourceRoot":"","sources":["../../../../src/server/services/incoming-sms/IncomingSmsService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"IncomingSmsService.js","sourceRoot":"","sources":["../../../../src/server/services/incoming-sms/IncomingSmsService.ts"],"names":[],"mappings":"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"}
|