mirrors/pocket-id
1
0
Fork 0
mirror of https://github.com/pocket-id/pocket-id.git synced 2026-02-16 23:24:12 +00:00
Code Activity

fix: apps showed multiple times if user is in multiple groups

Browse Source
This commit is contained in:
Elias Schneider
2025-08-27 17:34:11 +02:00
parent 136c6082f6
commit 641bbc9351
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/internal/service/oidc_service.go
View File

@@ -1383,14 +1383,18 @@ func (s *OidcService) ListAccessibleOidcClients(ctx context.Context, userID stri
// If user has no groups, only return clients with no allowed user groups // If user has no groups, only return clients with no allowed user groups
if len(userGroupIDs) == 0 { if len(userGroupIDs) == 0 {
query = query. query = query.Where(`NOT EXISTS (
Joins("LEFT JOIN oidc_clients_allowed_user_groups ON oidc_clients.id = oidc_clients_allowed_user_groups.oidc_client_id"). SELECT 1 FROM oidc_clients_allowed_user_groups
Where("oidc_clients_allowed_user_groups.oidc_client_id IS NULL") WHERE oidc_clients_allowed_user_groups.oidc_client_id = oidc_clients.id)`)
} else { } else {
// Return clients with no allowed user groups OR clients where user is in allowed groups query = query.Where(`
query = query. NOT EXISTS (
Joins("LEFT JOIN oidc_clients_allowed_user_groups ON oidc_clients.id = oidc_clients_allowed_user_groups.oidc_client_id"). SELECT 1 FROM oidc_clients_allowed_user_groups
Where("oidc_clients_allowed_user_groups.oidc_client_id IS NULL OR oidc_clients_allowed_user_groups.user_group_id IN (?)", userGroupIDs) WHERE oidc_clients_allowed_user_groups.oidc_client_id = oidc_clients.id
) OR EXISTS (
SELECT 1 FROM oidc_clients_allowed_user_groups
WHERE oidc_clients_allowed_user_groups.oidc_client_id = oidc_clients.id
AND oidc_clients_allowed_user_groups.user_group_id IN (?))`, userGroupIDs)
} }
var clients []model.OidcClient var clients []model.OidcClient