TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-04-16 05:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: select account styling (#2970)

Browse Source 
* 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
This commit is contained in:
Fabi 2022-01-10 16:36:31 +01:00 committed by GitHub
parent 478beded9f
commit d03cab22c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/auth/repository/eventsourcing/eventstore/auth_request.go
View File

@ -818,17 +818,19 @@ func (repo *AuthRequestRepo) usersForUserSelection(request *domain.AuthRequest)
if err != nil { if err != nil {
return nil, err return nil, err
} }
users := make([]domain.UserSelection, len(userSessions)) users := make([]domain.UserSelection, 0)
for i, session := range userSessions { for _, session := range userSessions {
users[i] = domain.UserSelection{ if request.RequestedOrgID == "" || request.RequestedOrgID == session.ResourceOwner {
UserID: session.UserID, users = append(users, domain.UserSelection{
DisplayName: session.DisplayName, UserID: session.UserID,
UserName: session.UserName, DisplayName: session.DisplayName,
LoginName: session.LoginName, UserName: session.UserName,
ResourceOwner: session.ResourceOwner, LoginName: session.LoginName,
AvatarKey: session.AvatarKey, ResourceOwner: session.ResourceOwner,
UserSessionState: model.UserSessionStateToDomain(session.State), AvatarKey: session.AvatarKey,
SelectionPossible: request.RequestedOrgID == "" || request.RequestedOrgID == session.ResourceOwner, UserSessionState: model.UserSessionStateToDomain(session.State),
SelectionPossible: request.RequestedOrgID == "" || request.RequestedOrgID == session.ResourceOwner,
})
} }
} }
return users, nil return users, nil

6
internal/auth/repository/eventsourcing/eventstore/auth_request_test.go
View File

@ -401,12 +401,6 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
SelectionPossible: true, SelectionPossible: true,
ResourceOwner: "orgID1", ResourceOwner: "orgID1",
}, },
{
UserID: "id2",
LoginName: "loginname2",
SelectionPossible: false,
ResourceOwner: "orgID2",
},
}, },
}}, }},
nil, nil,