@progalaxyelabs/ngx-stonescriptphp-client 1.23.0 → 1.23.2

package/fesm2022/progalaxyelabs-ngx-stonescriptphp-client.mjs

@@ -2443,7 +2443,7 @@ class TenantLoginComponent {
         // Normalize: auto-prepend +91 for 10-digit Indian numbers
         if (type === 'phone') {
             const digits = raw.replace(/\D/g, '');
-            this.otpNormalizedIdentifier = digits.length === 10 ? `+91${digits}` : (raw.startsWith('+') ? raw : `+${digits}`);
+            this.otpNormalizedIdentifier = digits.length === 10 ? `+91${digits}` : `+${digits}`;
         }
         else {
             this.otpNormalizedIdentifier = raw;
@@ -2472,6 +2472,8 @@ class TenantLoginComponent {
     }
     /** Verify the entered OTP code */
     async onOtpVerify() {
+        if (this.loading)
+            return;
         const code = this.otpCode;
         if (code.length < 6) {
             this.error = 'Please enter the complete 6-digit code';
@@ -2520,6 +2522,14 @@ class TenantLoginComponent {
         try {
             const result = await this.auth.identityRegister(this.otpVerifiedToken, name);
             if (!result.success) {
+                // If token expired, restart OTP flow
+                if (result.message?.includes('expired') || result.message?.includes('Invalid')) {
+                    this.error = 'Session expired. Please verify again.';
+                    this.otpStep = 'identifier';
+                    this.otpVerifiedToken = '';
+                    this.otpDisplayName = '';
+                    return;
+                }
                 this.error = result.message || 'Registration failed';
                 return;
             }
@@ -2849,15 +2859,15 @@ class TenantLoginComponent {
                             </button>
                         }
                     </div>
+                }
 
-                    <!-- Switch to Email/Password -->
-                    @if (isProviderEnabled('emailPassword') && effectiveOauthProviders.length > 0) {
-                        <div class="switch-method">
-                            <a href="#" (click)="toggleAuthMethod($event)">
-                                {{ useOAuth ? 'Use email/password instead' : 'Use OAuth instead' }}
-                            </a>
-                        </div>
-                    }
+                <!-- Switch between OAuth and Email/Password -->
+                @if (isProviderEnabled('emailPassword') && effectiveOauthProviders.length > 0 && !otpActive) {
+                    <div class="switch-method">
+                        <a href="#" (click)="toggleAuthMethod($event)">
+                            {{ useOAuth ? 'Use email/password instead' : 'Use OAuth instead' }}
+                        </a>
+                    </div>
                 }
 
                 <!-- Error Message -->
@@ -3130,15 +3140,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.17", ngImpo
                             </button>
                         }
                     </div>
+                }
 
-                    <!-- Switch to Email/Password -->
-                    @if (isProviderEnabled('emailPassword') && effectiveOauthProviders.length > 0) {
-                        <div class="switch-method">
-                            <a href="#" (click)="toggleAuthMethod($event)">
-                                {{ useOAuth ? 'Use email/password instead' : 'Use OAuth instead' }}
-                            </a>
-                        </div>
-                    }
+                <!-- Switch between OAuth and Email/Password -->
+                @if (isProviderEnabled('emailPassword') && effectiveOauthProviders.length > 0 && !otpActive) {
+                    <div class="switch-method">
+                        <a href="#" (click)="toggleAuthMethod($event)">
+                            {{ useOAuth ? 'Use email/password instead' : 'Use OAuth instead' }}
+                        </a>
+                    </div>
                 }
 
                 <!-- Error Message -->