fix(jans-auth-server): new jans server installation show null in plac…

…e of client_name #9415 (#9523) Signed-off-by: YuriyZ <[email protected]>
JanssenProject · Sep 19, 2024 · 23ef80c · 23ef80c
1 parent 9b4f5cf
commit 23ef80c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeAction.java
@@ -981,6 +981,25 @@ public void setClaims(String claims) {
         this.claims = claims;
     }
 
+    public String getClientDisplayName() {
+        log.trace("client {}", clientId);
+
+        if (StringUtils.isBlank(clientId)) {
+            return "Unknown";
+        }
+
+        final Client client = clientService.getClient(clientId);
+        if (StringUtils.isNotBlank(client.getClientName())) {
+            return client.getClientName();
+        }
+
+        if (StringUtils.isNotBlank(client.getClientId())) {
+            return client.getClientId();
+        }
+
+        return "Unknown";
+    }
+
     public String getAuthReqId() {
         return authReqId;
     }

diff --git a/...-auth-server/server/src/main/webapp/WEB-INF/incl/layout/authorize-extended-template.xhtml b/...-auth-server/server/src/main/webapp/WEB-INF/incl/layout/authorize-extended-template.xhtml
@@ -46,7 +46,7 @@
 							<h:outputFormat
 								value="#{msgs['authorize.requestingPermissionForScopes']}">
 								<f:param
-									value="#{empty client.getClientName()? client.getClientId() : client.getClientName()}" />
+									value="#{authorizeAction.clientDisplayName}" />
 							</h:outputFormat>
 						</p>
 					</h3>