@social-mail/social-mail-web-server 1.4.834 → 1.4.836
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/model/events/UserEvents.js +1 -1
- package/dist/server/model/events/UserEvents.js.map +1 -1
- package/dist/server/services/DBConfig.js +1 -1
- package/dist/server/services/DBConfig.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/server/model/events/UserEvents.ts +1 -1
- package/src/server/services/DBConfig.ts +1 -1
|
@@ -131,7 +131,7 @@ export default class UserEvents extends AuthenticatedEvents {
|
|
|
131
131
|
await this.db.userAuthFactors.where({ userID }, (p) => (x) => x.userID === p.userID)
|
|
132
132
|
.delete(void 0, (p) => (x) => x.method === "totp" && x.verified === false);
|
|
133
133
|
const hasTOTP = await this.db.userAuthFactors.where({ userID }, (p) => (x) => x.userID === p.userID
|
|
134
|
-
&& x.method
|
|
134
|
+
&& Sql.in(x.method, ["totp", "otp-in"])
|
|
135
135
|
&& x.verified === true)
|
|
136
136
|
.first();
|
|
137
137
|
if (!hasTOTP) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/UserEvents.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"UserEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/UserEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ let DBConfig = class DBConfig {
|
|
|
53
53
|
return new ConfigItem(c, this, type);
|
|
54
54
|
}
|
|
55
55
|
async getValue(type, throwIfNotFound = true, name = type.name) {
|
|
56
|
-
return (await this.get(type, throwIfNotFound, name))
|
|
56
|
+
return (await this.get(type, throwIfNotFound, name))?.value;
|
|
57
57
|
}
|
|
58
58
|
async set(values) {
|
|
59
59
|
const c = Object.getPrototypeOf(values)?.constructor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBConfig.js","sourceRoot":"","sources":["../../../src/server/services/DBConfig.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAI9F,MAAM,OAAO,eAAe;CAI3B;AAED,MAAM,OAAO,iBAAiB;CAK7B;AAED,MAAM,OAAO,UAAU;IAEnB,IAAW,KAAK;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,KAAmB,CAAC;IACzC,CAAC;IAED,IAAW,KAAK,CAAC,CAAa;QAC1B,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACxB,CAAC;IAED,YACoB,IAAmB,EAC3B,MAAgB,EAChB,IAAiB;QAFT,SAAI,GAAJ,IAAI,CAAe;QAC3B,WAAM,GAAN,MAAM,CAAU;QAChB,SAAI,GAAJ,IAAI,CAAa;IAG7B,CAAC;IAEM,KAAK,CAAC,MAAM;QACf,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;CACJ;AAGc,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAMzB,UAAU;IACV,gDAAgD;IAEzC,KAAK,CAAC,WAAW,CAAI,IAAiB,EAAE,WAAuB,EAAE,EAAE,IAAI,GAAG,IAAI,CAAC,IAAI;QACtF,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC;YAClE,IAAI;YACJ,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC5C,CAAC,CAAC;QACV,oEAAoE;QACpE,OAAO,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,GAAG,CAAI,IAAiB,EAAE,eAAe,GAAG,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,IAAI;QAC3E,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACrG,IAAI,CAAC,CAAC,EAAE,CAAC;YACL,IAAI,eAAe,EAAE,CAAC;gBAClB,MAAM,IAAI,iBAAiB,CAAC,GAAG,IAAI,CAAC,IAAI,+BAA+B,CAAC,CAAC;YAC7E,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,oEAAoE;QACpE,OAAO,IAAI,UAAU,CAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAI,IAAiB,EAAE,eAAe,GAAG,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,IAAI;QAChF,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"DBConfig.js","sourceRoot":"","sources":["../../../src/server/services/DBConfig.ts"],"names":[],"mappings":"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"}
|