TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-22 00:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Merge branch 'main' into syste-users-permissions

Browse Source
This commit is contained in:
Iraq Jaber
2025-03-20 13:49:52 +04:00
parent 79c2fc880f
commit 9bd76a07d0
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/setup/52/01-get-permissions-from-JSON.sql
View File

@@ -18,7 +18,7 @@ BEGIN
(perm)->>'member_type' AS member_type, (perm)->>'member_type' AS member_type,
(perm)->>'aggregate_id' AS aggregate_id, (perm)->>'aggregate_id' AS aggregate_id,
(perm)->>'object_id' AS object_id, (perm)->>'object_id' AS object_id,
permission-- AS permission permission
FROM jsonb_array_elements(permissions_json) AS perm FROM jsonb_array_elements(permissions_json) AS perm
CROSS JOIN jsonb_array_elements_text(perm->'permissions') AS permission) AS res CROSS JOIN jsonb_array_elements_text(perm->'permissions') AS permission) AS res
WHERE res. permission= permm; WHERE res. permission= permm;

1
internal/api/grpc/user/v2/integration_test/query_test.go
View File

@@ -1248,7 +1248,6 @@ func TestServer_SystemUsers_ListUsers(t *testing.T) {
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tt.ctx, 1*time.Minute) retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tt.ctx, 1*time.Minute)
require.EventuallyWithT(t, func(ttt *assert.CollectT) { require.EventuallyWithT(t, func(ttt *assert.CollectT) {
got, err := Client.ListUsers(tt.ctx, tt.req) got, err := Client.ListUsers(tt.ctx, tt.req)
fmt.Printf("@@ >>>>>>>>>>>>>>>>>>>>>>>>>>>> got = %+v\n", got)
require.NoError(ttt, err) require.NoError(ttt, err)
if tt.checkNumberOfUsersReturned { if tt.checkNumberOfUsersReturned {