/searchUser: add "globalInfo" field on first response (instead of add…

…ing "allowExtendedInfo" on all users)
UnivParis1 · Jan 29, 2024 · eb360b3 · eb360b3
1 parent 3e3e973
commit eb360b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/lib/searchUser.inc.php b/lib/searchUser.inc.php
@@ -59,8 +59,8 @@
 global $USER_KEY_FIELD;
 $users = searchPeople(people_filters($token, $restriction, $allowInvalidAccounts, $allowNoAffiliationAccounts, $tokenIsId), $attrRestrictions, $wanted_attrs, $USER_KEY_FIELD, $maxRows);
 
-if ($allowExtendedInfo) {
-  foreach ($users as &$u) $u["allowExtendedInfo"] = $allowExtendedInfo;
+if (count($users) > 0 && GET_uid()) {
+    $users[0]['globalInfo'] = [ "maxRows" => $maxRows, "allowExtendedInfo" => $allowExtendedInfo ];
 }
 
 if ($format === 'vcard') {

diff --git a/test/run.php b/test/run.php
@@ -59,6 +59,10 @@ function expect_json($test_name, $ws, $params, $wanted, $remap = null) {
     $js = test($ws, $params);
     $r = json_decode($js);
     if ($r === NULL) fail($test_name, "invalid response\n$js");
+    if (is_array(($r))) {
+        // ignore globalInfo
+        foreach ($r as &$e) unset($e->globalInfo);
+    }
     $got = $remap ? $remap($r) : $r;
     $got_s = json_encode($got);
     if ($got_s !== $wanted) {

diff --git a/web-widget/userinfo/userinfo.js b/web-widget/userinfo/userinfo.js
@@ -1301,7 +1301,7 @@ const app = Vue.createApp({
                 } else if (data.length > 1) {
                     that.text("internal error (multiple user found)");
                 } else {
-                    that.allowExtendedInfo = data[0].allowExtendedInfo;
+                    that.allowExtendedInfo = data[0].allowExtendedInfo = data[0].globalInfo?.allowExtendedInfo;
                     that.text('', data[0]);
                 }
             });