@progalaxyelabs/ngx-stonescriptphp-client 1.14.0 → 1.16.0

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

@@ -140,19 +140,36 @@ class StoneScriptPHPAuth {
         const raw = this.resolvePath(data, this.responseMap.userPath);
         return raw ? this.normalizeUser(raw) : undefined;
     }
+    resolveMembership(data) {
+        const raw = this.resolvePath(data, 'data.membership');
+        return raw ? raw : undefined;
+    }
     resolveErrorMessage(data, fallback) {
         const path = this.responseMap.errorMessagePath ?? 'message';
         return this.resolvePath(data, path) || fallback;
     }
     normalizeUser(raw) {
-        return {
-            user_id: raw.user_id ?? (raw.id ? this.hashUUID(raw.id) : 0),
-            id: raw.id ?? String(raw.user_id),
+        const user = {
             email: raw.email,
             display_name: raw.display_name ?? raw.email?.split('@')[0] ?? '',
             photo_url: raw.photo_url,
             is_email_verified: raw.is_email_verified ?? false
         };
+        // id and user_id are optional after auth response cleanup (task #1552)
+        // Only populate them if the raw data contains them
+        if (raw.id) {
+            user.id = raw.id;
+        }
+        else if (raw.user_id) {
+            user.id = String(raw.user_id);
+        }
+        if (raw.user_id) {
+            user.user_id = raw.user_id;
+        }
+        else if (raw.id) {
+            user.user_id = this.hashUUID(raw.id);
+        }
+        return user;
     }
     hashUUID(uuid) {
         let hash = 0;
@@ -249,7 +266,8 @@ class StoneScriptPHPAuth {
                     success: true,
                     accessToken: this.resolveAccessToken(data),
                     refreshToken: this.resolveRefreshToken(data),
-                    user: this.resolveUser(data)
+                    user: this.resolveUser(data),
+                    membership: this.resolveMembership(data)
                 };
             }
             return { success: false, message: this.resolveErrorMessage(data, 'Invalid credentials') };
@@ -399,22 +417,48 @@ class StoneScriptPHPAuth {
                 resolve({ success: false, message: 'Popup blocked. Please allow popups for this site.' });
                 return;
             }
+            const cleanup = () => {
+                window.removeEventListener('message', messageHandler);
+                clearInterval(checkClosed);
+                if (popup && !popup.closed)
+                    popup.close();
+            };
             const messageHandler = (event) => {
                 if (event.origin !== new URL(accountsUrl).origin)
                     return;
-                if (event.data.type === 'oauth_success') {
-                    window.removeEventListener('message', messageHandler);
-                    popup.close();
+                if (event.data.type === 'oauth_new_identity') {
+                    cleanup();
+                    resolve({
+                        success: true,
+                        accessToken: event.data.access_token,
+                        refreshToken: event.data.refresh_token,
+                        isNewIdentity: true,
+                        authMethod: event.data.auth_method,
+                        oauthProvider: event.data.oauth_provider,
+                        identity: event.data.identity,
+                    });
+                }
+                else if (event.data.type === 'oauth_success') {
+                    cleanup();
                     const rawUser = event.data.user || this.resolveUser(event.data);
                     resolve({
                         success: true,
                         accessToken: event.data.access_token,
-                        user: rawUser ? this.normalizeUser(rawUser) : undefined
+                        refreshToken: event.data.refresh_token,
+                        user: rawUser ? this.normalizeUser(rawUser) : undefined,
+                        membership: event.data.membership,
+                    });
+                }
+                else if (event.data.type === 'oauth_tenant_selection') {
+                    cleanup();
+                    resolve({
+                        success: true,
+                        accessToken: event.data.selection_token,
+                        memberships: event.data.memberships,
                     });
                 }
                 else if (event.data.type === 'oauth_error') {
-                    window.removeEventListener('message', messageHandler);
-                    popup.close();
+                    cleanup();
                     resolve({ success: false, message: event.data.message || 'OAuth login failed' });
                 }
             };
@@ -454,7 +498,8 @@ class StoneScriptPHPAuth {
     async getTenantMemberships(accessToken) {
         try {
             const accountsUrl = this.getAccountsUrl();
-            const response = await fetch(`${accountsUrl}/api/auth/memberships`, {
+            const platformCode = encodeURIComponent(this.config.platformCode ?? '');
+            const response = await fetch(`${accountsUrl}/api/auth/memberships?platform_code=${platformCode}`, {
                 method: 'GET',
                 headers: {
                     'Authorization': `Bearer ${accessToken}`,
@@ -590,6 +635,26 @@ class StoneScriptPHPAuth {
         }
         return response.json();
     }
+    async provisionTenant(storeName, countryCode, accessToken) {
+        const apiUrl = this.getPlatformApiUrl();
+        const response = await fetch(`${apiUrl}/auth/provision-tenant`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${accessToken}`
+            },
+            credentials: 'include',
+            body: JSON.stringify({
+                store_name: storeName,
+                country_code: countryCode,
+            })
+        });
+        if (!response.ok) {
+            const errorData = await response.json();
+            throw new Error(errorData.message || 'Failed to provision tenant');
+        }
+        return response.json();
+    }
     async checkEmail(email) {
         try {
             const accountsUrl = this.getAccountsUrl();
@@ -1014,6 +1079,17 @@ class AuthService {
             throw new Error('checkOnboardingStatus not supported');
         return this.plugin.checkOnboardingStatus(identityId);
     }
+    async provisionTenant(storeName, countryCode = 'IN') {
+        if (!this.plugin.provisionTenant) {
+            throw new Error('provisionTenant not supported by the configured auth plugin');
+        }
+        const result = await this.plugin.provisionTenant(storeName, countryCode, this.tokens.getAccessToken());
+        if (result?.access_token) {
+            this.tokens.setAccessToken(result.access_token);
+            this.signinStatus.setSigninStatus(true);
+        }
+        return result;
+    }
     async completeTenantOnboarding(countryCode, tenantName, serverName) {
         if (!this.plugin.completeTenantOnboarding)
             throw new Error('completeTenantOnboarding not supported');
@@ -1762,6 +1838,7 @@ class TenantLoginComponent {
     createTenantLinkAction = 'Create New Organization';
     // Outputs
     tenantSelected = new EventEmitter();
+    needsOnboarding = new EventEmitter();
     createTenant = new EventEmitter();
     // Form Fields
     email = '';
@@ -1830,8 +1907,8 @@ class TenantLoginComponent {
                 this.error = result.message || 'Login failed';
                 return;
             }
-            // Authentication successful, now handle tenant selection
-            await this.handlePostAuthFlow();
+            // Authentication successful — pass result so membership can be reused
+            await this.handlePostAuthFlow(result);
         }
         catch (err) {
             this.error = err.message || 'An unexpected error occurred';
@@ -1849,8 +1926,24 @@ class TenantLoginComponent {
                 this.error = result.message || 'OAuth login failed';
                 return;
             }
-            // Authentication successful, now handle tenant selection
-            await this.handlePostAuthFlow();
+            // New identity — user exists but has no tenant membership
+            if (result.isNewIdentity && result.identity) {
+                this.needsOnboarding.emit({
+                    auth_method: result.authMethod || 'oauth',
+                    oauth_provider: result.oauthProvider,
+                    is_new_identity: true,
+                    identity: result.identity,
+                });
+                return;
+            }
+            // Multi-tenant selection — user has multiple memberships
+            if (result.memberships && result.memberships.length > 0) {
+                this.memberships = result.memberships;
+                this.showingTenantSelector = true;
+                return;
+            }
+            // Standard success — pass result so membership can be reused if present
+            await this.handlePostAuthFlow(result);
         }
         catch (err) {
             this.error = err.message || 'An unexpected error occurred';
@@ -1859,7 +1952,7 @@ class TenantLoginComponent {
             this.loading = false;
         }
     }
-    async handlePostAuthFlow() {
+    async handlePostAuthFlow(loginResult) {
         if (!this.showTenantSelector) {
             // Tenant selection is disabled, emit event immediately
             this.tenantSelected.emit({
@@ -1869,11 +1962,20 @@ class TenantLoginComponent {
             });
             return;
         }
-        // Fetch user's tenant memberships
+        // Resolve memberships — prefer data from login response to avoid extra API call
         this.loading = true;
         try {
-            const result = await this.auth.getTenantMemberships();
-            if (!result.memberships || result.memberships.length === 0) {
+            let memberships;
+            if (loginResult?.membership) {
+                // Login response already included membership — use it directly
+                memberships = [loginResult.membership];
+            }
+            else {
+                // Fall back to fetching memberships from API (with platform_code param)
+                const result = await this.auth.getTenantMemberships();
+                memberships = result.memberships;
+            }
+            if (!memberships || memberships.length === 0) {
                 // User has no tenants, prompt to create one
                 this.error = 'You are not a member of any organization. Please create one.';
                 if (this.allowTenantCreation) {
@@ -1881,7 +1983,7 @@ class TenantLoginComponent {
                 }
                 return;
             }
-            this.memberships = result.memberships;
+            this.memberships = memberships;
             // Get user name if available
             const currentUser = this.auth.getCurrentUser();
             if (currentUser) {
@@ -1969,7 +2071,7 @@ class TenantLoginComponent {
         this.createTenant.emit();
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.17", ngImport: i0, type: TenantLoginComponent, deps: [{ token: AuthService }, { token: ProviderRegistryService }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.17", type: TenantLoginComponent, isStandalone: true, selector: "lib-tenant-login", inputs: { title: "title", providers: "providers", showTenantSelector: "showTenantSelector", autoSelectSingleTenant: "autoSelectSingleTenant", prefillEmail: "prefillEmail", allowTenantCreation: "allowTenantCreation", tenantSelectorTitle: "tenantSelectorTitle", tenantSelectorDescription: "tenantSelectorDescription", continueButtonText: "continueButtonText", registerLinkText: "registerLinkText", registerLinkAction: "registerLinkAction", createTenantLinkText: "createTenantLinkText", createTenantLinkAction: "createTenantLinkAction" }, outputs: { tenantSelected: "tenantSelected", createTenant: "createTenant" }, ngImport: i0, template: `
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.17", type: TenantLoginComponent, isStandalone: true, selector: "lib-tenant-login", inputs: { title: "title", providers: "providers", showTenantSelector: "showTenantSelector", autoSelectSingleTenant: "autoSelectSingleTenant", prefillEmail: "prefillEmail", allowTenantCreation: "allowTenantCreation", tenantSelectorTitle: "tenantSelectorTitle", tenantSelectorDescription: "tenantSelectorDescription", continueButtonText: "continueButtonText", registerLinkText: "registerLinkText", registerLinkAction: "registerLinkAction", createTenantLinkText: "createTenantLinkText", createTenantLinkAction: "createTenantLinkAction" }, outputs: { tenantSelected: "tenantSelected", needsOnboarding: "needsOnboarding", createTenant: "createTenant" }, ngImport: i0, template: `
         <div class="tenant-login-dialog">
             @if (!showingTenantSelector) {
                 <!-- Step 1: Authentication -->
@@ -2334,6 +2436,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.17", ngImpo
                 type: Input
             }], tenantSelected: [{
                 type: Output
+            }], needsOnboarding: [{
+                type: Output
             }], createTenant: [{
                 type: Output
             }] } });
@@ -2784,7 +2888,7 @@ class AuthPageComponent {
                 }
             </div>
         </div>
-    `, isInline: true, styles: [".auth-container{min-height:100vh;display:flex;align-items:center;justify-content:center;padding:20px;background:linear-gradient(135deg,#667eea,#764ba2)}.auth-card{background:#fff;border-radius:12px;box-shadow:0 10px 40px #0000001a;padding:40px;width:100%;max-width:480px}.logo{display:block;max-width:200px;max-height:80px;margin:0 auto 24px}.app-name{margin:0 0 12px;font-size:28px;font-weight:600;text-align:center;color:#1a202c}.subtitle{margin:0 0 32px;font-size:16px;text-align:center;color:#718096}:host ::ng-deep .tenant-login-dialog,:host ::ng-deep .register-dialog{padding:0;max-width:none}:host ::ng-deep .login-title,:host ::ng-deep .register-title{display:none}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: TenantLoginComponent, selector: "lib-tenant-login", inputs: ["title", "providers", "showTenantSelector", "autoSelectSingleTenant", "prefillEmail", "allowTenantCreation", "tenantSelectorTitle", "tenantSelectorDescription", "continueButtonText", "registerLinkText", "registerLinkAction", "createTenantLinkText", "createTenantLinkAction"], outputs: ["tenantSelected", "createTenant"] }, { kind: "component", type: RegisterComponent, selector: "lib-register", outputs: ["navigateToLogin"] }] });
+    `, isInline: true, styles: [".auth-container{min-height:100vh;display:flex;align-items:center;justify-content:center;padding:20px;background:linear-gradient(135deg,#667eea,#764ba2)}.auth-card{background:#fff;border-radius:12px;box-shadow:0 10px 40px #0000001a;padding:40px;width:100%;max-width:480px}.logo{display:block;max-width:200px;max-height:80px;margin:0 auto 24px}.app-name{margin:0 0 12px;font-size:28px;font-weight:600;text-align:center;color:#1a202c}.subtitle{margin:0 0 32px;font-size:16px;text-align:center;color:#718096}:host ::ng-deep .tenant-login-dialog,:host ::ng-deep .register-dialog{padding:0;max-width:none}:host ::ng-deep .login-title,:host ::ng-deep .register-title{display:none}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: TenantLoginComponent, selector: "lib-tenant-login", inputs: ["title", "providers", "showTenantSelector", "autoSelectSingleTenant", "prefillEmail", "allowTenantCreation", "tenantSelectorTitle", "tenantSelectorDescription", "continueButtonText", "registerLinkText", "registerLinkAction", "createTenantLinkText", "createTenantLinkAction"], outputs: ["tenantSelected", "needsOnboarding", "createTenant"] }, { kind: "component", type: RegisterComponent, selector: "lib-register", outputs: ["navigateToLogin"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.17", ngImport: i0, type: AuthPageComponent, decorators: [{
             type: Component,
@@ -3839,7 +3943,7 @@ class TenantLoginDialogComponent {
                 (createTenant)="onCreateTenant()">
             </lib-tenant-login>
         </div>
-    `, isInline: true, styles: [".dialog-wrapper{padding:0}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: TenantLoginComponent, selector: "lib-tenant-login", inputs: ["title", "providers", "showTenantSelector", "autoSelectSingleTenant", "prefillEmail", "allowTenantCreation", "tenantSelectorTitle", "tenantSelectorDescription", "continueButtonText", "registerLinkText", "registerLinkAction", "createTenantLinkText", "createTenantLinkAction"], outputs: ["tenantSelected", "createTenant"] }] });
+    `, isInline: true, styles: [".dialog-wrapper{padding:0}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: TenantLoginComponent, selector: "lib-tenant-login", inputs: ["title", "providers", "showTenantSelector", "autoSelectSingleTenant", "prefillEmail", "allowTenantCreation", "tenantSelectorTitle", "tenantSelectorDescription", "continueButtonText", "registerLinkText", "registerLinkAction", "createTenantLinkText", "createTenantLinkAction"], outputs: ["tenantSelected", "needsOnboarding", "createTenant"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.17", ngImport: i0, type: TenantLoginDialogComponent, decorators: [{
             type: Component,