@social-mail/social-mail-web-server 1.4.804 → 1.4.806
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/AppStringHelper.d.ts +1 -0
- package/dist/common/AppStringHelper.d.ts.map +1 -1
- package/dist/common/AppStringHelper.js +6 -0
- package/dist/common/AppStringHelper.js.map +1 -1
- package/dist/server/model/SocialMailContext.d.ts +2 -0
- package/dist/server/model/SocialMailContext.d.ts.map +1 -1
- package/dist/server/model/SocialMailContext.js +2 -0
- package/dist/server/model/SocialMailContext.js.map +1 -1
- package/dist/server/model/SocialMailContextEvents.d.ts.map +1 -1
- package/dist/server/model/SocialMailContextEvents.js +3 -0
- package/dist/server/model/SocialMailContextEvents.js.map +1 -1
- package/dist/server/model/entities/Configuration.d.ts.map +1 -1
- package/dist/server/model/entities/Configuration.js +10 -0
- package/dist/server/model/entities/Configuration.js.map +1 -1
- package/dist/server/model/entities/IncomingSmsSource.d.ts +13 -0
- package/dist/server/model/entities/IncomingSmsSource.d.ts.map +1 -0
- package/dist/server/model/entities/IncomingSmsSource.js +57 -0
- package/dist/server/model/entities/IncomingSmsSource.js.map +1 -0
- package/dist/server/model/entities/LoginSession.d.ts +6 -0
- package/dist/server/model/entities/LoginSession.d.ts.map +1 -1
- package/dist/server/model/entities/LoginSession.js +17 -0
- package/dist/server/model/entities/LoginSession.js.map +1 -1
- package/dist/server/model/entities/UserAuthFactor.d.ts +9 -1
- package/dist/server/model/entities/UserAuthFactor.d.ts.map +1 -1
- package/dist/server/model/entities/UserAuthFactor.js +26 -3
- package/dist/server/model/entities/UserAuthFactor.js.map +1 -1
- package/dist/server/model/events/ConfigurationEvents.d.ts.map +1 -1
- package/dist/server/model/events/ConfigurationEvents.js +5 -0
- package/dist/server/model/events/ConfigurationEvents.js.map +1 -1
- package/dist/server/model/events/IncomingSmsSourceEvents.d.ts +14 -0
- package/dist/server/model/events/IncomingSmsSourceEvents.d.ts.map +1 -0
- package/dist/server/model/events/IncomingSmsSourceEvents.js +38 -0
- package/dist/server/model/events/IncomingSmsSourceEvents.js.map +1 -0
- package/dist/server/model/events/LoginSessionEvents.d.ts.map +1 -1
- package/dist/server/model/events/LoginSessionEvents.js +17 -1
- package/dist/server/model/events/LoginSessionEvents.js.map +1 -1
- package/dist/server/model/events/UserAuthFactorEvents.d.ts.map +1 -1
- package/dist/server/model/events/UserAuthFactorEvents.js +15 -1
- package/dist/server/model/events/UserAuthFactorEvents.js.map +1 -1
- package/dist/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/seed/ui/seed-ui.js.map +1 -1
- package/dist/server/services/DBConfig.d.ts +13 -5
- package/dist/server/services/DBConfig.d.ts.map +1 -1
- package/dist/server/services/DBConfig.js +26 -31
- package/dist/server/services/DBConfig.js.map +1 -1
- package/dist/server/services/incoming-sms/IncomingSmsService.d.ts +13 -0
- package/dist/server/services/incoming-sms/IncomingSmsService.d.ts.map +1 -0
- package/dist/server/services/incoming-sms/IncomingSmsService.js +160 -0
- package/dist/server/services/incoming-sms/IncomingSmsService.js.map +1 -0
- package/dist/server/services/ui/renderUIClient.js +1 -1
- package/dist/server/services/ui/renderUIClient.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/callback/smtp/otp-in/textlocal.in/post.d.ts +9 -0
- package/dist/wwwroot/routes/callback/smtp/otp-in/textlocal.in/post.d.ts.map +1 -0
- package/dist/wwwroot/routes/callback/smtp/otp-in/textlocal.in/post.js +54 -0
- package/dist/wwwroot/routes/callback/smtp/otp-in/textlocal.in/post.js.map +1 -0
- package/dist/wwwroot/routes/callback/smtp/otp-in/twilio/post.d.ts +9 -0
- package/dist/wwwroot/routes/callback/smtp/otp-in/twilio/post.d.ts.map +1 -0
- package/dist/wwwroot/routes/callback/smtp/otp-in/twilio/post.js +49 -0
- package/dist/wwwroot/routes/callback/smtp/otp-in/twilio/post.js.map +1 -0
- package/dist/wwwroot/routes/pwa/index.js +1 -1
- package/dist/wwwroot/routes/pwa/index.js.map +1 -1
- package/dist/wwwroot/routes/pwa/manifest.json/index.js +1 -1
- package/dist/wwwroot/routes/pwa/manifest.json/index.js.map +1 -1
- package/dist/wwwroot/routes/pwa-sw.js/index.js +1 -1
- package/dist/wwwroot/routes/pwa-sw.js/index.js.map +1 -1
- package/package.json +2 -2
- package/src/common/AppStringHelper.ts +6 -0
- package/src/server/model/SocialMailContext.ts +3 -0
- package/src/server/model/SocialMailContextEvents.ts +5 -0
- package/src/server/model/entities/Configuration.ts +18 -0
- package/src/server/model/entities/IncomingSmsSource.ts +39 -0
- package/src/server/model/entities/LoginSession.ts +15 -0
- package/src/server/model/entities/UserAuthFactor.ts +26 -2
- package/src/server/model/events/ConfigurationEvents.ts +13 -0
- package/src/server/model/events/IncomingSmsSourceEvents.ts +48 -0
- package/src/server/model/events/LoginSessionEvents.ts +24 -1
- package/src/server/model/events/UserAuthFactorEvents.ts +15 -0
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/DBConfig.ts +35 -33
- package/src/server/services/incoming-sms/IncomingSmsService.ts +75 -0
- package/src/server/services/ui/renderUIClient.tsx +1 -1
- package/src/wwwroot/routes/callback/smtp/otp-in/textlocal.in/post.tsx +51 -0
- package/src/wwwroot/routes/callback/smtp/otp-in/twilio/post.tsx +44 -0
- package/src/wwwroot/routes/pwa/index.ts +1 -1
- package/src/wwwroot/routes/pwa/manifest.json/index.ts +1 -1
- package/src/wwwroot/routes/pwa-sw.js/index.ts +1 -1
|
@@ -8,7 +8,7 @@ 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 EntityEvents from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
|
|
11
|
-
import Inject from "@entity-access/entity-access/dist/di/di.js";
|
|
11
|
+
import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
|
|
12
12
|
import SocialMailContext from "../SocialMailContext.js";
|
|
13
13
|
import CryptoService from "../../services/CryptoService.js";
|
|
14
14
|
import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
|
|
@@ -20,6 +20,8 @@ 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 { AppStringHelper } from "../../../common/AppStringHelper.js";
|
|
24
|
+
import IncomingSmsService from "../../services/incoming-sms/IncomingSmsService.js";
|
|
23
25
|
export default class LoginSessionEvents extends EntityEvents {
|
|
24
26
|
currentUser() {
|
|
25
27
|
const { sessionID = 0, userID = 0 } = this.sessionUser;
|
|
@@ -102,6 +104,13 @@ export default class LoginSessionEvents extends EntityEvents {
|
|
|
102
104
|
if (!entity.timeToken) {
|
|
103
105
|
entity.invalid = true;
|
|
104
106
|
entity.status = "totp";
|
|
107
|
+
const otpIn = await this.db.userAuthFactors.where(user, (p) => (x) => x.userID === p.userID && x.method === "otp-in")
|
|
108
|
+
.toArray();
|
|
109
|
+
if (otpIn) {
|
|
110
|
+
const code = entity.smsToken = AppStringHelper.last(DateTime.now.msSinceEpoch.toString(), 6);
|
|
111
|
+
const idsCodes = otpIn.map((x) => x.isdCode.startsWith("+") ? x.isdCode : "+" + x.isdCode);
|
|
112
|
+
entity.smsConfig = await ServiceProvider.resolve(this, IncomingSmsService).prepareCode(code, ...idsCodes);
|
|
113
|
+
}
|
|
105
114
|
return;
|
|
106
115
|
}
|
|
107
116
|
}
|
|
@@ -159,6 +168,13 @@ export default class LoginSessionEvents extends EntityEvents {
|
|
|
159
168
|
if (!(entry.isModified("dateUpdated"))) {
|
|
160
169
|
throw new EntityAccessError(`Cannot modify anything except invalid, dateUpdated`);
|
|
161
170
|
}
|
|
171
|
+
if (await this.db.loginSessions
|
|
172
|
+
.where(entity, (p) => (x) => x.sessionID === p.sessionID
|
|
173
|
+
&& x.status === "created"
|
|
174
|
+
&& x.invalid === false)
|
|
175
|
+
.some()) {
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
162
178
|
const user = await this.db.users
|
|
163
179
|
.where({ userName: entity.userName }, (p) => (x) => x.userName === p.userName)
|
|
164
180
|
.first();
|
|
@@ -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,MAAM,4CAA4C,CAAC;
|
|
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;
|
|
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;AAO/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;IA8CvE,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;CAahF"}
|
|
@@ -10,9 +10,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
import AuthenticatedEvents from "./AuthenticatedEvents.js";
|
|
11
11
|
import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
|
|
12
12
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
13
|
-
import Inject from "@entity-access/entity-access/dist/di/di.js";
|
|
13
|
+
import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
|
|
14
14
|
import MultiAuthFactorService from "../../services/auth-factors/MultiAuthFactorService.js";
|
|
15
15
|
import { randomUUID } from "crypto";
|
|
16
|
+
import { AppStringHelper } from "../../../common/AppStringHelper.js";
|
|
17
|
+
import IncomingSmsService from "../../services/incoming-sms/IncomingSmsService.js";
|
|
16
18
|
export default class UserAuthFactorEvents extends AuthenticatedEvents {
|
|
17
19
|
filter(query) {
|
|
18
20
|
if (this.verify) {
|
|
@@ -37,6 +39,18 @@ export default class UserAuthFactorEvents extends AuthenticatedEvents {
|
|
|
37
39
|
if (!entity.userID) {
|
|
38
40
|
entity.userID = this.sessionUser.userID;
|
|
39
41
|
}
|
|
42
|
+
if (entity.method === "otp-in") {
|
|
43
|
+
if (!entity.isdCode?.startsWith("+")) {
|
|
44
|
+
throw new EntityAccessError(`ISD code must be provided starting with +`);
|
|
45
|
+
}
|
|
46
|
+
if (!entity.phoneNumber?.startsWith(entity.isdCode)) {
|
|
47
|
+
throw new EntityAccessError(`Phone Number must start with + and include full ISD code`);
|
|
48
|
+
}
|
|
49
|
+
entity.secret = AppStringHelper.last(DateTime.now.msSinceEpoch.toString(), 6);
|
|
50
|
+
entity.smsConfig = await ServiceProvider.resolve(this, IncomingSmsService).prepareCode(entity.secret, entity.isdCode);
|
|
51
|
+
entity.hint = AppStringHelper.last(entity.phoneNumber, 4);
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
40
54
|
if (entity.method === "one-time") {
|
|
41
55
|
entity.secret = `sm-otp-${randomUUID()}`;
|
|
42
56
|
entity.displaySecret = entity.secret;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAuthFactorEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/UserAuthFactorEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,
|
|
1
|
+
{"version":3,"file":"UserAuthFactorEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/UserAuthFactorEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { UIPackageConfig } from "../../services/DBConfig.js";
|
|
|
2
2
|
import semver from "semver";
|
|
3
3
|
export default async function seedUI(config) {
|
|
4
4
|
const version = "1.2.315";
|
|
5
|
-
const existing = await config.
|
|
5
|
+
const existing = await config.getValue(UIPackageConfig, false);
|
|
6
6
|
if (existing) {
|
|
7
7
|
if (semver.gte(existing.version, version)) {
|
|
8
8
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed-ui.js","sourceRoot":"","sources":["../../../../src/server/seed/ui/seed-ui.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,MAAgB;IAEjD,MAAM,OAAO,GAAG,SAAS,CAAC;IAE1B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"seed-ui.js","sourceRoot":"","sources":["../../../../src/server/seed/ui/seed-ui.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,MAAgB;IAEjD,MAAM,OAAO,GAAG,SAAS,CAAC;IAE1B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IAC/D,IAAI,QAAQ,EAAE,CAAC;QACX,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACxC,OAAO;QACX,CAAC;IACL,CAAC;IACD,MAAM,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE;QAC/B,OAAO,EAAE,iCAAiC;QAC1C,IAAI,EAAE,mBAAmB;QACzB,OAAO;KACV,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -5,8 +5,14 @@ export declare class UIPackageConfig {
|
|
|
5
5
|
version: string;
|
|
6
6
|
view: string;
|
|
7
7
|
}
|
|
8
|
+
export declare class CredentialsConfig {
|
|
9
|
+
host: string;
|
|
10
|
+
url: string;
|
|
11
|
+
username: string;
|
|
12
|
+
password: string;
|
|
13
|
+
}
|
|
8
14
|
export declare class ConfigItem<T> {
|
|
9
|
-
|
|
15
|
+
readonly item: Configuration;
|
|
10
16
|
private config;
|
|
11
17
|
private type;
|
|
12
18
|
get value(): Partial<T>;
|
|
@@ -16,9 +22,11 @@ export declare class ConfigItem<T> {
|
|
|
16
22
|
}
|
|
17
23
|
export default class DBConfig {
|
|
18
24
|
private context;
|
|
19
|
-
getOrCreate<T>(type: IClassOf<T>, defaults?: Partial<T
|
|
20
|
-
get<T>(type: IClassOf<T>, throwIfNotFound?: boolean): Promise<T
|
|
21
|
-
|
|
22
|
-
|
|
25
|
+
getOrCreate<T>(type: IClassOf<T>, defaults?: Partial<T>, name?: string): Promise<ConfigItem<T>>;
|
|
26
|
+
get<T>(type: IClassOf<T>, throwIfNotFound?: boolean, name?: string): Promise<ConfigItem<T>>;
|
|
27
|
+
getValue<T>(type: IClassOf<T>, throwIfNotFound?: boolean, name?: string): Promise<Partial<T>>;
|
|
28
|
+
set<T>(values: T): Promise<ConfigItem<unknown>>;
|
|
29
|
+
seed<T>(c: IClassOf<T>, values: Partial<T>, name?: string): Promise<ConfigItem<T>>;
|
|
30
|
+
save<T>(type: IClassOf<T>, values: Partial<T>, seed?: boolean, name?: string): Promise<ConfigItem<T>>;
|
|
23
31
|
}
|
|
24
32
|
//# sourceMappingURL=DBConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBConfig.d.ts","sourceRoot":"","sources":["../../../src/server/services/DBConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0DAA0D,CAAC;AAIpF,OAAO,aAAa,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"DBConfig.d.ts","sourceRoot":"","sources":["../../../src/server/services/DBConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0DAA0D,CAAC;AAIpF,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAG/D,qBAAa,eAAe;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,iBAAiB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,qBAAa,UAAU,CAAC,CAAC;aAWD,IAAI,EAAE,aAAa;IACnC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;IAXhB,IAAW,KAAK,IAII,OAAO,CAAC,CAAC,CAAC,CAF7B;IAED,IAAW,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAE7B;gBAGmB,IAAI,EAAE,aAAa,EAC3B,MAAM,EAAE,QAAQ,EAChB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAKhB,MAAM;CAGtB;AAGD,MAAM,CAAC,OAAO,OAAO,QAAQ;IAIzB,OAAO,CAAC,OAAO,CAAoB;IAKtB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAE,OAAO,CAAC,CAAC,CAAM,EAAE,IAAI,SAAY;IAS7E,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,eAAe,UAAO,EAAE,IAAI,SAAY;IAYlE,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,eAAe,UAAO,EAAE,IAAI,SAAY;IAIvE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IAQhB,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,SAAS;IAIzD,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,UAAQ,EAAE,IAAI,SAAY;CAc7F"}
|
|
@@ -12,6 +12,8 @@ import SocialMailContext from "../model/SocialMailContext.js";
|
|
|
12
12
|
import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
|
|
13
13
|
export class UIPackageConfig {
|
|
14
14
|
}
|
|
15
|
+
export class CredentialsConfig {
|
|
16
|
+
}
|
|
15
17
|
export class ConfigItem {
|
|
16
18
|
get value() {
|
|
17
19
|
return this.item.value;
|
|
@@ -29,26 +31,17 @@ export class ConfigItem {
|
|
|
29
31
|
}
|
|
30
32
|
}
|
|
31
33
|
let DBConfig = class DBConfig {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
+
// @Inject
|
|
35
|
+
// private encryptionService: EncryptionService;
|
|
36
|
+
async getOrCreate(type, defaults = {}, name = type.name) {
|
|
34
37
|
const c = await this.context.configurations.statements.selectOrInsert({
|
|
35
38
|
name,
|
|
36
|
-
configValue:
|
|
39
|
+
configValue: JSON.stringify(defaults, void 0, 4)
|
|
37
40
|
});
|
|
38
|
-
//
|
|
39
|
-
// keys: {
|
|
40
|
-
// name
|
|
41
|
-
// },
|
|
42
|
-
// mode: "selectOrInsert",
|
|
43
|
-
// changes: {
|
|
44
|
-
// name,
|
|
45
|
-
// configValue: "{}"
|
|
46
|
-
// } as any
|
|
47
|
-
// });
|
|
41
|
+
// c.decryptedPassword = this.encryptionService.decrypt(c.password);
|
|
48
42
|
return new ConfigItem(c, this, type);
|
|
49
43
|
}
|
|
50
|
-
async get(type, throwIfNotFound = true) {
|
|
51
|
-
const name = type.name;
|
|
44
|
+
async get(type, throwIfNotFound = true, name = type.name) {
|
|
52
45
|
const c = await this.context.configurations.where({ name }, (p) => (x) => x.name === p.name).first();
|
|
53
46
|
if (!c) {
|
|
54
47
|
if (throwIfNotFound) {
|
|
@@ -56,7 +49,11 @@ let DBConfig = class DBConfig {
|
|
|
56
49
|
}
|
|
57
50
|
return null;
|
|
58
51
|
}
|
|
59
|
-
|
|
52
|
+
// c.decryptedPassword = this.encryptionService.decrypt(c.password);
|
|
53
|
+
return new ConfigItem(c, this, type);
|
|
54
|
+
}
|
|
55
|
+
async getValue(type, throwIfNotFound = true, name = type.name) {
|
|
56
|
+
return (await this.get(type, throwIfNotFound, name)).value;
|
|
60
57
|
}
|
|
61
58
|
async set(values) {
|
|
62
59
|
const c = Object.getPrototypeOf(values)?.constructor;
|
|
@@ -65,24 +62,22 @@ let DBConfig = class DBConfig {
|
|
|
65
62
|
}
|
|
66
63
|
return this.save(c, values);
|
|
67
64
|
}
|
|
68
|
-
async
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
});
|
|
75
|
-
await this.context.saveChanges();
|
|
65
|
+
async seed(c, values, name = c.name) {
|
|
66
|
+
return this.save(c, values, true, name);
|
|
67
|
+
}
|
|
68
|
+
async save(type, values, seed = false, name = type.name) {
|
|
69
|
+
let config;
|
|
70
|
+
if (seed) {
|
|
71
|
+
config = await this.context.configurations.statements.selectOrInsert({ name, configValue: JSON.stringify(values, void 0, 4) }, { name });
|
|
76
72
|
}
|
|
77
73
|
else {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
74
|
+
config = await this.context.configurations.statements.upsert({
|
|
75
|
+
name,
|
|
76
|
+
configValue: JSON.stringify(values, void 0, 4)
|
|
77
|
+
}, void 0, { name });
|
|
81
78
|
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
.update(config, (p) => (x) => ({ configValue: p.configValue }));
|
|
85
|
-
return c;
|
|
79
|
+
const ci = new ConfigItem(config, this, type);
|
|
80
|
+
return ci;
|
|
86
81
|
}
|
|
87
82
|
};
|
|
88
83
|
__decorate([
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"DBConfig.js","sourceRoot":"","sources":["../../../src/server/services/DBConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import EncryptionService from "../encryption/EncryptionService.js";
|
|
2
|
+
export default class IncomingSmsService {
|
|
3
|
+
encryptionService: EncryptionService;
|
|
4
|
+
verifySource(phoneNumber: any, user: any, password: any): Promise<void>;
|
|
5
|
+
prepareCode(code: any, ...isdCodes: any[]): Promise<{
|
|
6
|
+
code: string;
|
|
7
|
+
phoneNumber: string;
|
|
8
|
+
prefix: string;
|
|
9
|
+
url: string;
|
|
10
|
+
}[]>;
|
|
11
|
+
verify(phoneNumber: string, code: string): Promise<void>;
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=IncomingSmsService.d.ts.map
|
|
@@ -0,0 +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;AAInE,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAInC,iBAAiB,EAAE,iBAAiB,CAAC;IAG/B,YAAY,CAAC,WAAW,KAAA,EAAE,IAAI,KAAA,EAAE,QAAQ,KAAA;IAaxC,WAAW,CAAC,IAAI,KAAA,EAAE,GAAI,QAAQ,OAAA;cAGH,MAAM;qBAAe,MAAM;gBAAU,MAAM;aAAO,MAAM;;IAgBnF,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CA6BjD"}
|
|
@@ -0,0 +1,160 @@
|
|
|
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
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
|
|
11
|
+
if (value !== null && value !== void 0) {
|
|
12
|
+
if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
|
|
13
|
+
var dispose, inner;
|
|
14
|
+
if (async) {
|
|
15
|
+
if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
|
|
16
|
+
dispose = value[Symbol.asyncDispose];
|
|
17
|
+
}
|
|
18
|
+
if (dispose === void 0) {
|
|
19
|
+
if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
|
|
20
|
+
dispose = value[Symbol.dispose];
|
|
21
|
+
if (async) inner = dispose;
|
|
22
|
+
}
|
|
23
|
+
if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
|
|
24
|
+
if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
|
|
25
|
+
env.stack.push({ value: value, dispose: dispose, async: async });
|
|
26
|
+
}
|
|
27
|
+
else if (async) {
|
|
28
|
+
env.stack.push({ async: true });
|
|
29
|
+
}
|
|
30
|
+
return value;
|
|
31
|
+
};
|
|
32
|
+
var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
|
|
33
|
+
return function (env) {
|
|
34
|
+
function fail(e) {
|
|
35
|
+
env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
|
|
36
|
+
env.hasError = true;
|
|
37
|
+
}
|
|
38
|
+
function next() {
|
|
39
|
+
while (env.stack.length) {
|
|
40
|
+
var rec = env.stack.pop();
|
|
41
|
+
try {
|
|
42
|
+
var result = rec.dispose && rec.dispose.call(rec.value);
|
|
43
|
+
if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
|
|
44
|
+
}
|
|
45
|
+
catch (e) {
|
|
46
|
+
fail(e);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
if (env.hasError) throw env.error;
|
|
50
|
+
}
|
|
51
|
+
return next();
|
|
52
|
+
};
|
|
53
|
+
})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
|
|
54
|
+
var e = new Error(message);
|
|
55
|
+
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
|
|
56
|
+
});
|
|
57
|
+
import Inject, { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
|
|
58
|
+
import SocialMailContext from "../../model/SocialMailContext.js";
|
|
59
|
+
import EncryptionService from "../encryption/EncryptionService.js";
|
|
60
|
+
import { cacheFor } from "../../../common/cacheFor.js";
|
|
61
|
+
let IncomingSmsService = class IncomingSmsService {
|
|
62
|
+
async verifySource(phoneNumber, user, password) {
|
|
63
|
+
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
64
|
+
try {
|
|
65
|
+
const scope = __addDisposableResource(env_1, ServiceProvider.createScope(this), false);
|
|
66
|
+
const db = scope.resolve(SocialMailContext);
|
|
67
|
+
password = this.encryptionService.encrypt(password);
|
|
68
|
+
let q = db.incomingSmsSource
|
|
69
|
+
.where({ phoneNumber, password }, (p) => (x) => x.phoneNumber === p.phoneNumber && x.encryptedPassword === p.password);
|
|
70
|
+
if (user) {
|
|
71
|
+
q = q.where({ user }, (p) => (x) => x.username === p.user);
|
|
72
|
+
}
|
|
73
|
+
await q
|
|
74
|
+
.firstOrFail();
|
|
75
|
+
}
|
|
76
|
+
catch (e_1) {
|
|
77
|
+
env_1.error = e_1;
|
|
78
|
+
env_1.hasError = true;
|
|
79
|
+
}
|
|
80
|
+
finally {
|
|
81
|
+
__disposeResources(env_1);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
async prepareCode(code, ...isdCodes) {
|
|
85
|
+
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
86
|
+
try {
|
|
87
|
+
const scope = __addDisposableResource(env_2, ServiceProvider.createScope(this), false);
|
|
88
|
+
const db = scope.resolve(SocialMailContext);
|
|
89
|
+
const config = [];
|
|
90
|
+
const sources = await db.incomingSmsSource.where({ isdCodes }, (p) => (x) => x.isdPrefix in p.isdCodes)
|
|
91
|
+
.toArray();
|
|
92
|
+
for (const iterator of sources) {
|
|
93
|
+
config.push({
|
|
94
|
+
code,
|
|
95
|
+
phoneNumber: iterator.phoneNumber,
|
|
96
|
+
prefix: iterator.isdPrefix,
|
|
97
|
+
url: iterator.keyword
|
|
98
|
+
? `SMSTO:${iterator.phoneNumber}?${iterator.keyword} ${code}`
|
|
99
|
+
: `SMSTO:${iterator.phoneNumber}?${code}`
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
return config;
|
|
103
|
+
}
|
|
104
|
+
catch (e_2) {
|
|
105
|
+
env_2.error = e_2;
|
|
106
|
+
env_2.hasError = true;
|
|
107
|
+
}
|
|
108
|
+
finally {
|
|
109
|
+
__disposeResources(env_2);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
async verify(phoneNumber, code) {
|
|
113
|
+
const env_3 = { stack: [], error: void 0, hasError: false };
|
|
114
|
+
try {
|
|
115
|
+
const scope = __addDisposableResource(env_3, ServiceProvider.createScope(this), false);
|
|
116
|
+
const db = scope.resolve(SocialMailContext);
|
|
117
|
+
phoneNumber = phoneNumber.startsWith("+") ? phoneNumber : "+" + phoneNumber;
|
|
118
|
+
const px = { phoneNumber, code };
|
|
119
|
+
// check for active login session
|
|
120
|
+
const updated = await db.loginSessions.where(px, (p) => (x) => x.smsToken === p.code
|
|
121
|
+
&& x.invalid === true
|
|
122
|
+
&& x.user.authFactors.some((a) => a.phoneNumber === p.phoneNumber && a.verified === true))
|
|
123
|
+
.update(void 0, (p) => (x) => ({
|
|
124
|
+
status: "created",
|
|
125
|
+
smsToken: null,
|
|
126
|
+
invalid: false
|
|
127
|
+
}));
|
|
128
|
+
if (updated) {
|
|
129
|
+
// notify...
|
|
130
|
+
}
|
|
131
|
+
await db.userAuthFactors.where(px, (p) => (x) => x.phoneNumber === p.phoneNumber && x.secret === p.code)
|
|
132
|
+
.update(void 0, (p) => (x) => ({
|
|
133
|
+
verified: true,
|
|
134
|
+
secret: null
|
|
135
|
+
}));
|
|
136
|
+
}
|
|
137
|
+
catch (e_3) {
|
|
138
|
+
env_3.error = e_3;
|
|
139
|
+
env_3.hasError = true;
|
|
140
|
+
}
|
|
141
|
+
finally {
|
|
142
|
+
__disposeResources(env_3);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
};
|
|
146
|
+
__decorate([
|
|
147
|
+
Inject,
|
|
148
|
+
__metadata("design:type", EncryptionService)
|
|
149
|
+
], IncomingSmsService.prototype, "encryptionService", void 0);
|
|
150
|
+
__decorate([
|
|
151
|
+
cacheFor(),
|
|
152
|
+
__metadata("design:type", Function),
|
|
153
|
+
__metadata("design:paramtypes", [Object, Object, Object]),
|
|
154
|
+
__metadata("design:returntype", Promise)
|
|
155
|
+
], IncomingSmsService.prototype, "verifySource", null);
|
|
156
|
+
IncomingSmsService = __decorate([
|
|
157
|
+
RegisterSingleton
|
|
158
|
+
], IncomingSmsService);
|
|
159
|
+
export default IncomingSmsService;
|
|
160
|
+
//# sourceMappingURL=IncomingSmsService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IncomingSmsService.js","sourceRoot":"","sources":["../../../../src/server/services/incoming-sms/IncomingSmsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { globalEnv } from "../../../common/globalEnv.js";
|
|
|
7
7
|
import DBConfig, { UIPackageConfig } from "../DBConfig.js";
|
|
8
8
|
export const renderUIClient = async (page, view) => {
|
|
9
9
|
const config = ServiceProvider.resolve(page, DBConfig);
|
|
10
|
-
const uiPackage = await config.
|
|
10
|
+
const uiPackage = await config.getValue(UIPackageConfig);
|
|
11
11
|
const uiVersion = page.query?.["ui-version"] ?? uiPackage.version;
|
|
12
12
|
// const packageRoot = `https://www.unpkg.com/${uiPackage.package}@${uiVersion}`;
|
|
13
13
|
const packageRoot = `https://cdn.jsdelivr.net/npm/${uiPackage.package}@${uiVersion}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderUIClient.js","sourceRoot":"","sources":["../../../../src/server/services/ui/renderUIClient.tsx"],"names":[],"mappings":"AAAA,OAAe,EAAqB,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACxG,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAClE,OAAO,YAAY,MAAM,uDAAuD,CAAC;AACjF,OAAO,YAAY,MAAM,uDAAuD,CAAC;AACjF,OAAO,KAAK,MAAM,gDAAgD,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,QAAQ,EAAE,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAG3D,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,IAAU,EAAE,IAAa,EAAG,EAAE;IAE/D,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEvD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"renderUIClient.js","sourceRoot":"","sources":["../../../../src/server/services/ui/renderUIClient.tsx"],"names":[],"mappings":"AAAA,OAAe,EAAqB,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACxG,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAClE,OAAO,YAAY,MAAM,uDAAuD,CAAC;AACjF,OAAO,YAAY,MAAM,uDAAuD,CAAC;AACjF,OAAO,KAAK,MAAM,gDAAgD,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,QAAQ,EAAE,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAG3D,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,IAAU,EAAE,IAAa,EAAG,EAAE;IAE/D,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEvD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEzD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC;IAElE,iFAAiF;IACjF,MAAM,WAAW,GAAG,gCAAgC,SAAS,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;IAErF,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;IACnD,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;IAE7D,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;QAC9B,EAAE,EAAE;YACA,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,OAAO,EAAE,SAAS;SACrB;QACD,MAAM,EAAE;YACJ,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,oBAAoB;SAChC;KACJ,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,IAAI,CAAC,aAAC,YAAY;QAC7B;YACI,uBAAM,OAAO,EAAC,OAAO,GAAE;YACvB,uBAAM,IAAI,EAAC,UAAU,EAAC,OAAO,EAAC,+FAA+F,GAAE;YAC/H,4BAAQ,SAAS,CAAC,IAAI,CAAS;YAC/B;;gBACsB,UAAU;;gBACV,IAAI,CAAC,SAAS,CAAC;oBAC7B,IAAI,EAAE,SAAS,CAAC,IAAI;oBACpB,IAAI,EAAE,SAAS,CAAC,IAAI;oBACpB,GAAG,EAAE,SAAS,CAAC,GAAG;oBAClB,aAAa,EAAE,SAAS,CAAC,aAAa;iBACzC,CAAC;oBACG;YACT,uBAAM,GAAG,EAAC,UAAU,EAAC,IAAI,EAAC,oBAAoB,GAAE;YAChD,4BACK;;;;kBAIC,CACE,CACL;QACP;YACI,aAAC,YAAY,OAAE;YACf,sBAAK,EAAE,EAAC,gBAAgB,EAAC,KAAK,EAAC,wFAAwF;gBACnH,sBAAK,KAAK,EAAC,iFAAiF,iBAEtF,CACJ;YAEN,yCACkB,SAAS,CAAC,OAAO,uBACZ,WAAW,eACnB,IAAI,IAAI,SAAS,CAAC,IAAI,EACjC,GAAG,EAAE,GAAG,WAAW,WAAW,GACpB,CACX,CACI,CAAC,CAAC;AACrB,CAAC,CAAC"}
|