From c9257ab4bf315193b13f14eab86c6fa12dcebe4b Mon Sep 17 00:00:00 2001
From: crazywoola <100913391+crazywoola@users.noreply.github.com>
Date: Wed, 28 Feb 2024 15:17:49 +0800
Subject: [PATCH] Fix/2559 upload powered by brand image not showing up (#2602)

---
 api/services/workspace_service.py                  | 14 ++++++++++++--
 .../custom/custom-web-app-brand/index.tsx          |  4 +---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/api/services/workspace_service.py b/api/services/workspace_service.py
index 923e44dd85..778b4e51d3 100644
--- a/api/services/workspace_service.py
+++ b/api/services/workspace_service.py
@@ -1,3 +1,5 @@
+
+from flask import current_app
 from flask_login import current_user
 
 from extensions.ext_database import db
@@ -31,7 +33,15 @@ class WorkspaceService:
 
         can_replace_logo = FeatureService.get_features(tenant_info['id']).can_replace_logo
 
-        if can_replace_logo and TenantService.has_roles(tenant, [TenantAccountJoinRole.OWNER, TenantAccountJoinRole.ADMIN]):
-            tenant_info['custom_config'] = tenant.custom_config_dict
+        if can_replace_logo and TenantService.has_roles(tenant, 
+        [TenantAccountJoinRole.OWNER, TenantAccountJoinRole.ADMIN]):
+            base_url = current_app.config.get('FILES_URL')
+            replace_webapp_logo = f'{base_url}/files/workspaces/{tenant.id}/webapp-logo' if tenant.custom_config_dict.get('replace_webapp_logo') else None
+            remove_webapp_brand = tenant.custom_config_dict.get('remove_webapp_brand', False)
+
+            tenant_info['custom_config'] = {
+                'remove_webapp_brand': remove_webapp_brand,
+                'replace_webapp_logo': replace_webapp_logo,
+            }
 
         return tenant_info
diff --git a/web/app/components/custom/custom-web-app-brand/index.tsx b/web/app/components/custom/custom-web-app-brand/index.tsx
index 4817cfddab..857706bf26 100644
--- a/web/app/components/custom/custom-web-app-brand/index.tsx
+++ b/web/app/components/custom/custom-web-app-brand/index.tsx
@@ -16,8 +16,6 @@ import {
   updateCurrentWorkspace,
 } from '@/service/common'
 import { useAppContext } from '@/context/app-context'
-import { API_PREFIX } from '@/config'
-import { getPurifyHref } from '@/utils'
 
 const ALLOW_FILE_EXTENSIONS = ['svg', 'png']
 
@@ -123,7 +121,7 @@ const CustomWebAppBrand = () => {
                 POWERED BY
                 {
                   webappLogo
-                    ? <img key={webappLogo} src={`${getPurifyHref(API_PREFIX.slice(0, -12))}/files/workspaces/${currentWorkspace.id}/webapp-logo`} alt='logo' className='ml-2 block w-auto h-5' />
+                    ? <img key={webappLogo} src={webappLogo} alt='logo' className='ml-2 block w-auto h-5' />
                     : <LogoSite className='ml-2 !h-5' />
                 }
               </div>