@hichchi/ngx-auth 0.0.4 → 0.0.5

package/fesm2022/hichchi-ngx-auth.mjs

@@ -5,7 +5,7 @@ import { FormBuilder, Validators, FormsModule, ReactiveFormsModule } from '@angu
 import { AuthEndpoint, isRoleObject, AuthField, AuthErrorResponseCode } from '@hichchi/nest-connector/auth';
 import { take, map, tap, catchError, EMPTY, firstValueFrom, ReplaySubject, throwError, switchMap, filter } from 'rxjs';
 import { Endpoint, HttpClientErrorStatus } from '@hichchi/nest-connector';
-import { CrudHttpService, skipNotifyContext, validatedFormData, prependSubdomainToUrlBrowser } from '@hichchi/ngx-utils';
+import { CrudHttpService, extractSubdomain, skipNotifyContext, validatedFormData } from '@hichchi/ngx-utils';
 import { toFirstCase } from '@hichchi/utils';
 import { signalStore, withState, withComputed, withMethods, patchState } from '@ngrx/signals';
 import { withStorageSync } from '@angular-architects/ngrx-toolkit';
@@ -303,7 +303,8 @@ class AuthService extends CrudHttpService {
             const left = (window.screen.width - GOOGLE_AUTH_POPUP_WIDTH) / 2;
             // eslint-disable-next-line @typescript-eslint/no-magic-numbers
             const top = (window.screen.height - GOOGLE_AUTH_POPUP_HEIGHT) / 2;
-            const popup = window.open(`${this.config.apiBaseURL}/${Endpoint.AUTH}/${AuthEndpoint.GOOGLE_SIGN_IN}?redirectUrl=${window.location.origin}`, "google-login-popup", 
+            const tenant = extractSubdomain(this.config.splitDomain) || this.config.tenant;
+            const popup = window.open(`${this.config.apiBaseURL}/${Endpoint.AUTH}/${AuthEndpoint.GOOGLE_SIGN_IN}?redirectUrl=${window.location.origin}&tenant=${tenant}`, "google-login-popup", 
             // eslint-disable-next-line prefer-template
             "resizable=no, location=no, toolbar=false, width=" +
                 GOOGLE_AUTH_POPUP_WIDTH +
@@ -2202,12 +2203,10 @@ function authInterceptor(redirect, onRedirect) {
  * The module must be configured using the forRoot() method to provide the necessary
  * authentication configuration.
  *
- * API base URL handling:
- * - `apiBaseURL` defines the base API host for auth requests.
- * - Optional `prependSubdomain` lets you prepend a subdomain to `apiBaseURL`.
- *   - `string`: uses the provided subdomain
- *   - `true`: resolves subdomain dynamically from the current host context
- *   - `false` / `undefined`: keeps `apiBaseURL` unchanged
+ * Tenant handling:
+ * - `tenant` can be provided in the configuration or dynamically set in requests
+ *   via a custom HTTP header (`x-tenant`, controlled by `TENANT_HEADER_KEY`).
+ * - This approach replaces previous subdomain-based tenant resolution.
  *
  * @example
  * ```typescript
@@ -2238,26 +2237,12 @@ function authInterceptor(redirect, onRedirect) {
  *
  * @example
  * ```typescript
- * // Configuration with a static subdomain
+ * // Optional static tenant header
  * @NgModule({
  *   imports: [
  *     NgxHichchiAuthModule.forRoot({
  *       apiBaseURL: 'https://api.example.com',
- *       prependSubdomain: 'tenant-a'
- *     })
- *   ]
- * })
- * export class AppModule { }
- * ```
- *
- * @example
- * ```typescript
- * // Configuration with dynamic subdomain resolution
- * @NgModule({
- *   imports: [
- *     NgxHichchiAuthModule.forRoot({
- *       apiBaseURL: 'https://api.example.com',
- *       prependSubdomain: true
+ *       tenant: 'tenant-a'
  *     })
  *   ]
  * })
@@ -2277,17 +2262,11 @@ class NgxHichchiAuthModule {
      * Configures the NgxHichchiAuthModule with the provided authentication configuration
      *
      * This static method sets up the module with the necessary providers and configuration
-     * for authentication functionality. Before providers are created, `apiBaseURL` is normalized
-     * through `prependSubdomainToApi(config.apiBaseURL, config.prependSubdomain)`.
-     * It then provides the AuthService and authentication configuration token required
-     * for the module to function properly.
-     *
-     * `prependSubdomain` behavior:
-     * - `string`: prepend that subdomain to the API host
-     * - `true`: derive subdomain dynamically from the current host context
-     * - `false` / `undefined`: do not prepend a subdomain
+     * for authentication functionality. The configuration includes the `apiBaseURL` for
+     * all authentication requests, and optionally a `tenant` string that is attached
+     * to requests via the `TENANT_HEADER_KEY` header.
      *
-     * @param config - The authentication configuration object containing API endpoints and settings
+     * @param config - The authentication configuration object containing API endpoints, tenant, and other settings
      * @returns A ModuleWithProviders object configured with authentication providers
      *
      * @example
@@ -2309,29 +2288,19 @@ class NgxHichchiAuthModule {
      *
      * @example
      * ```typescript
-     * // Static subdomain
-     * NgxHichchiAuthModule.forRoot({
-     *   apiBaseURL: 'https://api.example.com',
-     *   prependSubdomain: 'tenant-a'
-     * })
-     * ```
-     *
-     * @example
-     * ```typescript
-     * // Dynamic subdomain
+     * // Configuration with static tenant
      * NgxHichchiAuthModule.forRoot({
      *   apiBaseURL: 'https://api.example.com',
-     *   prependSubdomain: true
+     *   tenant: 'tenant-a'
      * })
      * ```
      *
      * @see {@link AuthConfig} Interface defining the configuration structure
      * @see {@link AUTH_CONFIG} Injection token for the authentication configuration
      * @see {@link AuthService} Service that uses the provided configuration
-     * @see {@link prependSubdomainToUrlBrowser} Utility used to transform `apiBaseURL`
+     * @see {@link TENANT_HEADER_KEY} Constant used to attach tenant header to requests
      */
     static forRoot(config) {
-        config.apiBaseURL = prependSubdomainToUrlBrowser(config.apiBaseURL, config.splitDomain, config.devSubdomain);
         return {
             ngModule: NgxHichchiAuthModule,
             providers: [{ provide: AUTH_CONFIG, useValue: config }, AuthService],