From 132a3c9d39eba5224999c6ddacfb86b95ced9c58 Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Wed, 22 Mar 2023 18:31:38 +0300
Subject: [PATCH] fix 16025

---
 .../AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs     | 4 ++--
 .../src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpConsts.cs      | 1 +
 .../theme-shared/src/lib/handlers/error.handler.ts        | 8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs
index 97a6f55978..2ef9939c73 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Cors.Infrastructure;
-
+using Volo.Abp.Http;
 namespace Microsoft.AspNetCore.Cors;
 
 public static class AbpCorsPolicyBuilderExtensions
 {
     public static CorsPolicyBuilder WithAbpExposedHeaders(this CorsPolicyBuilder corsPolicyBuilder)
     {
-        return corsPolicyBuilder.WithExposedHeaders("_AbpErrorFormat");
+        return corsPolicyBuilder.WithExposedHeaders(AbpHttpConsts.AbpErrorFormat).WithExposedHeaders(AbpHttpConsts.AbpTenantResolveError);
     }
 }
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpConsts.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpConsts.cs
index 6e33882a30..0e617d7ae8 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpConsts.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpConsts.cs
@@ -3,4 +3,5 @@
 public static class AbpHttpConsts
 {
     public const string AbpErrorFormat = "_AbpErrorFormat";
+    public const string AbpTenantResolveError = "Abp-Tenant-Resolve-Error";
 }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
index ce5647bccd..4f833fe0f1 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
@@ -147,6 +147,8 @@ export class ErrorHandler {
           this.navigateToLogin();
         });
       }
+    } if(err instanceof HttpErrorResponse && err.headers.get('Abp-Tenant-Resolve-Error')){
+      this.authService.logout().subscribe();
     } else {
       switch (err.status) {
         case 401:
@@ -176,7 +178,7 @@ export class ErrorHandler {
             status: 403,
           });
           break;
-        case 404:
+        case 404:{
           this.canCreateCustomError(404)
             ? this.show404Page()
             : this.showError(
@@ -189,7 +191,9 @@ export class ErrorHandler {
                   defaultValue: DEFAULT_ERROR_MESSAGES.defaultError404.title,
                 },
               );
-          break;
+              break;
+        }
+          
         case 500:
           this.createErrorComponent({
             title: {