Browse Source

fix: incorrect baseUrl when there is no tenant

pull/8246/head
bnymncoskuner 6 years ago
parent
commit
a9f31c7f95
  1. 21
      npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts

21
npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts

@ -41,41 +41,40 @@ export async function parseTenantFromUrl(injector: Injector) {
}), }),
) )
.toPromise(); .toPromise();
} else {
/**
* If there is no tenant, we still have to clean up {0}. from baseUrl to avoid incorrect http requests.
*/
setEnvironment(injector, '', tenancyPlaceholder + '.');
} }
return Promise.resolve(); return Promise.resolve();
} }
function setEnvironment(injector: Injector, tenancyName: string) { function setEnvironment(injector: Injector, tenancyName: string, placeholder = tenancyPlaceholder) {
const environmentService = injector.get(EnvironmentService); const environmentService = injector.get(EnvironmentService);
const environment = clone(environmentService.getEnvironment()) as Environment; const environment = clone(environmentService.getEnvironment()) as Environment;
if (environment.application.baseUrl) { if (environment.application.baseUrl) {
environment.application.baseUrl = environment.application.baseUrl.replace( environment.application.baseUrl = environment.application.baseUrl.replace(
tenancyPlaceholder, placeholder,
tenancyName, tenancyName,
); );
} }
if (environment.oAuthConfig.redirectUri) { if (environment.oAuthConfig.redirectUri) {
environment.oAuthConfig.redirectUri = environment.oAuthConfig.redirectUri.replace( environment.oAuthConfig.redirectUri = environment.oAuthConfig.redirectUri.replace(
tenancyPlaceholder, placeholder,
tenancyName, tenancyName,
); );
} }
environment.oAuthConfig.issuer = environment.oAuthConfig.issuer.replace( environment.oAuthConfig.issuer = environment.oAuthConfig.issuer.replace(placeholder, tenancyName);
tenancyPlaceholder,
tenancyName,
);
Object.keys(environment.apis).forEach(api => { Object.keys(environment.apis).forEach(api => {
Object.keys(environment.apis[api]).forEach(key => { Object.keys(environment.apis[api]).forEach(key => {
environment.apis[api][key] = environment.apis[api][key].replace( environment.apis[api][key] = environment.apis[api][key].replace(placeholder, tenancyName);
tenancyPlaceholder,
tenancyName,
);
}); });
}); });

Loading…
Cancel
Save