@progalaxyelabs/ngx-stonescriptphp-client 1.12.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}`,
@@ -469,7 +488,7 @@ class StoneScriptPHPAuth {
             return [];
         }
     }
-    async registerTenant(data, accessToken) {
+    async registerTenant(data) {
         if (data.provider !== 'emailPassword') {
             return this.registerTenantWithOAuth(data.tenantName, data.provider);
         }
@@ -489,14 +508,15 @@ class StoneScriptPHPAuth {
                 body['role'] = data.role;
             const response = await fetch(`${apiUrl}/auth/register-tenant`, {
                 method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    ...(accessToken ? { 'Authorization': `Bearer ${accessToken}` } : {})
-                },
+                headers: { 'Content-Type': 'application/json' },
                 credentials: 'include',
                 body: JSON.stringify(body)
             });
-            return response.json();
+            const result = await response.json();
+            if (result?.status === 'ok' || result?.success === true) {
+                return { success: true };
+            }
+            return { success: false, message: result?.data?.message || result?.message || 'Registration failed' };
         }
         catch {
             return { success: false, message: 'Network error. Please try again.' };
@@ -522,8 +542,11 @@ class StoneScriptPHPAuth {
                 if (event.data.type === 'tenant_register_success') {
                     window.removeEventListener('message', messageHandler);
                     popup.close();
-                    resolve({ success: true, tenant: event.data.tenant, user: event.data.user,
-                        access_token: event.data.access_token });
+                    resolve({
+                        success: true,
+                        accessToken: event.data.access_token,
+                        user: event.data.user ? this.normalizeUser(event.data.user) : undefined
+                    });
                 }
                 else if (event.data.type === 'tenant_register_error') {
                     window.removeEventListener('message', messageHandler);
@@ -969,16 +992,20 @@ class AuthService {
         if (!this.plugin.registerTenant) {
             return { success: false, message: 'registerTenant not supported by the configured auth plugin' };
         }
-        const accessToken = this.tokens.getAccessToken() || undefined;
-        const result = await this.plugin.registerTenant(data, accessToken);
-        if (result?.access_token) {
-            this.tokens.setAccessToken(result.access_token);
-            this.signinStatus.setSigninStatus(true);
+        const registered = await this.plugin.registerTenant(data);
+        if (!registered.success)
+            return registered;
+        // OAuth: token comes directly from the popup — store it and we're done.
+        if (registered.accessToken) {
+            this.storeAuthResult(registered);
+            return registered;
         }
-        if (result?.refresh_token) {
-            this.tokens.setRefreshToken(result.refresh_token);
+        // emailPassword: registration succeeded but no token yet.
+        // Login via auth (SSO) to obtain tokens.
+        if (data.provider === 'emailPassword' && data.email && data.password) {
+            return await this.loginWithEmail(data.email, data.password);
         }
-        return result;
+        return registered;
     }
     async getTenantMemberships(serverName) {
         if (!this.plugin.getTenantMemberships)
@@ -1822,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';
@@ -1841,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';
@@ -1851,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({
@@ -1861,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) {
@@ -1873,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) {
@@ -3249,12 +3285,9 @@ class TenantRegisterComponent {
                 tenantName: this.tenantName,
                 provider: provider
             });
-            if (result.success && result.tenant && result.user) {
+            if (result.success && result.user) {
                 this.success = 'Organization created successfully!';
-                this.tenantCreated.emit({
-                    tenant: result.tenant,
-                    user: result.user
-                });
+                this.tenantCreated.emit({ user: result.user });
             }
             else {
                 this.error = result.message || 'Registration failed';
@@ -3284,12 +3317,9 @@ class TenantRegisterComponent {
                 password: this.password,
                 provider: 'emailPassword'
             });
-            if (result.success && result.tenant && result.user) {
+            if (result.success && result.user) {
                 this.success = 'Organization created successfully!';
-                this.tenantCreated.emit({
-                    tenant: result.tenant,
-                    user: result.user
-                });
+                this.tenantCreated.emit({ user: result.user });
             }
             else {
                 this.error = result.message || 'Registration failed';