@social-mail/social-mail-web-server 1.4.820 → 1.4.821

package/package.json

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

package/src/common/globalEnv.ts

@@ -27,6 +27,11 @@ export const globalEnv = {
     wildcardDomain: process.env.SOCIAL_MAIL_WILDCARD_DOMAIN,
     name: process.env.SOCIAL_MAIL_NAME || "Social Mail",
     secretKey: process.env.SOCIAL_MAIL_SECRET_KEY,
+    otpIn:{
+        host: process.env.SOCIAL_MAIL_OTP_IN_HOST,
+        key: process.env.SOCIAL_MAIL_OTP_IN_KEY,
+        secret: process.env.SOCIAL_MAIL_OTP_IN_SECRET,
+    },
     port,
     serverID: process.env.SOCIAL_MAIL_SERVER_ID,
     parentApiToken: process.env.SOCIAL_MAIL_PARENT_API_TOKEN,

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

@@ -99,7 +99,7 @@ export default class LoginSession {
     public oneTimePassword: string;
 
     @JsonProperty({ help: "SMS URL to Display"})
-    public smsConfig: { prefix: string, code: string, url: string }[];
+    public smsConfig: any;
 
     public user: User;
 

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

@@ -11,6 +11,8 @@ export default class AccessTokenEvents extends AuthenticatedEvents<AccessToken>
             this.sessionUser.ensureLoggedIn();
         }
 
+        entity.userID ??= this.sessionUser.userID;
+
         entity.secret = "sm-at-" + randomUUID().replaceAll("-", "");
         entity.displaySecret = entity.secret;
     }

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

@@ -18,6 +18,7 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { randomUUID } from "crypto";
 import { AppStringHelper } from "../../../common/AppStringHelper.js";
 import IncomingSmsService from "../../services/incoming-sms/IncomingSmsService.js";
+import ExternalOtpInService from "../../services/external-otp-in/ExternalOtpInService.js";
 
 export default class LoginSessionEvents extends EntityEvents<LoginSession> {
 
@@ -140,9 +141,9 @@ export default class LoginSessionEvents extends EntityEvents<LoginSession> {
                     .toArray();
 
                 if (otpIn.length) {
-                    const code = entity.smsToken = AppStringHelper.last(DateTime.now.msSinceEpoch.toString(), 6);
-                    const idsCodes = otpIn.map((x) => x.isdCode.startsWith("+") ? x.isdCode : "+" + x.isdCode );
-                    entity.smsConfig = await ServiceProvider.resolve(this, IncomingSmsService).prepareCode(code, ... idsCodes);
+                    const idsCodes = otpIn.map((x) => x.phoneNumber );
+                    entity.smsConfig = await ServiceProvider.resolve(this, ExternalOtpInService).create(idsCodes);
+                    entity.smsToken = entity.smsConfig.id;
                 }
 
                 return;

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

@@ -0,0 +1,36 @@
+import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import { globalEnv } from "../../../common/globalEnv.js";
+
+const headers = {
+    authorization: `basic ${Buffer.from(`${globalEnv.otpIn.key}:${globalEnv.otpIn.secret}`).toString("base64")}`
+};
+
+const postHeaders = {
+    ... headers,
+    "content-type": "application/json",
+};
+
+@RegisterSingleton
+export default class ExternalOtpInService {
+
+    async create(phoneNumbers: string[]) {
+        const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/create`, {
+            method: "POST",
+            headers: postHeaders,
+            body: JSON.stringify({
+                phoneNumbers
+            })
+        });
+        const { id, ui } = await rs.json();
+        return { id, ui };
+    }
+
+    async get(id) {
+        const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/get/${id}`, {
+            method: "GET",
+            headers
+        });
+        const { success } = await rs.json();
+        return { success };
+    }
+}