@social-mail/social-mail-web-server 1.4.837 → 1.4.839

package/package.json

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

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

@@ -96,22 +96,23 @@ export default class UserAuthFactorEvents extends AuthenticatedEvents<UserAuthFa
                 return;
             }
         }
+
+        if (entity.verificationID) {
+
+            const eois = ServiceProvider.resolve(this, ExternalOtpInService);
+            const result = await eois.get(entity.verificationID);
+            if (result.success) {
+                entity.verified = true;
+            }
+
+            return;
+        }
+
         if (entity.method !== "totp") {
             throw new EntityAccessError(`Cannot modify Auth Factor.`);
         }
         if (!entity.verified) {
 
-            if (entity.verificationID) {
-
-                const eois = ServiceProvider.resolve(this, ExternalOtpInService);
-                const result = await eois.get(entity.verificationID);
-                if (result.success) {
-                    entity.verified = true;
-                }
-
-                return;
-            }
-
             await this.multiAuthFactorService.verify({ id: 0, token: entity.token, secret: entity.secret});
             entity.verified = true;
         }

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

@@ -17,4 +17,8 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
     onForeignKeyFilter(filter: ForeignKeyFilter<VerificationToken, any>) {
         return filter.unfiltered();
     }
+
+    includeFilter(query: IEntityQuery<VerificationToken>, type?: any, key?: string): IEntityQuery<VerificationToken> {
+        return query;
+    }
 }