WIP: move prefix to better location

Signed-off-by: Bruce Ricard <bricard@vmware.com>
cloudfoundry · Aug 24, 2023 · 00a13b6 · 00a13b6
1 parent 14a1c40
commit 00a13b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/zone/BrandingInformation.java b/model/src/main/java/org/cloudfoundry/identity/uaa/zone/BrandingInformation.java
@@ -35,7 +35,11 @@ public void setCompanyName(String companyName) {
 
     @Override
     public String getProductLogo() {
-        return productLogo;
+        String logo = productLogo;
+        if ( logo != null ) {
+            logo = "data:image/png;base64," + logo;
+        }
+        return logo;
     }
 
     public void setProductLogo(String productLogo) {

diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/MergedZoneBrandingInformation.java b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/MergedZoneBrandingInformation.java
@@ -31,9 +31,9 @@ public String getCompanyName() {
     @Override
     public String getProductLogo() {
         String logo = tryGet(IdentityZoneHolder.get(), BrandingInformationSource::getProductLogo).orElse(null);
-        if ( logo != null ) {
-            logo = "data:image/png;base64," + logo;
-        }
+//        if ( logo != null ) {
+//            logo = "data:image/png;base64," + logo;
+//        }
         return logo;
     }