mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-21 17:07:41 +00:00
fixup! Merge branch 'main' into syste-users-permissions
This commit is contained in:
@@ -18,7 +18,7 @@ BEGIN
|
||||
(perm)->>'member_type' AS member_type,
|
||||
(perm)->>'aggregate_id' AS aggregate_id,
|
||||
(perm)->>'object_id' AS object_id,
|
||||
permission-- AS permission
|
||||
permission
|
||||
FROM jsonb_array_elements(permissions_json) AS perm
|
||||
CROSS JOIN jsonb_array_elements_text(perm->'permissions') AS permission) AS res
|
||||
WHERE res. permission= permm;
|
||||
|
@@ -1248,7 +1248,6 @@ func TestServer_SystemUsers_ListUsers(t *testing.T) {
|
||||
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tt.ctx, 1*time.Minute)
|
||||
require.EventuallyWithT(t, func(ttt *assert.CollectT) {
|
||||
got, err := Client.ListUsers(tt.ctx, tt.req)
|
||||
fmt.Printf("@@ >>>>>>>>>>>>>>>>>>>>>>>>>>>> got = %+v\n", got)
|
||||
require.NoError(ttt, err)
|
||||
|
||||
if tt.checkNumberOfUsersReturned {
|
||||
|
Reference in New Issue
Block a user