From a9f31c7f95d8c3f8090d309dd843f2806168c55c Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Mon, 29 Mar 2021 18:28:08 +0300
Subject: [PATCH] fix: incorrect baseUrl when there is no tenant

---
 .../core/src/lib/utils/multi-tenancy-utils.ts | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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 390a46db8e..dbcb2c8517 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
@@ -41,41 +41,40 @@ export async function parseTenantFromUrl(injector: Injector) {
         }),
       )
       .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();
 }
 
-function setEnvironment(injector: Injector, tenancyName: string) {
+function setEnvironment(injector: Injector, tenancyName: string, placeholder = tenancyPlaceholder) {
   const environmentService = injector.get(EnvironmentService);
 
   const environment = clone(environmentService.getEnvironment()) as Environment;
 
   if (environment.application.baseUrl) {
     environment.application.baseUrl = environment.application.baseUrl.replace(
-      tenancyPlaceholder,
+      placeholder,
       tenancyName,
     );
   }
 
   if (environment.oAuthConfig.redirectUri) {
     environment.oAuthConfig.redirectUri = environment.oAuthConfig.redirectUri.replace(
-      tenancyPlaceholder,
+      placeholder,
       tenancyName,
     );
   }
 
-  environment.oAuthConfig.issuer = environment.oAuthConfig.issuer.replace(
-    tenancyPlaceholder,
-    tenancyName,
-  );
+  environment.oAuthConfig.issuer = environment.oAuthConfig.issuer.replace(placeholder, tenancyName);
 
   Object.keys(environment.apis).forEach(api => {
     Object.keys(environment.apis[api]).forEach(key => {
-      environment.apis[api][key] = environment.apis[api][key].replace(
-        tenancyPlaceholder,
-        tenancyName,
-      );
+      environment.apis[api][key] = environment.apis[api][key].replace(placeholder, tenancyName);
     });
   });