starred/pocket-id
1
0
Fork 0
mirror of https://github.com/pocket-id/pocket-id.git synced 2025-12-19 17:23:33 +03:00
Code Issues 121 Packages Projects Releases 16 Wiki Activity

fix: sort order incorrect for apps when using postgres

Browse Source
This commit is contained in:
Elias Schneider
2025-08-24 19:08:33 +02:00
parent 2ffc6ba42a
commit d0392d25ed
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1379,8 +1379,7 @@ func (s *OidcService) ListAccessibleOidcClients(ctx context.Context, userID stri
query := tx. query := tx.
WithContext(ctx). WithContext(ctx).
Model(&model.OidcClient{}). Model(&model.OidcClient{}).
Preload("UserAuthorizedOidcClients", "user_id = ?", userID). Preload("UserAuthorizedOidcClients", "user_id = ?", userID)
Distinct()
// 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 {
@@ -1401,7 +1400,7 @@ func (s *OidcService) ListAccessibleOidcClients(ctx context.Context, userID stri
if sortedPaginationRequest.Sort.Column == "lastUsedAt" && utils.IsValidSortDirection(sortedPaginationRequest.Sort.Direction) { if sortedPaginationRequest.Sort.Column == "lastUsedAt" && utils.IsValidSortDirection(sortedPaginationRequest.Sort.Direction) {
query = query. query = query.
Joins("LEFT JOIN user_authorized_oidc_clients ON oidc_clients.id = user_authorized_oidc_clients.client_id AND user_authorized_oidc_clients.user_id = ?", userID). Joins("LEFT JOIN user_authorized_oidc_clients ON oidc_clients.id = user_authorized_oidc_clients.client_id AND user_authorized_oidc_clients.user_id = ?", userID).
Order("user_authorized_oidc_clients.last_used_at " + sortedPaginationRequest.Sort.Direction) Order("user_authorized_oidc_clients.last_used_at " + sortedPaginationRequest.Sort.Direction + " NULLS LAST")
} }
response, err = utils.PaginateAndSort(sortedPaginationRequest, query, &clients) response, err = utils.PaginateAndSort(sortedPaginationRequest, query, &clients)