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

package/package.json

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

package/src/server/model/SocialMailContext.ts

@@ -42,7 +42,7 @@ import RateLimitToken from "./entities/RateLimitToken.js";
 import AccessToken from "./entities/AccessToken.js";
 import ServerActivity from "./entities/ServerActivity.js";
 import IncomingSmsSource from "./entities/IncomingSmsSource.js";
-import VerificationToken from "./entities/VerificationToken.js";
+import VerificationToken, { VerificationTokenAddress } from "./entities/VerificationToken.js";
 
 @RegisterScoped
 export default class SocialMailContext extends EntityContext {
@@ -189,6 +189,8 @@ export default class SocialMailContext extends EntityContext {
 
     public verificationTokens = this.model.register(VerificationToken);
 
+    public verificationTokenAddresses = this.model.register(VerificationTokenAddress);
+
     public tags = this.model.register(Tag);
 
 }

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

@@ -7,24 +7,14 @@ 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";
 
 @Table("VerificationTokens")
-@Index({
-    name: "IX_VerificationTokens_Address",
-    columns:[
-        { name: (x) => x.address, descending: false }
-    ],
-    filter: (x) => x.verified === false
-})
 export default class VerificationToken {
 
     @Column({ dataType: "BigInt", key: true, generated: "identity"})
     verificationID: number;
 
-    /** Phone Number or Email Address to Verify */
-    @Column({ dataType: "Char", length: 200 })
-    address: string;
-
     @Column({ default: () => Sql.date.now()})
     dateCreated: DateTime;
 
@@ -42,5 +32,25 @@ export default class VerificationToken {
 
     @Column({ dataType: "Char", length: 50, nullable: true })
     ipAddress: string;
+    addresses: VerificationTokenAddress[];
+
+}
+
+@Table("VerificationTokenAddresses")
+export class VerificationTokenAddress {
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(VerificationToken, {
+        property: (x) => x.verificationToken,
+        inverseProperty: (x) => x.addresses,
+        foreignKeyConstraint:{
+            cascade: "delete"
+        }
+    })
+    verificationID: number;
+
+    @Column({ dataType: "Char", length: 200 , key: true })
+    address: string;
 
+    verificationToken: VerificationToken;
 }

package/src/server/services/incoming-sms/IncomingSmsService.ts

@@ -74,12 +74,6 @@ export default class IncomingSmsService {
             // notify...
         }
 
-        await db.verificationTokens.where(px, (p) => (x) => x.address === p.phoneNumber
-            && x.code === p.code
-            && x.verified === false)
-            .update(void 0, (p) => (x) => ({
-                verified: true
-            }));
 
 
         await db.userAuthFactors.where(px, (p) => (x) => x.phoneNumber === p.phoneNumber && x.secret === p.code)