Fix auto-wildcard being applied to alpha-paging

pydio · Feb 26, 2024 · 6589441 · 6589441
1 parent fbf2018
commit 6589441
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/frontend/front-srv/assets/gui.ajax/res/dist/core/pydio.min.js b/frontend/front-srv/assets/gui.ajax/res/dist/core/pydio.min.js
diff --git a/frontend/front-srv/assets/gui.ajax/res/dist/core/pydio.min.js.gz b/frontend/front-srv/assets/gui.ajax/res/dist/core/pydio.min.js.gz
diff --git a/frontend/front-srv/assets/gui.ajax/res/dist/libs/PydioComponents.min.js b/frontend/front-srv/assets/gui.ajax/res/dist/libs/PydioComponents.min.js
diff --git a/frontend/front-srv/assets/gui.ajax/res/dist/libs/PydioComponents.min.js.gz b/frontend/front-srv/assets/gui.ajax/res/dist/libs/PydioComponents.min.js.gz
diff --git a/frontend/front-srv/assets/gui.ajax/res/js/core/http/IdmApi.js b/frontend/front-srv/assets/gui.ajax/res/js/core/http/IdmApi.js
@@ -92,9 +92,10 @@ class IdmApi {
      * @param offset integer
      * @param limit integer
      * @param profile string filter by profile
+     * @param disableAutoWildcard bool force ignoring autoWildcard on filter
      * @return Promise<IdmUser[]>
      */
-    listUsers(baseGroup='/', filterString='', recursive = false, offset = 0, limit = -1, profile = ''){
+    listUsers(baseGroup='/', filterString='', recursive = false, offset = 0, limit = -1, profile = '', disableAutoWildcard=false){
 
         return this.loadRootPath(baseGroup).then(bg => {
             const api = new UserServiceApi(this.client);
@@ -109,7 +110,7 @@ class IdmApi {
 
             if(filterString){
                 const queryString = new IdmUserSingleQuery();
-                if (this.autoWildCard){
+                if (this.autoWildCard && !disableAutoWildcard){
                     filterString = '*' + filterString;
                 }
                 queryString.Login = filterString + '*';
@@ -211,9 +212,10 @@ class IdmApi {
      * @param offset integer
      * @param limit integer
      * @param filterString
+     * @param disableAutoWildcard bool force ignoring autoWildcard on filter
      * @return Promise<RestUsersCollection>
      */
-    listUsersWithRole(roleId, offset = 0, limit = -1, filterString = ''){
+    listUsersWithRole(roleId, offset = 0, limit = -1, filterString = '', disableAutoWildcard=false){
 
         const api = new UserServiceApi(this.client);
         const request = new RestSearchUserRequest();
@@ -229,7 +231,7 @@ class IdmApi {
         request.Queries.push(query2);
         if(filterString){
             const queryString = new IdmUserSingleQuery();
-            if (this.autoWildCard){
+            if (this.autoWildCard && !disableAutoWildcard){
                 filterString = '*' + filterString;
             }
             queryString.Login = filterString + '*';

diff --git a/frontend/front-srv/assets/gui.ajax/res/js/ui/Components/users/addressbook/Loaders.js b/frontend/front-srv/assets/gui.ajax/res/js/ui/Components/users/addressbook/Loaders.js
@@ -177,9 +177,10 @@ class Loaders{
     }
 
     static loadExternalUsers(entry, callback){
-        let filter = '', offset = 0, limit = StdLimit;
+        let filter = '', offset = 0, limit = StdLimit, disableAW = false;
         if(entry.currentParams && entry.currentParams.alpha_pages){
             filter = entry.currentParams.value;
+            disableAW = true
         }
         if(entry.range){
             let [start, end] = entry.range.split('-');
@@ -188,7 +189,7 @@ class Loaders{
             limit = end - offset;
         }
         const pydio = PydioApi.getClient().getPydioObject();
-        IdmApi.listUsers('/', filter, true, offset, limit, 'shared').then(users => {
+        IdmApi.listUsers('/', filter, true, offset, limit, 'shared', disableAW).then(users => {
             entry.pagination = Loaders.computePagination(users);
             const items = users.Users.filter(idmUser => idmUser.Login !== pydio.user.id).map((idmUser) => {
                 return {
@@ -202,12 +203,15 @@ class Loaders{
     }
 
     static loadGroupUsers(entry, callback){
-        let path = '/', filter = '', offset = 0, limit = StdLimit;
+        let path = '/', filter = '', offset = 0, limit = StdLimit, disableAW = false;
         if(entry.IdmUser){
             path = LangUtils.trimRight(entry.IdmUser.GroupPath, '/') + '/' + entry.IdmUser.GroupLabel;
         }
         if(entry.currentParams && (entry.currentParams.alpha_pages || entry.currentParams.has_search)){
             filter = entry.currentParams.value;
+            if(entry.currentParams.alpha_pages) {
+                disableAW = true
+            }
         }
         if(entry.range){
             let [start, end] = entry.range.split('-');
@@ -216,7 +220,7 @@ class Loaders{
             limit = end - offset;
         }
         const pydio = PydioApi.getClient().getPydioObject();
-        IdmApi.listUsers(path, filter, false, offset, limit, '!shared').then(users => {
+        IdmApi.listUsers(path, filter, false, offset, limit, '!shared', disableAW).then(users => {
             entry.pagination = Loaders.computePagination(users);
             const items = users.Users.filter(idmUser => idmUser.Login !== pydio.user.id && idmUser.Login !== "pydio.anon.user").map((idmUser) => {
                 return {
@@ -229,7 +233,7 @@ class Loaders{
     }
 
     static loadTeamUsers(entry, callback){
-        let offset = 0, limit = StdLimit, filter = '';
+        let offset = 0, limit = StdLimit, filter = '', disableAW = false;
         if(entry.range){
             let [start, end] = entry.range.split('-');
             offset = parseInt(start);
@@ -238,8 +242,11 @@ class Loaders{
         }
         if(entry.currentParams && (entry.currentParams.alpha_pages || entry.currentParams.has_search)){
             filter = entry.currentParams.value;
+            if(entry.currentParams.alpha_pages){
+                disableAW = true
+            }
         }
-        IdmApi.listUsersWithRole(entry.IdmRole.Uuid, offset, limit, filter).then(users => {
+        IdmApi.listUsersWithRole(entry.IdmRole.Uuid, offset, limit, filter, disableAW).then(users => {
             entry.pagination = Loaders.computePagination(users);
             const items = users.Users.map((idmUser) => {
                 return {