@progalaxyelabs/ngx-stonescriptphp-client 1.12.0 → 1.14.0

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

@@ -469,7 +469,7 @@ class StoneScriptPHPAuth {
             return [];
         }
     }
-    async registerTenant(data, accessToken) {
+    async registerTenant(data) {
         if (data.provider !== 'emailPassword') {
             return this.registerTenantWithOAuth(data.tenantName, data.provider);
         }
@@ -489,14 +489,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 +523,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 +973,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)
@@ -3249,12 +3257,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 +3289,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';