Skip to content

Commit 409cb41

Browse files
telemetricsystemsRobert Pawłowski
andauthored
SERWIS-6327 Fix LDAP user search (#295)
Co-authored-by: Robert Pawłowski <r.pawlowski@nowaera.pl>
1 parent 154a332 commit 409cb41

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Cms/Security/AuthProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function ldapAutocomplete($query = '*')
115115
$ldapClient = new LdapClient($this->container->get(LdapConfig::class));
116116
try {
117117
//wyszukiwanie w LDAPie
118-
$ldapResults = $ldapClient->findUser($query, 10, ['sAMAccountName']);
118+
$ldapResults = $ldapClient->findUser($query, 10, ['sAMAccountName', 'mail']);
119119
} catch (\Exception $e) {
120120
//błąd usługi
121121
$this->logger->error($e->getMessage());

src/CmsAdmin/AuthController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use Cms\Orm\CmsAuthQuery;
1414
use Cms\Orm\CmsAuthRecord;
1515
use CmsAdmin\Form\Auth;
16-
use Mmi\App\App;
1716
use Mmi\Http\Request;
1817
use Mmi\Ldap\LdapConfig;
1918
use Mmi\Mvc\Controller;
@@ -83,15 +82,16 @@ public function deleteAction(Request $request)
8382
/**
8483
* Akcja jsonowa wyszukująca użytkowników w LDAP
8584
*/
86-
public function autocompleteAction(Request $request)
85+
public function autocompleteAction(Request $request): string
8786
{
87+
$term = str_replace([' ', '*'], '', $request->term);
8888
//typ odpowiedzi
8989
$this->getResponse()->setTypeJson();
9090
//za krótki ciąg
91-
if (strlen(trim($request->term)) < 3) {
91+
if (strlen($term) < 3) {
9292
return json_encode([]);
9393
}
9494
//zwraca odpowiedz JSON
95-
return json_encode($this->authProvider->ldapAutocomplete($request->term . '*'));
95+
return json_encode($this->authProvider->ldapAutocomplete($term . '*'));
9696
}
9797
}

0 commit comments

Comments
 (0)