@social-mail/social-mail-web-server 1.4.828 → 1.4.830

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 (30) hide show
  1. package/dist/server/model/entities/LoginSession.d.ts +3 -2
  2. package/dist/server/model/entities/LoginSession.d.ts.map +1 -1
  3. package/dist/server/model/entities/LoginSession.js +8 -16
  4. package/dist/server/model/entities/LoginSession.js.map +1 -1
  5. package/dist/server/model/entities/UserAuthFactor.d.ts +3 -0
  6. package/dist/server/model/entities/UserAuthFactor.d.ts.map +1 -1
  7. package/dist/server/model/entities/UserAuthFactor.js +9 -0
  8. package/dist/server/model/entities/UserAuthFactor.js.map +1 -1
  9. package/dist/server/model/entities/VerificationToken.d.ts +6 -0
  10. package/dist/server/model/entities/VerificationToken.d.ts.map +1 -1
  11. package/dist/server/model/entities/VerificationToken.js +9 -0
  12. package/dist/server/model/entities/VerificationToken.js.map +1 -1
  13. package/dist/server/model/events/LoginSessionEvents.d.ts.map +1 -1
  14. package/dist/server/model/events/LoginSessionEvents.js +5 -6
  15. package/dist/server/model/events/LoginSessionEvents.js.map +1 -1
  16. package/dist/server/model/events/UserAuthFactorEvents.d.ts.map +1 -1
  17. package/dist/server/model/events/UserAuthFactorEvents.js +5 -6
  18. package/dist/server/model/events/UserAuthFactorEvents.js.map +1 -1
  19. package/dist/server/services/external-otp-in/ExternalOtpInService.d.ts +6 -2
  20. package/dist/server/services/external-otp-in/ExternalOtpInService.d.ts.map +1 -1
  21. package/dist/server/services/external-otp-in/ExternalOtpInService.js +33 -5
  22. package/dist/server/services/external-otp-in/ExternalOtpInService.js.map +1 -1
  23. package/dist/tsconfig.tsbuildinfo +1 -1
  24. package/package.json +1 -1
  25. package/src/server/model/entities/LoginSession.ts +9 -14
  26. package/src/server/model/entities/UserAuthFactor.ts +10 -0
  27. package/src/server/model/entities/VerificationToken.ts +10 -5
  28. package/src/server/model/events/LoginSessionEvents.ts +5 -6
  29. package/src/server/model/events/UserAuthFactorEvents.ts +5 -6
  30. package/src/server/services/external-otp-in/ExternalOtpInService.ts +34 -5
@@ -1,6 +1,7 @@
1
1
  import { User } from "./User.js";
2
2
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
3
3
  import type { AppFileVersion } from "./AppFile.js";
4
+ import VerificationToken from "./VerificationToken.js";
4
5
  declare const loginSessionStatuses: readonly ["created", "change-password", "totp"];
5
6
  export type loginStatusType = typeof loginSessionStatuses[number];
