From d03cab22c0147c564b595b4e3b9238ca7dac86fb Mon Sep 17 00:00:00 2001 From: Fabi <38692350+fgerschwiler@users.noreply.github.com> Date: Mon, 10 Jan 2022 16:36:31 +0100 Subject: [PATCH] fix: select account styling (#2970) * fix: account selection * fix: styling of disabled accounts * fix: styling of disabled accounts * fix: don't show disabled accounts * fix: remove unused css * fix: remove unused css * fix: remove unused css * fix: don't show non selectable users * fix: test --- .../eventsourcing/eventstore/auth_request.go | 24 ++++++++++--------- .../eventstore/auth_request_test.go | 6 ----- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/internal/auth/repository/eventsourcing/eventstore/auth_request.go b/internal/auth/repository/eventsourcing/eventstore/auth_request.go index 395848fe1..f4fea523c 100644 --- a/internal/auth/repository/eventsourcing/eventstore/auth_request.go +++ b/internal/auth/repository/eventsourcing/eventstore/auth_request.go @@ -818,17 +818,19 @@ func (repo *AuthRequestRepo) usersForUserSelection(request *domain.AuthRequest) if err != nil { return nil, err } - users := make([]domain.UserSelection, len(userSessions)) - for i, session := range userSessions { - users[i] = domain.UserSelection{ - UserID: session.UserID, - DisplayName: session.DisplayName, - UserName: session.UserName, - LoginName: session.LoginName, - ResourceOwner: session.ResourceOwner, - AvatarKey: session.AvatarKey, - UserSessionState: model.UserSessionStateToDomain(session.State), - SelectionPossible: request.RequestedOrgID == "" || request.RequestedOrgID == session.ResourceOwner, + users := make([]domain.UserSelection, 0) + for _, session := range userSessions { + if request.RequestedOrgID == "" || request.RequestedOrgID == session.ResourceOwner { + users = append(users, domain.UserSelection{ + UserID: session.UserID, + DisplayName: session.DisplayName, + UserName: session.UserName, + LoginName: session.LoginName, + ResourceOwner: session.ResourceOwner, + AvatarKey: session.AvatarKey, + UserSessionState: model.UserSessionStateToDomain(session.State), + SelectionPossible: request.RequestedOrgID == "" || request.RequestedOrgID == session.ResourceOwner, + }) } } return users, nil diff --git a/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go b/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go index 82c66f6bb..52b1b2a90 100644 --- a/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go +++ b/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go @@ -401,12 +401,6 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) { SelectionPossible: true, ResourceOwner: "orgID1", }, - { - UserID: "id2", - LoginName: "loginname2", - SelectionPossible: false, - ResourceOwner: "orgID2", - }, }, }}, nil,