Skip to content

build(deps-dev): bump guzzlehttp/guzzle from 7.15.1 to 8.0.0 in /tests/integration #1200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 5 commits into from
Aug 9, 2026
Merged

build(deps-dev): bump guzzlehttp/guzzle from 7.15.1 to 8.0.0 in /tests/integration #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a3ea5f
build(deps-dev): bump guzzlehttp/guzzle in /tests/integration
dependabot[bot] Jul 31, 2026
f6072c6
fix(integration): Adapt usage to newer version of guzzle
CarlSchwan Jul 31, 2026
c98f95a
fix: Ensure getLogoutUrl return a valid URL
CarlSchwan Jul 31, 2026
0f76882
refactor: Remove some duplicate code
CarlSchwan Aug 9, 2026
c5d4456
fix(psalm): Fix remaingin issues
CarlSchwan Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 11 additions & 34 deletions lib/GroupBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
use OCP\Group\Backend\ISearchableGroupBackend;
use OCP\Group\Backend\ISetDisplayNameBackend;
use OCP\IDBConnection;
use OCP\IUser;
use OCP\IUserManager;
use OCP\Server;
use PDO;
Expand Down Expand Up @@ -428,8 +429,8 @@ public function getGroupsDetails(array $gids): array {
return $details;
}

public function setupSearchQuery(string $search, IQueryBuilder $query): void {
if ($search !== '') {
public function setupSearchQuery(string $search, IQueryBuilder $query, bool $includeMetadata = false): void {
if ($includeMetadata || $search !== '') {
$query->leftJoin('m', 'accounts_data', 'dn',
$query->expr()->andX(
$query->expr()->eq('dn.uid', 'm.uid'),
Expand All @@ -442,7 +443,9 @@ public function setupSearchQuery(string $search, IQueryBuilder $query): void {
$query->expr()->eq('em.name', $query->createNamedParameter('email'))
)
);
}

if ($search !== '') {
$searchParam1 = $query->createNamedParameter('%' . $this->dbc->escapeLikeParameter($search) . '%');
$searchParam2 = $query->createNamedParameter('%' . $this->dbc->escapeLikeParameter($search) . '%');
$searchParam3 = $query->createNamedParameter('%' . $this->dbc->escapeLikeParameter($search) . '%');
Expand All @@ -464,36 +467,7 @@ public function searchInGroup(string $gid, string $search = '', int $limit = -1,
->where($query->expr()->eq('gid', $query->createNamedParameter($gid)))
->orderBy('g.uid', 'ASC');

// Join displayname and email from oc_accounts_data
$query->leftJoin('g', 'accounts_data', 'dn',
$query->expr()->andX(
$query->expr()->eq('dn.uid', 'g.uid'),
$query->expr()->eq('dn.name', $query->expr()->literal('displayname'))
)
);

$query->leftJoin('g', 'accounts_data', 'em',
$query->expr()->andX(
$query->expr()->eq('em.uid', 'g.uid'),
$query->expr()->eq('em.name', $query->expr()->literal('email'))
)
);

if ($search !== '') {
// sqlite doesn't like re-using a single named parameter here
$searchParam1 = $query->createNamedParameter('%' . $this->dbc->escapeLikeParameter($search) . '%');
$searchParam2 = $query->createNamedParameter('%' . $this->dbc->escapeLikeParameter($search) . '%');
$searchParam3 = $query->createNamedParameter('%' . $this->dbc->escapeLikeParameter($search) . '%');

$query->andWhere(
$query->expr()->orX(
$query->expr()->ilike('g.uid', $searchParam1),
$query->expr()->ilike('dn.value', $searchParam2),
$query->expr()->ilike('em.value', $searchParam3)
)
)
->orderBy('g.uid', 'ASC');
}
$this->setupSearchQuery($search, $query, includeMetadata: true);

if ($limit !== -1) {
$query->setMaxResults($limit);
Expand All @@ -507,11 +481,14 @@ public function searchInGroup(string $gid, string $search = '', int $limit = -1,
$users = [];
$userManager = Server::get(IUserManager::class);
while ($row = $result->fetch()) {
/** @psalm-suppress RedundantConditionGivenDocblockType */
if (method_exists($userManager, 'getExistingUser')) {
$users[$row['uid']] = $userManager->getExistingUser($row['uid'], $row['displayname'] ?? null);
$users[(string)$row['uid']] = $userManager->getExistingUser($row['uid'], $row['displayname'] ?? null);
} else {
/** @psalm-suppress UndefinedClass */
$users[$row['uid']] = new LazyUser($row['uid'], $userManager, $row['displayname'] ?? null);
$user = new LazyUser($row['uid'], $userManager, $row['displayname'] ?? null);
/** @var IUser $user */
$users[(string)$row['uid']] = $user;
}
}
$result->closeCursor();
Expand Down
18 changes: 7 additions & 11 deletions lib/UserBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,23 +262,19 @@ public function isSessionActive(): bool {
return $this->session->get(SessionData::KEY_IDENTITY_PROVIDER_ID) !== null;
}

/** @psalm-suppress LessSpecificImplementedReturnType */
#[Override]
public function getLogoutUrl(): string {
$id = $this->settings->getProviderId();
$settings = $this->settings->get($id);
$slo = $settings['idp-singleLogoutService.url'] ?? '';

if ($slo === '') {
return '';
}

$tokenManager = Server::get(CsrfTokenManager::class);
return $this->urlGenerator->linkToRouteAbsolute(
'user_saml.SAML.singleLogoutService',
[
'requesttoken' => $tokenManager->getToken()->getEncryptedValue(),
]
);

$logoutUrl = $this->urlGenerator->linkToRouteAbsolute($slo === '' ? 'core.login.logout' : 'user_saml.SAML.singleLogoutService', [
'requesttoken' => $tokenManager->getToken()->getEncryptedValue(),
]);
/** @var non-empty-string $logoutUrl */
return $logoutUrl;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"require-dev": {
"behat/behat": "^3.3",
"guzzlehttp/guzzle": "^7.0"
"guzzlehttp/guzzle": "^8.0"
},
"conflict": {
"psr/container": ">=1.1"
Expand Down
Loading
Loading