6
7
  export default class LoginSession {
@@ -13,7 +14,7 @@ export default class LoginSession {
13
14
  status: loginStatusType;
14
15
  deviceToken: string;
15
16
  deviceTokenType: string;
16
- smsToken: string;
17
+ verificationID: number;
17
18
  /**
18
19
  * This will not be saved into database
19
20
  */
@@ -32,9 +33,9 @@ export default class LoginSession {
32
33
  newPassword: string;
33
34
  timeToken: string;
34
35
  oneTimePassword: string;
35
- smsConfig: string;
36
36
  user: User;
37
37
  versions: AppFileVersion[];
38
+ verificationToken: VerificationToken;
38
39
  }
39
40
  export {};
40
41
  //# sourceMappingURL=LoginSession.d.ts.map
@@ -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,MAAM,CAAC;IAElB,IAAI,EAAE,IAAI,CAAC;IAEX,QAAQ,EAAE,cAAc,EAAE,CAAC;CAWrC"}
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;AAInD,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAEvD,QAAA,MAAM,oBAAoB,iDAAkD,CAAC;AAC7E,MAAM,MAAM,eAAe,GAAG,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;AAWlE,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;IAOxB,cAAc,EAAE,MAAM,CAAC;IAE9B;;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;IAExB,IAAI,EAAE,IAAI,CAAC;IAEX,QAAQ,EAAE,cAAc,EAAE,CAAC;IAE3B,iBAAiB,EAAE,iBAAiB,CAAC;CAW/C"}
@@ -15,6 +15,7 @@ import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
15
15
  import Index from "@entity-access/entity-access/dist/decorators/Index.js";
16
16
  import GraphService from "@entity-access/server-pages/dist/services/GraphService.js";
17
17
  import { IgnoreJsonProperty, JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
18
+ import VerificationToken from "./VerificationToken.js";
18
19
  const loginSessionStatuses = ["created", "change-password", "totp"];
19
20
  let LoginSession = class LoginSession {
20
21
  [GraphService.appendToGraph]() {
@@ -69,9 +70,13 @@ __decorate([
69
70
  __metadata("design:type", String)
70
71
  ], LoginSession.prototype, "deviceTokenType", void 0);
71
72
  __decorate([
72
- Column({ dataType: "Char", length: 50, nullable: true }),
73
- __metadata("design:type", String)
74
- ], LoginSession.prototype, "smsToken", void 0);
73
+ Column({ dataType: "BigInt", nullable: true }),
74
+ RelateTo(VerificationToken, {
75
+ property: (x) => x.verificationToken,
76
+ inverseProperty: (x) => x.loginSessions
77
+ }),
78
+ __metadata("design:type", Number)
79
+ ], LoginSession.prototype, "verificationID", void 0);
75
80
  __decorate([
76
81
  JsonProperty(),
77
82
  __metadata("design:type", String)
@@ -96,10 +101,6 @@ __decorate([
96
101
  JsonProperty({ help: "One Time Password" }),
97
102
  __metadata("design:type", String)
98
103
  ], LoginSession.prototype, "oneTimePassword", void 0);
99
- __decorate([
100
- JsonProperty({ help: "SMS URL to Display" }),
101
- __metadata("design:type", String)
102
- ], LoginSession.prototype, "smsConfig", void 0);
103
104
  LoginSession = __decorate([
104
105
  Table("LoginSessions"),
105
106
  Index({
@@ -109,15 +110,6 @@ LoginSession = __decorate([
109
110
  { name: (x) => x.status, descending: false }
110
111
  ],
111
112
  filter: (x) => x.invalid === false && x.deviceTokenType !== null
112
- }),
113
- Index({
114
- name: "IX_LoginSessions_Phone_Codes",
115
- columns: [
116
- { name: (x) => x.userID, descending: false },
117
- { name: (x) => x.smsToken, descending: false }
118
- ],
119
- unique: true,
120
- filter: (x) => x.smsToken !== null
121
113
  })
122
114
  ], LoginSession);
123
115
  export default LoginSession;
@@ -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;;+CACnB;AAtER,YAAY;IAlBhC,KAAK,CAAC,eAAe,CAAC;IACtB,KAAK,CAAC;QACH,IAAI,EAAE,mCAAmC;QACzC,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,UAAU,EAAE,KAAK,EAAE;YACrD,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE;SAC/C;QACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,eAAe,KAAK,IAAI;KACnE,CAAC;IACD,KAAK,CAAC;QACH,IAAI,EAAE,8BAA8B;QACpC,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE;YAC5C,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE;SACjD;QACD,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI;KACrC,CAAC;GACmB,YAAY,CAqFhC;eArFoB,YAAY"}
1
+ {"version":3,"file":"LoginSession.js","sourceRoot":"","sources":["../../../../src/server/model/entities/LoginSession.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { User } from "./User.js";
2
2
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
3
+ import VerificationToken from "./VerificationToken.js";
3
4
  declare const authMethods: readonly ["totp", "hotp", "fido2", "one-time", "otp", "otp-in"];
4
5
  export type authMethodTypes = typeof authMethods[number];
5
6
  export default class UserAuthFactor {
@@ -10,6 +11,7 @@ export default class UserAuthFactor {
10
11
  hint: string;
11
12
  phoneNumber: string;
12
13
  isdCode: string;
14
+ verificationID: number;
13
15
  verified: boolean;
14
16
  dateUpdated: DateTime;
15
17
  user: User;
@@ -17,6 +19,7 @@ export default class UserAuthFactor {
17
19
  token: string;
18
20
  displaySecret: string;
19
21
  smsConfig: string;
22
+ verificationToken: VerificationToken;
20
23
  }
21
24
  export {};
22
25
  //# sourceMappingURL=UserAuthFactor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"UserAuthFactor.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/UserAuthFactor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAO3E,QAAA,MAAM,WAAW,iEAAkE,CAAC;AACpF,MAAM,MAAM,eAAe,GAAG,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;AAYzD,MAAM,CAAC,OAAO,OAAO,cAAc;IAG/B,YAAY,EAAE,MAAM,CAAC;IAOrB,MAAM,EAAE,MAAM,CAAC;IAGf,MAAM,EAAE,eAAe,CAAC;IAIxB,MAAM,EAAE,MAAM,CAAC;IAGf,IAAI,EAAE,MAAM,CAAC;IAGb,WAAW,EAAE,MAAM,CAAC;IAGpB,OAAO,EAAE,MAAM,CAAC;IAGhB,QAAQ,EAAE,OAAO,CAAC;IAGlB,WAAW,EAAE,QAAQ,CAAC;IAEtB,IAAI,EAAE,IAAI,CAAC;IAGX,aAAa,EAAE,MAAM,CAAC;IAGtB,KAAK,EAAE,MAAM,CAAC;IAGd,aAAa,EAAE,MAAM,CAAC;IAGtB,SAAS,EAAE,MAAM,CAAC;CAErB"}
1
+ {"version":3,"file":"UserAuthFactor.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/UserAuthFactor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAM3E,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAEvD,QAAA,MAAM,WAAW,iEAAkE,CAAC;AACpF,MAAM,MAAM,eAAe,GAAG,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;AAYzD,MAAM,CAAC,OAAO,OAAO,cAAc;IAG/B,YAAY,EAAE,MAAM,CAAC;IAOrB,MAAM,EAAE,MAAM,CAAC;IAGf,MAAM,EAAE,eAAe,CAAC;IAIxB,MAAM,EAAE,MAAM,CAAC;IAGf,IAAI,EAAE,MAAM,CAAC;IAGb,WAAW,EAAE,MAAM,CAAC;IAGpB,OAAO,EAAE,MAAM,CAAC;IAOT,cAAc,EAAE,MAAM,CAAC;IAG9B,QAAQ,EAAE,OAAO,CAAC;IAGlB,WAAW,EAAE,QAAQ,CAAC;IAEtB,IAAI,EAAE,IAAI,CAAC;IAGX,aAAa,EAAE,MAAM,CAAC;IAGtB,KAAK,EAAE,MAAM,CAAC;IAGd,aAAa,EAAE,MAAM,CAAC;IAGtB,SAAS,EAAE,MAAM,CAAC;IAEX,iBAAiB,EAAE,iBAAiB,CAAC;CAE/C"}
@@ -14,6 +14,7 @@ import { User } from "./User.js";
14
14
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
15
15
  import { IgnoreJsonProperty, JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
16
16
  import Index from "@entity-access/entity-access/dist/decorators/Index.js";
17
+ import VerificationToken from "./VerificationToken.js";
17
18
  const authMethods = ["totp", "hotp", "fido2", "one-time", "otp", "otp-in"];
18
19
  let UserAuthFactor = class UserAuthFactor {
19
20
  };
@@ -50,6 +51,14 @@ __decorate([
50
51
  Column({ dataType: "Char", length: 20, nullable: true }),
51
52
  __metadata("design:type", String)
52
53
  ], UserAuthFactor.prototype, "isdCode", void 0);
54
+ __decorate([
55
+ Column({ dataType: "BigInt", nullable: true }),
56
+ RelateTo(VerificationToken, {
57
+ property: (x) => x.verificationToken,
58
+ inverseProperty: (x) => x.authFactors
59
+ }),
60
+ __metadata("design:type", Number)
61
+ ], UserAuthFactor.prototype, "verificationID", void 0);
53
62
  __decorate([
54
63
  Column({ dataType: "Boolean" }),
55
64
  __metadata("design:type", Boolean)
@@ -1 +1 @@
1
- {"version":3,"file":"UserAuthFactor.js","sourceRoot":"","sources":["../../../../src/server/model/entities/UserAuthFactor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAwB,MAAM,2DAA2D,CAAC;AAInI,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAE1E,MAAM,WAAW,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAU,CAAC;AAarE,IAAM,cAAc,GAApB,MAAM,cAAc;CAgDlC,CAAA;AA7CG;IADC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC;;oDAC3C;AAOrB;IALC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE;QACZ,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI;QAC3B,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW;KACxC,CAAC;;8CACa;AAGf;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAC,CAAC;;8CACnC;AAIxB;IAFC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5C,kBAAkB;;8CACJ;AAGf;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC7C;AAGb;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACrC;AAGpB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACzC;AAGhB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAC,CAAC;;gDACb;AAGlB;IADC,MAAM,CAAC,EAAE,CAAC;8BACE,QAAQ;mDAAC;AAKtB;IADC,YAAY,EAAE;;qDACO;AAGtB;IADC,YAAY,EAAE;;6CACD;AAGd;IADC,YAAY,EAAE;;qDACO;AAGtB;IADC,YAAY,EAAE;;iDACG;AA9CD,cAAc;IAVlC,KAAK,CAAC,gBAAgB,CAAC;IACvB,KAAK,CAAC;QACH,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAG,UAAU,EAAE,KAAK,EAAC;YACjD,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAG,UAAU,EAAE,KAAK,EAAC;SAC/C;QACD,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,KAAK,KAAK;KACrF,CAAC;GACmB,cAAc,CAgDlC;eAhDoB,cAAc"}
1
+ {"version":3,"file":"UserAuthFactor.js","sourceRoot":"","sources":["../../../../src/server/model/entities/UserAuthFactor.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,9 @@
1
1
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
2
+ import type LoginSession from "./LoginSession.js";
3
+ import type UserAuthFactor from "./UserAuthFactor.js";
2
4
  export default class VerificationToken {
3
5
  verificationID: number;
6
+ externalID: string;
4
7
  dateCreated: DateTime;
5
8
  expiry: DateTime;
6
9
  verified: boolean;
@@ -8,6 +11,9 @@ export default class VerificationToken {
8
11
  accessCode: string;
9
12
  ipAddress: string;
10
13
  addresses: VerificationTokenAddress[];
14
+ loginSessions: LoginSession[];
15
+ authFactors: UserAuthFactor[];
16
+ smsConfig: any;
11
17
  }
12
18
  export declare class VerificationTokenAddress {
13
19
  verificationID: number;
@@ -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;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"}
1
+ {"version":3,"file":"VerificationToken.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/VerificationToken.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAElD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AAGtD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAGlC,cAAc,EAAE,MAAM,CAAC;IAGvB,UAAU,EAAE,MAAM,CAAC;IAGnB,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;IACtC,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,WAAW,EAAE,cAAc,EAAE,CAAC;IAG9B,SAAS,EAAE,GAAG,CAAC;CAClB;AAED,qBACa,wBAAwB;IAUjC,cAAc,EAAE,MAAM,CAAC;IAGvB,OAAO,EAAE,MAAM,CAAC;IAEhB,iBAAiB,EAAE,iBAAiB,CAAC;CACxC"}
@@ -12,12 +12,17 @@ import Table from "@entity-access/entity-access/dist/decorators/Table.js";
12
12
  import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
13
13
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
14
14
  import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
15
+ import { JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
15
16
  let VerificationToken = class VerificationToken {
16
17
  };
17
18
  __decorate([
18
19
  Column({ dataType: "BigInt", key: true, generated: "identity" }),
19
20
  __metadata("design:type", Number)
20
21
  ], VerificationToken.prototype, "verificationID", void 0);
22
+ __decorate([
23
+ Column({ dataType: "Char", length: 200, nullable: true }),
24
+ __metadata("design:type", String)
25
+ ], VerificationToken.prototype, "externalID", void 0);
21
26
  __decorate([
22
27
  Column({ default: () => Sql.date.now() }),
23
28
  __metadata("design:type", DateTime)
@@ -42,6 +47,10 @@ __decorate([
42
47
  Column({ dataType: "Char", length: 50, nullable: true }),
43
48
  __metadata("design:type", String)
44
49
  ], VerificationToken.prototype, "ipAddress", void 0);
50
+ __decorate([
51
+ JsonProperty({}),
52
+ __metadata("design:type", Object)
53
+ ], VerificationToken.prototype, "smsConfig", void 0);
45
54
  VerificationToken = __decorate([
46
55
  Table("VerificationTokens")
47
56
  ], VerificationToken);
@@ -1 +1 @@
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
+ {"version":3,"file":"VerificationToken.js","sourceRoot":"","sources":["../../../../src/server/model/entities/VerificationToken.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAElF,OAAO,EAAE,YAAY,EAAE,MAAM,2DAA2D,CAAC;AAI1E,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CA+BrC,CAAA;AA5BG;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAC,CAAC;;yDACzC;AAGvB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACvC;AAGnB;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;AAMlB;IADC,YAAY,CAAC,EAAE,CAAC;;oDACF;AA9BE,iBAAiB;IADrC,KAAK,CAAC,oBAAoB,CAAC;GACP,iBAAiB,CA+BrC;eA/BoB,iBAAiB;AAkC/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":"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;AAU/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;IAyF7C,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;IAyGnE,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"}
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;AAU/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;IAyF7C,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;IAwGnE,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"}
@@ -107,9 +107,9 @@ export default class LoginSessionEvents extends EntityEvents {
107
107
  .toArray();
108
108
  if (otpIn.length) {
109
109
  const idsCodes = otpIn.map((x) => x.phoneNumber);
110
- const smsConfig = await ServiceProvider.resolve(this, ExternalOtpInService).create(idsCodes);
111
- entity.smsConfig = JSON.stringify(smsConfig);
112
- entity.smsToken = smsConfig.id + ":" + smsConfig.accessCode;
110
+ const v = await ServiceProvider.resolve(this, ExternalOtpInService).create(idsCodes);
111
+ entity.verificationID = v.verificationID;
112
+ entity.verificationToken = v;
113
113
  }
114
114
  return;
115
115
  }
@@ -151,10 +151,9 @@ export default class LoginSessionEvents extends EntityEvents {
151
151
  }
152
152
  async beforeUpdate(entity, entry) {
153
153
  if (entry.isModified("dateUpdated")) {
154
- if (entity.smsToken) {
155
- const [id, accessCode] = entity.smsToken.split(":");
154
+ if (entity.verificationID) {
156
155
  const eis = ServiceProvider.resolve(this, ExternalOtpInService);
157
- const { success } = await eis.get(id, accessCode);
156
+ const { success } = await eis.get(entity.verificationID);
158
157
  if (success) {
159
158
  entity.status = "created";
160
159
  entity.invalid = false;
@@ -1 +1 @@
1
- {"version":3,"file":"LoginSessionEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/LoginSessionEvents.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LoginSessionEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/LoginSessionEvents.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"UserAuthFactorEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/UserAuthFactorEvents.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,cAAc,MAAM,+BAA+B,CAAC;AAC3D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAI3D,OAAO,sBAAsB,MAAM,uDAAuD,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAM/F,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,mBAAmB,CAAC,cAAc,CAAC;IAGjF,sBAAsB,EAAE,sBAAsB,CAAC;IAE/C,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;IAWzE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;IAIzE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC;IAIpC,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAoDvE,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;CA8BhF"}
1
+ {"version":3,"file":"UserAuthFactorEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/UserAuthFactorEvents.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,cAAc,MAAM,+BAA+B,CAAC;AAC3D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAI3D,OAAO,sBAAsB,MAAM,uDAAuD,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAM/F,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,mBAAmB,CAAC,cAAc,CAAC;IAGjF,sBAAsB,EAAE,sBAAsB,CAAC;IAE/C,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;IAWzE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;IAIzE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC;IAIpC,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAmDvE,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;CA8BhF"}
@@ -49,10 +49,9 @@ export default class UserAuthFactorEvents extends AuthenticatedEvents {
49
49
  const db = ServiceProvider.resolve(this, SocialMailContext);
50
50
  const phones = await db.userAuthFactors.where(entity, (p) => (x) => x.userID === p.userID && x.method === "otp-in").toArray();
51
51
  const phoneNumbers = phones.map((x) => x.phoneNumber);
52
- const smsConfig = await ServiceProvider.resolve(this, ExternalOtpInService).create(phoneNumbers);
53
- entity.smsConfig = JSON.stringify(smsConfig);
54
- entity.secret = smsConfig.accessCode;
55
- entity.hint = smsConfig.id;
52
+ const v = await ServiceProvider.resolve(this, ExternalOtpInService).create(phoneNumbers);
53
+ entity.verificationID = v.verificationID;
54
+ entity.verificationToken = v;
56
55
  return;
57
56
  }
58
57
  if (entity.method === "one-time") {
@@ -85,9 +84,9 @@ export default class UserAuthFactorEvents extends AuthenticatedEvents {
85
84
  throw new EntityAccessError(`Cannot modify Auth Factor.`);
86
85
  }
87
86
  if (!entity.verified) {
88
- if (!entity.token) {
87
+ if (entity.verificationID) {
89
88
  const eois = ServiceProvider.resolve(this, ExternalOtpInService);
90
- const result = await eois.get(entity.hint, entity.secret);
89
+ const result = await eois.get(entity.verificationID);
91
90
  if (result.success) {
92
91
  entity.verified = true;
93
92
  }
@@ -1 +1 @@
1
- {"version":3,"file":"UserAuthFactorEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/UserAuthFactorEvents.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UserAuthFactorEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/UserAuthFactorEvents.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,10 @@
1
+ import SocialMailContext from "../../model/SocialMailContext.js";
2
+ import CryptoService from "../CryptoService.js";
1
3
  export default class ExternalOtpInService {
2
- create(phoneNumbers: string[]): Promise<any>;
3
- get(id: any, accessCode: any): Promise<{
4
+ db: SocialMailContext;
5
+ cryptoService: CryptoService;
6
+ create(phoneNumbers: string[]): Promise<import("../../model/entities/VerificationToken.js").default>;
7
+ get(verificationID: any): Promise<{
4
8
  success: any;
5
9
  }>;
6
10
  }
@@ -1 +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;IAW7B,GAAG,CAAC,EAAE,KAAA,EAAE,UAAU,KAAA;;;CAQ3B"}
1
+ {"version":3,"file":"ExternalOtpInService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/external-otp-in/ExternalOtpInService.ts"],"names":[],"mappings":"AAEA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAchD,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAGrC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,aAAa,EAAE,aAAa,CAAC;IAEvB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE;IA6B7B,GAAG,CAAC,cAAc,KAAA;;;CAS3B"}
@@ -4,8 +4,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
4
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
5
  return c > 3 && r && Object.defineProperty(target, key, r), r;
6
6
  };
7
- import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
7
+ var __metadata = (this && this.__metadata) || function (k, v) {
8
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
+ };
10
+ import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
8
11
  import { globalEnv } from "../../../common/globalEnv.js";
12
+ import SocialMailContext from "../../model/SocialMailContext.js";
13
+ import CryptoService from "../CryptoService.js";
14
+ import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
9
15
  const headers = {
10
16
  authorization: `basic ${Buffer.from(`${globalEnv.otpIn.key}:${globalEnv.otpIn.secret}`).toString("base64")}`
11
17
  };
@@ -22,10 +28,24 @@ let ExternalOtpInService = class ExternalOtpInService {
22
28
  phoneNumbers
23
29
  })
24
30
  });
25
- return await rs.json();
31
+ const result = await rs.json();
32
+ const dateCreated = DateTime.now;
33
+ const expiry = dateCreated.addMinutes(15);
34
+ const { accessCode } = result;
35
+ // create hash
36
+ const v = await this.db.verificationTokens.statements.insert({
37
+ externalID: result.id,
38
+ accessCode,
39
+ dateCreated,
40
+ expiry,
41
+ });
42
+ result.id = v.verificationID.toString();
43
+ v.smsConfig = result;
44
+ return v;
26
45
  }
27
- async get(id, accessCode) {
28
- const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/get/${id}/${accessCode}`, {
46
+ async get(verificationID) {
47
+ const v = await this.db.verificationTokens.statements.select({}, { verificationID });
48
+ const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/get/${v.externalID}/${v.accessCode}`, {
29
49
  method: "GET",
30
50
  headers
31
51
  });
@@ -33,8 +53,16 @@ let ExternalOtpInService = class ExternalOtpInService {
33
53
  return { success };
34
54
  }
35
55
  };
56
+ __decorate([
57
+ Inject,
58
+ __metadata("design:type", SocialMailContext)
59
+ ], ExternalOtpInService.prototype, "db", void 0);
60
+ __decorate([
61
+ Inject,
62
+ __metadata("design:type", CryptoService)
63
+ ], ExternalOtpInService.prototype, "cryptoService", void 0);
36
64
  ExternalOtpInService = __decorate([
37
- RegisterSingleton
65
+ RegisterScoped
38
66
  ], ExternalOtpInService);
39
67
  export default ExternalOtpInService;
40
68
  //# sourceMappingURL=ExternalOtpInService.js.map
@@ -1 +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,OAAO,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU;QACpB,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,WAAW,SAAS,CAAC,KAAK,CAAC,IAAI,mBAAmB,EAAE,IAAI,UAAU,EAAE,EAAE;YACzF,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;AArBoB,oBAAoB;IADxC,iBAAiB;GACG,oBAAoB,CAqBxC;eArBoB,oBAAoB"}
1
+ {"version":3,"file":"ExternalOtpInService.js","sourceRoot":"","sources":["../../../../src/server/services/external-otp-in/ExternalOtpInService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAqB,MAAM,4CAA4C,CAAC;AACvG,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,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;IAQrC,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,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAE/B,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACjC,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAE1C,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;QAE9B,cAAc;QACd,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,CAAC;YACzD,UAAU,EAAE,MAAM,CAAC,EAAE;YACrB,UAAU;YACV,WAAW;YACX,MAAM;SACT,CAAC,CAAC;QAGH,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;QACxC,CAAC,CAAC,SAAS,GAAG,MAAM,CAAC;QACrB,OAAO,CAAC,CAAC;IACb,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,cAAc;QACpB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAG,EAAE,cAAc,EAAE,CAAC,CAAC;QACtF,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,WAAW,SAAS,CAAC,KAAK,CAAC,IAAI,mBAAmB,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;YACrG,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;AA3CG;IADC,MAAM;8BACH,iBAAiB;gDAAC;AAGtB;IADC,MAAM;8BACQ,aAAa;2DAAC;AANZ,oBAAoB;IADxC,cAAc;GACM,oBAAoB,CA8CxC;eA9CoB,oBAAoB"}