@progalaxyelabs/ngx-stonescriptphp-client 1.14.0 → 1.15.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') };
@@ -454,7 +472,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}`,
@@ -1830,8 +1849,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 +1868,8 @@ class TenantLoginComponent {
                 this.error = result.message || 'OAuth login failed';
                 return;
             }
-            // Authentication successful, now handle tenant selection
-            await this.handlePostAuthFlow();
+            // Authentication successful — 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 +1878,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 +1888,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 +1909,7 @@ class TenantLoginComponent {
                 }
                 return;
             }
-            this.memberships = result.memberships;
+            this.memberships = memberships;
             // Get user name if available
             const currentUser = this.auth.getCurrentUser();
             if (currentUser) {