@social-mail/social-mail-web-server 1.4.945 → 1.4.946

package/dist/server/model/entities/VerificationToken.d.ts

@@ -1,6 +1,8 @@
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import type LoginSession from "./LoginSession.js";
 import type UserAuthFactor from "./UserAuthFactor.js";
+declare const verificationTypes: readonly ["email", "sms", "captcha", "totp"];
+export type verificationType = typeof verificationTypes[number];
 export default class VerificationToken {
     verificationID: number;
     externalID: string;
@@ -11,14 +13,17 @@ export default class VerificationToken {
     accessCode: string;
     ipAddress: string;
     externalConfig: string;
+    type: verificationType;
     addresses: VerificationTokenAddress[];
     loginSessions: LoginSession[];
     authFactors: UserAuthFactor[];
     smsConfig: any;
+    verifyAddresses: any;
 }
 export declare class VerificationTokenAddress {
     verificationID: number;
     address: string;
     verificationToken: VerificationToken;
 }
+export {};
 //# sourceMappingURL=VerificationToken.d.ts.map

package/dist/server/model/entities/VerificationToken.d.ts.map

@@ -1 +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;IAGlB,cAAc,EAAE,MAAM,CAAC;IAEvB,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"}
+{"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;AAEtD,QAAA,MAAM,iBAAiB,8CAAgD,CAAC;AACxE,MAAM,MAAM,gBAAgB,GAAG,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;AAGhE,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAGlC,cAAc,EAAE,MAAM,CAAC;IAIvB,UAAU,EAAE,MAAM,CAAC;IAGnB,WAAW,EAAE,QAAQ,CAAC;IAGtB,MAAM,EAAE,QAAQ,CAAC;IAGjB,QAAQ,EAAE,OAAO,CAAC;IAIlB,IAAI,EAAE,MAAM,CAAC;IAGb,UAAU,EAAE,MAAM,CAAC;IAInB,SAAS,EAAE,MAAM,CAAC;IAGlB,cAAc,EAAE,MAAM,CAAC;IAGvB,IAAI,EAAE,gBAAgB,CAAC;IAEvB,SAAS,EAAE,wBAAwB,EAAE,CAAC;IACtC,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,WAAW,EAAE,cAAc,EAAE,CAAC;IAG9B,SAAS,EAAE,GAAG,CAAC;IAKf,eAAe,EAAE,GAAG,CAAC;CACxB;AAED,qBACa,wBAAwB;IAUjC,cAAc,EAAE,MAAM,CAAC;IAGvB,OAAO,EAAE,MAAM,CAAC;IAEhB,iBAAiB,EAAE,iBAAiB,CAAC;CACxC"}

package/dist/server/model/entities/VerificationToken.js

@@ -12,7 +12,8 @@ import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
-import { JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
+import { IgnoreJsonProperty, JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
+const verificationTypes = ["email", "sms", "captcha", "totp"];
 let VerificationToken = class VerificationToken {
 };
 __decorate([
@@ -21,6 +22,7 @@ __decorate([
 ], VerificationToken.prototype, "verificationID", void 0);
 __decorate([
     Column({ dataType: "Char", length: 200, nullable: true }),
+    IgnoreJsonProperty,
     __metadata("design:type", String)
 ], VerificationToken.prototype, "externalID", void 0);
 __decorate([
@@ -37,6 +39,7 @@ __decorate([
 ], VerificationToken.prototype, "verified", void 0);
 __decorate([
     Column({ dataType: "Char", length: 20 }),
+    IgnoreJsonProperty,
     __metadata("design:type", String)
 ], VerificationToken.prototype, "code", void 0);
 __decorate([
@@ -45,16 +48,27 @@ __decorate([
 ], VerificationToken.prototype, "accessCode", void 0);
 __decorate([
     Column({ dataType: "Char", length: 50, nullable: true }),
+    IgnoreJsonProperty,
     __metadata("design:type", String)
 ], VerificationToken.prototype, "ipAddress", void 0);
 __decorate([
     Column({ dataType: "Char", nullable: true }),
     __metadata("design:type", String)
 ], VerificationToken.prototype, "externalConfig", void 0);
+__decorate([
+    Column({ dataType: "AsciiChar", length: 50, enum: verificationTypes }),
+    __metadata("design:type", String)
+], VerificationToken.prototype, "type", void 0);
 __decorate([
     JsonProperty({}),
     __metadata("design:type", Object)
 ], VerificationToken.prototype, "smsConfig", void 0);
+__decorate([
+    JsonProperty({
+        help: "Verification address array as string[] containing addresses to verify for email and sms"
+    }),
+    __metadata("design:type", Object)
+], VerificationToken.prototype, "verifyAddresses", void 0);
 VerificationToken = __decorate([
     Table("VerificationTokens")
 ], VerificationToken);

package/dist/server/model/entities/VerificationToken.js.map

@@ -1 +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;CAmCrC,CAAA;AAhCG;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;AAGlB;IADC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACtB;AAOvB;IADC,YAAY,CAAC,EAAE,CAAC;;oDACF;AAlCE,iBAAiB;IADrC,KAAK,CAAC,oBAAoB,CAAC;GACP,iBAAiB,CAmCrC;eAnCoB,iBAAiB;AAsC/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"}
+{"version":3,"file":"VerificationToken.js","sourceRoot":"","sources":["../../../../src/server/model/entities/VerificationToken.ts"],"names":[],"mappings":"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"}

package/dist/server/model/events/VerificationTokenEvents.d.ts

@@ -2,8 +2,11 @@ import VerificationToken from "../entities/VerificationToken.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
+import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 export default class VerificationTokenEvents extends AuthenticatedEvents<VerificationToken> {
     get(id: any, accessCode: any): IEntityQuery<VerificationToken>;
+    verifyCode(entity: VerificationToken, id: number, accessCode: string, code: string): Promise<VerificationToken>;
+    beforeInsert(entity: VerificationToken, entry: ChangeEntry<VerificationToken>): Promise<void>;
     onForeignKeyFilter(filter: ForeignKeyFilter<VerificationToken, any>): IEntityQuery<any>;
     includeFilter(query: IEntityQuery<VerificationToken>, type?: any, key?: string): IEntityQuery<VerificationToken>;
 }

package/dist/server/model/events/VerificationTokenEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VerificationTokenEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/VerificationTokenEvents.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAClG,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAE/F,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAGvF,GAAG,CAAC,EAAE,KAAA,EAAE,UAAU,KAAA;IAKlB,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,GAAG,CAAC;IAInE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,iBAAiB,CAAC;CAGnH"}
+{"version":3,"file":"VerificationTokenEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/VerificationTokenEvents.ts"],"names":[],"mappings":"AACA,OAAO,iBAAuC,MAAM,kCAAkC,CAAC;AACvF,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAClG,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAQ/F,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAGzF,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAGvF,GAAG,CAAC,EAAE,KAAA,EAAE,UAAU,KAAA;IAMZ,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAoBlF,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC;IA8CnF,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,GAAG,CAAC;IAInE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,iBAAiB,CAAC;CAGnH"}

package/dist/server/model/events/VerificationTokenEvents.js

@@ -8,14 +8,82 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
+import VerificationToken from "../entities/VerificationToken.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../SocialMailContext.js";
+import Page from "@entity-access/server-pages/dist/Page.js";
+import RateLimiterService from "../../services/rate-limiter/RateLimiterService.js";
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import { randomUUID } from "crypto";
+import CaptchaService from "../../services/captcha/CaptchaService.js";
+import ExternalOtpInService from "../../services/external-otp-in/ExternalOtpInService.js";
+import ExternalInvoke from "@entity-access/server-pages/dist/decorators/ExternalInvoke.js";
 export default class VerificationTokenEvents extends AuthenticatedEvents {
     get(id, accessCode) {
         const db = ServiceProvider.resolve(this, SocialMailContext);
         return db.verificationTokens.where({ id, accessCode }, (p) => (x) => x.verificationID === id && x.accessCode === p.accessCode);
     }
+    async verifyCode(entity, id, accessCode, code) {
+        if (entity.verificationID !== id || entity.accessCode !== accessCode) {
+            throw new EntityAccessError("Invalid id/access code");
+        }
+        if (entity.code !== code) {
+            throw new EntityAccessError("Invalid code");
+        }
+        switch (entity.type) {
+            case "captcha":
+            case "email":
+                break;
+            default:
+                throw new EntityAccessError(`Invalid verification type ${entity.type}`);
+        }
+        entity.verified = true;
+        const db = ServiceProvider.resolve(this, SocialMailContext);
+        await db.verificationTokens.statements.update({ verified: true }, { verificationID: entity.verificationID });
+        return entity;
+    }
+    async beforeInsert(entity, entry) {
+        const { type } = entity;
+        const page = ServiceProvider.resolve(this, Page);
+        // const method = page?.request?.method;
+        // if (method && !/post/i.test(method)) {
+        //     throw new EntityAccessError("Get not supported");
+        // }
+        const ip = page.request?.remoteIPAddress ?? "";
+        const rateLimiterService = ServiceProvider.resolve(this, RateLimiterService);
+        const rl = await rateLimiterService.acquire(ip, "captcha");
+        if (!rl) {
+            throw new EntityAccessError("Rate Limited", 429);
+        }
+        const code = DateTime.now.msSinceEpoch.toString();
+        switch (type) {
+            case "captcha":
+                const cs = ServiceProvider.resolve(this, CaptchaService);
+                const r = await cs.generatePair();
+                entity.code = code.substring(code.length - 5);
+                entity.accessCode = randomUUID();
+                entity.expiry = DateTime.now.addMinutes(15);
+                entity.externalID = r.id.toString();
+                break;
+            case "email":
+                entity.code = code.substring(code.length - 5);
+                entity.accessCode = randomUUID();
+                break;
+            case "sms":
+                const es = ServiceProvider.resolve(this, ExternalOtpInService);
+                const { id, accessCode, externalConfig } = await es.createNoInsert(entity.verifyAddresses);
+                entity.externalID = id;
+                entity.accessCode = accessCode;
+                entity.externalConfig = externalConfig;
+                break;
+            // case "totp":
+            //     break;
+            default:
+                throw new EntityAccessError(`Type ${type} not supported`, 422);
+        }
+    }
     onForeignKeyFilter(filter) {
         return filter.unfiltered();
     }
@@ -29,4 +97,10 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
 ], VerificationTokenEvents.prototype, "get", null);
+__decorate([
+    ExternalInvoke,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [VerificationToken, Number, String, String]),
+    __metadata("design:returntype", Promise)
+], VerificationTokenEvents.prototype, "verifyCode", null);
 //# sourceMappingURL=VerificationTokenEvents.js.map

package/dist/server/model/events/VerificationTokenEvents.js.map

@@ -1 +1 @@
-{"version":3,"file":"VerificationTokenEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/VerificationTokenEvents.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAAa,MAAM,8DAA8D,CAAC;AAEzF,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAIxD,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,mBAAsC;IAGvF,GAAG,CAAC,EAAE,EAAE,UAAU;QACd,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5D,OAAO,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,UAAU,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,EAAE,IAAI,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC;IAClI,CAAC;IAED,kBAAkB,CAAC,MAAgD;QAC/D,OAAO,MAAM,CAAC,UAAU,EAAE,CAAC;IAC/B,CAAC;IAED,aAAa,CAAC,KAAsC,EAAE,IAAU,EAAE,GAAY;QAC1E,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAZG;IADC,aAAa;;;;kDAIb"}
+{"version":3,"file":"VerificationTokenEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/VerificationTokenEvents.ts"],"names":[],"mappings":"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"}

package/dist/server/services/external-otp-in/ExternalOtpInService.d.ts

@@ -3,6 +3,11 @@ import CryptoService from "../CryptoService.js";
 export default class ExternalOtpInService {
     db: SocialMailContext;
     cryptoService: CryptoService;
+    createNoInsert(phoneNumbers: string[]): Promise<{
+        id: any;
+        accessCode: any;
+        externalConfig: string;
+    }>;
     create(phoneNumbers: string[]): Promise<import("../../model/entities/VerificationToken.js").default>;
     get(verificationID: any): Promise<{
         success: any;

package/dist/server/services/external-otp-in/ExternalOtpInService.d.ts.map

@@ -1 +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;IAiC7B,GAAG,CAAC,cAAc,KAAA;;;CAS3B"}
+{"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;AAWhD,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAGrC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,aAAa,EAAE,aAAa,CAAC;IAEvB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE;;;;;IAarC,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE;IA6B7B,GAAG,CAAC,cAAc,KAAA;;;CAM3B"}

package/dist/server/services/external-otp-in/ExternalOtpInService.js

@@ -12,23 +12,25 @@ import { globalEnv } from "../../../common/globalEnv.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import CryptoService from "../CryptoService.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-const headers = {
-    authorization: `basic ${Buffer.from(`${globalEnv.otpIn.key}:${globalEnv.otpIn.secret}`).toString("base64")}`
-};
-const postHeaders = {
-    ...headers,
-    "content-type": "application/json",
-};
+import FetchBuilder from "@web-atoms/fetch-builder";
+const client = FetchBuilder
+    .url(`https://${globalEnv.otpIn.host}/api/opt-in/`)
+    .header("authorization", `basic ${Buffer.from(`${globalEnv.otpIn.key}:${globalEnv.otpIn.secret}`).toString("base64")}`);
 let ExternalOtpInService = class ExternalOtpInService {
+    async createNoInsert(phoneNumbers) {
+        const result = await client.post("create")
+            .jsonBody({
+            phoneNumbers
+        }).asJson();
+        const { accessCode, id } = result;
+        const externalConfig = JSON.stringify(result);
+        return { id, accessCode, externalConfig };
+    }
     async create(phoneNumbers) {
-        const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/create`, {
-            method: "POST",
-            headers: postHeaders,
-            body: JSON.stringify({
-                phoneNumbers
-            })
-        });
-        const result = await rs.json();
+        const result = await client.post("create")
+            .jsonBody({
+            phoneNumbers
+        }).asJson();
         const dateCreated = DateTime.now;
         const expiry = dateCreated.addMinutes(15);
         const { accessCode } = result;
@@ -48,11 +50,8 @@ let ExternalOtpInService = class ExternalOtpInService {
     }
     async get(verificationID) {
         const v = await this.db.verificationTokens.statements.select({}, { verificationID });
-        const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/get/${v.externalID}/${v.accessCode}`, {
-            method: "GET",
-            headers
-        });
-        const { success } = await rs.json();
+        const { success } = await client.get(`get/${v.externalID}/${v.accessCode}`)
+            .asJson();
         return { success };
     }
 };

package/dist/server/services/external-otp-in/ExternalOtpInService.js.map

@@ -1 +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,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE9C,cAAc;QACd,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,CAAC;YACzD,UAAU,EAAE,MAAM,CAAC,EAAE;YACrB,cAAc;YACd,IAAI,EAAE,UAAU;YAChB,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;AA/CG;IADC,MAAM;8BACH,iBAAiB;gDAAC;AAGtB;IADC,MAAM;8BACQ,aAAa;2DAAC;AANZ,oBAAoB;IADxC,cAAc;GACM,oBAAoB,CAkDxC;eAlDoB,oBAAoB"}
+{"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;AAC3E,OAAO,YAAY,MAAM,0BAA0B,CAAC;AAGpD,MAAM,MAAM,GAAG,YAAY;KACtB,GAAG,CAAC,WAAW,SAAS,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC;KAClD,MAAM,CAAC,eAAe,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,CAAC,CAAC;AAG7G,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAQrC,KAAK,CAAC,cAAc,CAAC,YAAsB;QACvC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;aACrC,QAAQ,CAAC;YACN,YAAY;SACf,CAAC,CAAC,MAAM,EAAsB,CAAC;QAEpC,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE9C,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,YAAsB;QAC/B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;aACrC,QAAQ,CAAC;YACN,YAAY;SACf,CAAC,CAAC,MAAM,EAAsB,CAAC;QAEpC,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,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE9C,cAAc;QACd,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,CAAC;YACzD,UAAU,EAAE,MAAM,CAAC,EAAE;YACrB,cAAc;YACd,IAAI,EAAE,UAAU;YAChB,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,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;aACtE,MAAM,EAAE,CAAC;QACd,OAAO,EAAE,OAAO,EAAE,CAAC;IACvB,CAAC;CACJ,CAAA;AArDG;IADC,MAAM;8BACH,iBAAiB;gDAAC;AAGtB;IADC,MAAM;8BACQ,aAAa;2DAAC;AANZ,oBAAoB;IADxC,cAAc;GACM,oBAAoB,CAwDxC;eAxDoB,oBAAoB"}