feat(tenant): support dynamic storefront base paths
This commit is contained in:
@@ -4,7 +4,7 @@ import {
|
|||||||
provideAppInitializer,
|
provideAppInitializer,
|
||||||
provideBrowserGlobalErrorListeners,
|
provideBrowserGlobalErrorListeners,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { provideRouter } from '@angular/router';
|
import { provideRouter, UrlSerializer } from '@angular/router';
|
||||||
import { provideClientHydration, withHttpTransferCacheOptions } from '@angular/platform-browser';
|
import { provideClientHydration, withHttpTransferCacheOptions } from '@angular/platform-browser';
|
||||||
|
|
||||||
import { routes } from './app.routes';
|
import { routes } from './app.routes';
|
||||||
@@ -12,6 +12,7 @@ import { authBootstrap } from './core/services/auth/auth-bootstrap';
|
|||||||
import { authInterceptor } from './core/services/auth/auth.interceptor';
|
import { authInterceptor } from './core/services/auth/auth.interceptor';
|
||||||
import { globalLoadingInterceptor } from './core/services/global-loading/global-loading.interceptor';
|
import { globalLoadingInterceptor } from './core/services/global-loading/global-loading.interceptor';
|
||||||
import { tenantBootstrap } from './core/services/tenant-bootstrap';
|
import { tenantBootstrap } from './core/services/tenant-bootstrap';
|
||||||
|
import { TenantUrlSerializer } from './core/services/tenant-url.serializer';
|
||||||
|
|
||||||
export function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
|
export function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
|
||||||
return (
|
return (
|
||||||
@@ -26,6 +27,7 @@ export const appConfig: ApplicationConfig = {
|
|||||||
providers: [
|
providers: [
|
||||||
provideBrowserGlobalErrorListeners(),
|
provideBrowserGlobalErrorListeners(),
|
||||||
provideRouter(routes),
|
provideRouter(routes),
|
||||||
|
{ provide: UrlSerializer, useClass: TenantUrlSerializer },
|
||||||
provideClientHydration(
|
provideClientHydration(
|
||||||
withHttpTransferCacheOptions({
|
withHttpTransferCacheOptions({
|
||||||
includeRequestsWithAuthHeaders: true,
|
includeRequestsWithAuthHeaders: true,
|
||||||
|
|||||||
50
src/app/core/services/tenant-url.serializer.spec.ts
Normal file
50
src/app/core/services/tenant-url.serializer.spec.ts
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
import '@angular/compiler';
|
||||||
|
import { DefaultUrlSerializer } from '@angular/router';
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import { Tenant } from './tenant.interface';
|
||||||
|
import { TenantService } from './tenant.service';
|
||||||
|
import { TenantUrlSerializer } from './tenant-url.serializer';
|
||||||
|
|
||||||
|
describe('TenantUrlSerializer', () => {
|
||||||
|
const defaultSerializer = new DefaultUrlSerializer();
|
||||||
|
|
||||||
|
function createSerializer(basePath: string): TenantUrlSerializer {
|
||||||
|
const tenantService = {
|
||||||
|
getTenant: () => ({ base_path: basePath }) as Tenant,
|
||||||
|
} as TenantService;
|
||||||
|
|
||||||
|
return new TenantUrlSerializer(tenantService);
|
||||||
|
}
|
||||||
|
|
||||||
|
it('keeps root tenants unchanged', () => {
|
||||||
|
const serializer = createSerializer('/');
|
||||||
|
const tree = serializer.parse('/producto/123?ref=home');
|
||||||
|
|
||||||
|
expect(defaultSerializer.serialize(tree)).toBe('/producto/123?ref=home');
|
||||||
|
expect(serializer.serialize(tree)).toBe('/producto/123?ref=home');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('removes the tenant base path when parsing and restores it when serializing', () => {
|
||||||
|
const serializer = createSerializer('/desfile');
|
||||||
|
const tree = serializer.parse('/desfile/producto/123?ref=home#detalle');
|
||||||
|
|
||||||
|
expect(defaultSerializer.serialize(tree)).toBe('/producto/123?ref=home#detalle');
|
||||||
|
expect(serializer.serialize(tree)).toBe('/desfile/producto/123?ref=home#detalle');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maps the tenant base path to the application root', () => {
|
||||||
|
const serializer = createSerializer('/desfile/');
|
||||||
|
const tree = serializer.parse('/desfile');
|
||||||
|
|
||||||
|
expect(defaultSerializer.serialize(tree)).toBe('/');
|
||||||
|
expect(serializer.serialize(tree)).toBe('/desfile');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not strip partial path segment matches', () => {
|
||||||
|
const serializer = createSerializer('/desfile');
|
||||||
|
const tree = serializer.parse('/desfile-shop/producto/123');
|
||||||
|
|
||||||
|
expect(defaultSerializer.serialize(tree)).toBe('/desfile-shop/producto/123');
|
||||||
|
});
|
||||||
|
});
|
||||||
66
src/app/core/services/tenant-url.serializer.ts
Normal file
66
src/app/core/services/tenant-url.serializer.ts
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { DefaultUrlSerializer, UrlSerializer, UrlTree } from '@angular/router';
|
||||||
|
|
||||||
|
import { TenantService } from './tenant.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class TenantUrlSerializer extends UrlSerializer {
|
||||||
|
private readonly defaultSerializer = new DefaultUrlSerializer();
|
||||||
|
|
||||||
|
constructor(private readonly tenantService: TenantService) {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
override parse(url: string): UrlTree {
|
||||||
|
return this.defaultSerializer.parse(this.removeBasePath(url));
|
||||||
|
}
|
||||||
|
|
||||||
|
override serialize(tree: UrlTree): string {
|
||||||
|
const url = this.defaultSerializer.serialize(tree);
|
||||||
|
const basePath = this.basePath();
|
||||||
|
|
||||||
|
if (basePath === '/') {
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
|
||||||
|
return url === '/' ? basePath : `${basePath}${url}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private removeBasePath(url: string): string {
|
||||||
|
const basePath = this.basePath();
|
||||||
|
|
||||||
|
if (basePath === '/' || !this.startsWithCompletePathSegment(url, basePath)) {
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
|
||||||
|
const remainder = url.slice(basePath.length);
|
||||||
|
|
||||||
|
if (remainder === '') {
|
||||||
|
return '/';
|
||||||
|
}
|
||||||
|
|
||||||
|
return remainder.startsWith('?') || remainder.startsWith('#')
|
||||||
|
? `/${remainder}`
|
||||||
|
: remainder;
|
||||||
|
}
|
||||||
|
|
||||||
|
private basePath(): string {
|
||||||
|
const configuredPath = this.tenantService.getTenant()?.base_path?.trim() ?? '/';
|
||||||
|
|
||||||
|
if (configuredPath === '' || configuredPath === '/') {
|
||||||
|
return '/';
|
||||||
|
}
|
||||||
|
|
||||||
|
return `/${configuredPath.replace(/^\/+|\/+$/g, '')}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private startsWithCompletePathSegment(url: string, basePath: string): boolean {
|
||||||
|
if (!url.startsWith(basePath)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const boundary = url.charAt(basePath.length);
|
||||||
|
|
||||||
|
return boundary === '' || boundary === '/' || boundary === '?' || boundary === '#';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -101,6 +101,7 @@ export interface Tenant {
|
|||||||
codigo: string;
|
codigo: string;
|
||||||
nombre: string;
|
nombre: string;
|
||||||
dominio: string;
|
dominio: string;
|
||||||
|
base_path?: string;
|
||||||
site_title?: string | null;
|
site_title?: string | null;
|
||||||
favicon?: string | null;
|
favicon?: string | null;
|
||||||
primary_color: string;
|
primary_color: string;
|
||||||
|
|||||||
Reference in New Issue
Block a user