From 202f0435ae4f14ead8c0c8ced5622ac4f4196af2 Mon Sep 17 00:00:00 2001
From: shekhar16 <shekharlaad1609@gmail.com>
Date: Sun, 24 Sep 2023 18:29:09 +0530
Subject: [PATCH] feat(oxtrust-server):#2371 add search field for scopes
 selection in client

---
 .../oxtrust/action/UpdateClientAction.java    | 24 +++++++++++++++----
 server/src/main/webapp/client/addClient.xhtml |  5 ++--
 .../src/main/webapp/client/updateClient.xhtml |  5 ++--
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java b/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java
index 13b46276f..64f40c7e5 100644
--- a/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java
+++ b/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java
@@ -205,6 +205,7 @@ public class UpdateClientAction implements Serializable {
     private String spontaneousScopeCustomScript;
     private String introspectionCustomScript;
     private String rptClaimsScript;
+    private String scopePattern;
     
     
     Pattern domainPattern = Pattern.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\\\.)+[A-Za-z]{2,6}");
@@ -267,6 +268,7 @@ public String add() throws Exception {
             this.spontaneousScopesScripts = Lists.newArrayList();
             this.backchannelLogoutUri = getStringFromList(client.getAttributes().getBackchannelLogoutUri());
             this.tlsSubjectDn = client.getAttributes().getTlsClientAuthSubjectDn();
+            this.scopePattern = "";
             this.redirectLogoutUrl = getNonEmptyStringList(client.getOxAuthPostLogoutRedirectURIs());
             searchAvailableCustomScriptsforAcr();
         } catch (BasePersistenceException ex) {
@@ -340,6 +342,7 @@ public String update() throws Exception {
             this.claimRedirectURIList = getNonEmptyStringList(client.getClaimRedirectURI());
             this.additionalAudienceList = getNonEmptyStringList(client.getAttributes().getAdditionalAudience());
             this.tlsSubjectDn = client.getAttributes().getTlsClientAuthSubjectDn();
+            this.scopePattern = "";
             
             this.postAuthnScripts = searchAvailablePostAuthnCustomScripts().stream()
                     .filter(entity -> client.getAttributes().getPostAuthnScripts().contains(entity.getEntity().getDn()))
@@ -1529,14 +1532,17 @@ public List<CustomScript> getScripts(CustomScriptType type) {
     }
 
     public void searchAvailableScopes() {
-        if (this.availableScopes != null) {
-            selectAddedScopes();
-            return;
-        }
+		/*
+		 * if (this.availableScopes != null) { selectAddedScopes(); return; }
+		 */
         List<SelectableEntity<Scope>> tmpAvailableScopes = new ArrayList<SelectableEntity<Scope>>();
         List<Scope> scopes = new ArrayList<Scope>();
         try {
-            scopes = scopeService.getAllScopesList(1000);
+        	if(scopePattern !=  null && !scopePattern.isEmpty()) {
+        		scopes = scopeService.searchScopes(scopePattern, 0);
+        	}else {
+        		scopes = scopeService.getAllScopesList(1000);
+        	}
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -2241,4 +2247,12 @@ public String getAvailableRedirectLogoutUrl() {
 	public void setAvailableRedirectLogoutUrl(String availableRedirectLogoutUrl) {
 		this.availableRedirectLogoutUrl = availableRedirectLogoutUrl;
 	}
+	
+	public String getScopePattern() {
+		return scopePattern;
+	}
+
+	public void setScopePattern(String scopePattern) {
+		this.scopePattern = scopePattern;
+	}
 }
diff --git a/server/src/main/webapp/client/addClient.xhtml b/server/src/main/webapp/client/addClient.xhtml
index 954272eeb..d6767295d 100644
--- a/server/src/main/webapp/client/addClient.xhtml
+++ b/server/src/main/webapp/client/addClient.xhtml
@@ -78,11 +78,12 @@
 				<ox:selectSelectableEntityDialog
 					acceptMethod="#{updateClientAction.acceptSelectScopes()}"
 					cancelMethod="#{updateClientAction.cancelSelectScopes()}"
-					displayNameProperty="entity.description" displaySearchForm="false"
+					displayNameProperty="entity.description" displaySearchForm="true"
 					id="scope" label="#{msgs['client.scopes']}"
 					nameProperty="entity.id" render="selectedScopesId"
 					searchMethod="#{updateClientAction.searchAvailableScopes}"
-					searchResult="#{updateClientAction.availableScopes}" />
+					searchResult="#{updateClientAction.availableScopes}" 
+					searchPattern="#{updateClientAction.scopePattern}"/>
 
 				<ox:selectSelectableEntityDialog
 					acceptMethod="#{updateClientAction.acceptSelectResponseTypes}"
diff --git a/server/src/main/webapp/client/updateClient.xhtml b/server/src/main/webapp/client/updateClient.xhtml
index af3a7ccd4..a127f7a41 100644
--- a/server/src/main/webapp/client/updateClient.xhtml
+++ b/server/src/main/webapp/client/updateClient.xhtml
@@ -105,11 +105,12 @@
 			<ox:selectSelectableEntityDialog
 				acceptMethod="#{updateClientAction.acceptSelectScopes()}"
 				cancelMethod="#{updateClientAction.cancelSelectScopes()}"
-				displayNameProperty="entity.description" displaySearchForm="false"
+				displayNameProperty="entity.description" displaySearchForm="true"
 				id="scope" label="#{msgs['client.scopes']}" nameProperty="entity.id"
 				render="selectedScopesId"
 				searchMethod="#{updateClientAction.searchAvailableScopes}"
-				searchResult="#{updateClientAction.availableScopes}" />
+				searchResult="#{updateClientAction.availableScopes}" 
+				searchPattern="#{updateClientAction.scopePattern}"/>
 
 			<ox:selectSelectableEntityDialog
 				acceptMethod="#{updateClientAction.acceptSelectResponseTypes}"