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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.4.829",
+  "version": "1.4.830",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/entities/LoginSession.ts

@@ -7,6 +7,7 @@ import type { AppFileVersion } from "./AppFile.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 import GraphService from "@entity-access/server-pages/dist/services/GraphService.js";
 import { IgnoreJsonProperty, JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
+import VerificationToken from "./VerificationToken.js";
 
 const loginSessionStatuses = ["created", "change-password", "totp"] as const;
 export type loginStatusType = typeof loginSessionStatuses[number];
@@ -20,15 +21,6 @@ export type loginStatusType = typeof loginSessionStatuses[number];
     ],
     filter: (x) => x.invalid === false && x.deviceTokenType !== null
 })
-@Index({
-    name: "IX_LoginSessions_Phone_Codes",
-    columns: [
-        { name: (x) => x.userID, descending: false },
-        { name: (x) => x.smsToken, descending: false }
-    ],
-    unique: true,
-    filter: (x) => x.smsToken !== null
-})
 export default class LoginSession {
 
     @Column({ key: true, generated: "identity"})
@@ -64,8 +56,12 @@ export default class LoginSession {
     @Column({ dataType: "AsciiChar", length: 50, nullable: true})
     public deviceTokenType: string;
 
-    @Column({ dataType: "Char", length: 50, nullable: true })
-    public smsToken: string;
+    @Column({ dataType: "BigInt", nullable: true })
+    @RelateTo(VerificationToken, {
+        property: (x) => x.verificationToken,
+        inverseProperty: (x) => x.loginSessions
+    })
+    public verificationID: number;
 
     /**
      * This will not be saved into database
@@ -98,13 +94,12 @@ export default class LoginSession {
     @JsonProperty({ help: "One Time Password"})
     public oneTimePassword: string;
 
-    @JsonProperty({ help: "SMS URL to Display"})
-    public smsConfig: any;
-
     public user: User;
 
     public versions: AppFileVersion[];
 
+    public verificationToken: VerificationToken;
+
     [GraphService.appendToGraph]() {
         delete this.deviceToken;
         delete this.deviceTokenType;

package/src/server/model/entities/UserAuthFactor.ts

@@ -8,6 +8,7 @@ import IncomingSmsSource from "./IncomingSmsSource.js";
 import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckConstraint.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
+import VerificationToken from "./VerificationToken.js";
 
 const authMethods = ["totp", "hotp", "fido2", "one-time", "otp", "otp-in"] as const;
 export type authMethodTypes = typeof authMethods[number];
@@ -50,6 +51,13 @@ export default class UserAuthFactor {
     @Column({ dataType: "Char", length: 20, nullable: true })
     isdCode: string;
 
+    @Column({ dataType: "BigInt", nullable: true })
+    @RelateTo(VerificationToken, {
+        property: (x) => x.verificationToken,
+        inverseProperty: (x) => x.authFactors
+    })
+    public verificationID: number;
+
     @Column({ dataType: "Boolean"})
     verified: boolean;
 
@@ -70,4 +78,6 @@ export default class UserAuthFactor {
     @JsonProperty()
     smsConfig: string;
 
+    public verificationToken: VerificationToken;
+
 }

package/src/server/model/entities/VerificationToken.ts

@@ -1,13 +1,11 @@
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
-import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
-import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import GraphService from "@entity-access/server-pages/dist/services/GraphService.js";
-import SignerService from "../../services/SignerService.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import type LoginSession from "./LoginSession.js";
+import { JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
+import type UserAuthFactor from "./UserAuthFactor.js";
 
 @Table("VerificationTokens")
 export default class VerificationToken {
@@ -15,6 +13,9 @@ export default class VerificationToken {
     @Column({ dataType: "BigInt", key: true, generated: "identity"})
     verificationID: number;
 
+    @Column({ dataType: "Char", length: 200, nullable: true })
+    externalID: string;
+
     @Column({ default: () => Sql.date.now()})
     dateCreated: DateTime;
 
@@ -33,7 +34,11 @@ export default class VerificationToken {
     @Column({ dataType: "Char", length: 50, nullable: true })
     ipAddress: string;
     addresses: VerificationTokenAddress[];
+    loginSessions: LoginSession[];
+    authFactors: UserAuthFactor[];
 
+    @JsonProperty({})
+    smsConfig: any;
 }
 
 @Table("VerificationTokenAddresses")

package/src/server/model/events/LoginSessionEvents.ts

@@ -138,9 +138,9 @@ export default class LoginSessionEvents extends EntityEvents<LoginSession> {
 
                 if (otpIn.length) {
                     const idsCodes = otpIn.map((x) => x.phoneNumber );
-                    const smsConfig = await ServiceProvider.resolve(this, ExternalOtpInService).create(idsCodes);
-                    entity.smsConfig = smsConfig;
-                    entity.smsToken = smsConfig.id + ":" + smsConfig.accessCode;
+                    const v = await ServiceProvider.resolve(this, ExternalOtpInService).create(idsCodes);
+                    entity.verificationID = v.verificationID;
+                    entity.verificationToken = v;
                 }
 
                 return;
@@ -189,10 +189,9 @@ export default class LoginSessionEvents extends EntityEvents<LoginSession> {
     async beforeUpdate(entity: LoginSession, entry: ChangeEntry<LoginSession>) {
 
         if (entry.isModified("dateUpdated")) {
-            if(entity.smsToken) {
-                const [id, accessCode] = entity.smsToken.split(":");
+            if(entity.verificationID) {
                 const eis = ServiceProvider.resolve(this, ExternalOtpInService);
-                const { success } = await eis.get(id, accessCode);
+                const { success } = await eis.get(entity.verificationID);
                 if (success) {
                     entity.status = "created";
                     entity.invalid = false;

package/src/server/model/events/UserAuthFactorEvents.ts

@@ -58,10 +58,9 @@ export default class UserAuthFactorEvents extends AuthenticatedEvents<UserAuthFa
 
             const phones = await db.userAuthFactors.where(entity, (p) => (x) => x.userID === p.userID && x.method === "otp-in").toArray();
             const phoneNumbers = phones.map((x) => x.phoneNumber);
-            const smsConfig = await ServiceProvider.resolve(this, ExternalOtpInService).create(phoneNumbers);
-            entity.smsConfig = JSON.stringify(smsConfig);
-            entity.secret = smsConfig.accessCode;
-            entity.hint = smsConfig.id;
+            const v = await ServiceProvider.resolve(this, ExternalOtpInService).create(phoneNumbers);
+            entity.verificationID = v.verificationID;
+            entity.verificationToken = v;
             return;
         }
 
@@ -102,10 +101,10 @@ export default class UserAuthFactorEvents extends AuthenticatedEvents<UserAuthFa
         }
         if (!entity.verified) {
 
-            if (!entity.token) {
+            if (entity.verificationID) {
 
                 const eois = ServiceProvider.resolve(this, ExternalOtpInService);
-                const result = await eois.get(entity.hint, entity.secret);
+                const result = await eois.get(entity.verificationID);
                 if (result.success) {
                     entity.verified = true;
                 }

package/src/server/services/external-otp-in/ExternalOtpInService.ts

@@ -1,5 +1,9 @@
-import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import { globalEnv } from "../../../common/globalEnv.js";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import CryptoService from "../CryptoService.js";
+import { randomUUID } from "crypto";
+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")}`
@@ -10,9 +14,15 @@ const postHeaders = {
     "content-type": "application/json",
 };
 
-@RegisterSingleton
+@RegisterScoped
 export default class ExternalOtpInService {
 
+    @Inject
+    db: SocialMailContext;
+
+    @Inject
+    cryptoService: CryptoService;
+
     async create(phoneNumbers: string[]) {
         const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/create`, {
             method: "POST",
@@ -21,11 +31,30 @@ export default class ExternalOtpInService {
                 phoneNumbers
             })
         });
-        return await rs.json();
+        const result = await rs.json();
+
+        const dateCreated = DateTime.now;
+        const expiry = dateCreated.addMinutes(15);
+
+        const { accessCode } = result;
+
+        // create hash
+        const v = await this.db.verificationTokens.statements.insert({
+            externalID: result.id,
+            accessCode,
+            dateCreated,
+            expiry,
+        });
+
+
+        result.id = v.verificationID.toString();
+        v.smsConfig = result;
+        return v;
     }
 
-    async get(id, accessCode) {
-        const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/get/${id}/${accessCode}`, {
+    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
         });