Browse Source

Merge pull request #9781 from abpframework/auto-merge/rel-4-4/517

Merge branch dev with rel-4.4
pull/9791/head
Bunyamin Coskuner 5 years ago
committed by GitHub
parent
commit
6df01c6cd3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts

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

@ -46,10 +46,15 @@ export async function parseTenantFromUrl(injector: Injector) {
const setEnvironmentWithDomainTenant = (tenant: FindTenantResultDto) => {
hideTenantBox();
setDomainTenant(tenant);
replaceTenantNameWithinEnvironment(injector, tenant.name);
};
if (tenancyName) {
/**
* We have to replace tenant name within the urls from environment,
* because the code below will make a http request to find information about the domain tenant.
* Before this request takes place, we need to replace placeholders aka "{0}".
*/
replaceTenantNameWithinEnvironment(injector, tenancyName);
return multiTenancyService
.setTenantByName(tenancyName)
.pipe(tap(setEnvironmentWithDomainTenant))

Loading…
Cancel
Save