@firestitch/2fa 13.1.4 → 13.1.5

package/fesm2020/firestitch-2fa.mjs

@@ -26,7 +26,7 @@ import * as i3 from '@firestitch/dialog';
 import { FsDialogModule } from '@firestitch/dialog';
 import * as i2 from '@firestitch/message';
 import { Subject, of, BehaviorSubject } from 'rxjs';
-import { tap, finalize, filter, takeUntil, switchMap, map } from 'rxjs/operators';
+import { tap, finalize, switchMap, filter, takeUntil, map } from 'rxjs/operators';
 import * as i1 from '@firestitch/code-input';
 import { FsCodeInputComponent, FsCodeInputModule } from '@firestitch/code-input';
 import * as i1$1 from '@angular/material/dialog';
@@ -220,8 +220,8 @@ class Fs2faVerificationComponent {
     }
     showVerificationMethods() {
         this.getVerificationMethods()
-            .subscribe((verificationMethods) => {
-            this._dialog.open(Fs2faVerificationMethodsComponent, {
+            .pipe(switchMap((verificationMethods) => {
+            return this._dialog.open(Fs2faVerificationMethodsComponent, {
                 data: {
                     verificationMethod: this.verificationMethod,
                     verificationMethods,
@@ -229,14 +229,14 @@ class Fs2faVerificationComponent {
                 },
             })
                 .afterClosed()
-                .pipe(filter((verificationMethod) => !!verificationMethod))
-                .subscribe((verificationMethod) => {
-                this.verificationMethod = verificationMethod;
-                this.code = '';
-                this._cdRef.markForCheck();
-                setTimeout(() => {
-                    this.verificationCodeComponent.focus();
-                });
+                .pipe(filter((verificationMethod) => !!verificationMethod));
+        }))
+            .subscribe((verificationMethod) => {
+            this.verificationMethod = verificationMethod;
+            this.code = '';
+            this._cdRef.markForCheck();
+            setTimeout(() => {
+                this.verificationCodeComponent.focus();
             });
         });
     }
@@ -592,9 +592,12 @@ class EmailComponent {
         this.default = !this.twoFactorManageService.hasVerificationMethods;
     }
     codeCompleted() {
-        if (!this.form.submitting) {
-            this.form.triggerSubmit();
-        }
+        //Legacy support
+        setTimeout(() => {
+            if (!this.form.submitting) {
+                this.form.triggerSubmit();
+            }
+        });
     }
     codeChanged(code) {
         this.code = code;
@@ -655,9 +658,12 @@ class NumberComponent {
         this.default = !this.twoFactorManageService.hasVerificationMethods;
     }
     codeCompleted() {
-        if (!this.form.submitting) {
-            this.form.triggerSubmit();
-        }
+        //Legacy support
+        setTimeout(() => {
+            if (!this.form.submitting) {
+                this.form.triggerSubmit();
+            }
+        });
     }
     codeChanged(code) {
         this.code = code;