From eb172909fd60dfc515d6e74a7263103e9dec3bb2 Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Fri, 6 Aug 2021 18:52:13 +0300
Subject: [PATCH] fix: DTR in not replacing placeholder from baseUrl

---
 .../packages/core/src/lib/utils/multi-tenancy-utils.ts     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts
index ea2b3d9765..0b755cf9b4 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts
+++ b/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))