TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-21 06:39:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into org_api

Browse Source
This commit is contained in:
Iraq Jaber
2025-05-21 14:36:09 +02:00
parent edf2d5325d 60ce32ca4f
commit 01b263d7cb
27 changed files with 1130 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
internal/api/grpc/user/v2/integration_test/user_test.go
View File

@@ -1756,9 +1756,8 @@ func TestServer_DeleteUser(t *testing.T) {
projectResp, err := Instance.CreateProject(CTX)
require.NoError(t, err)
type args struct {
ctx context.Context
req *user.DeleteUserRequest
prepare func(request *user.DeleteUserRequest) error
prepare func(*testing.T, *user.DeleteUserRequest) context.Context
}
tests := []struct {
name string
@@ -1769,23 +1768,21 @@ func TestServer_DeleteUser(t *testing.T) {
{
name: "remove, not existing",
args: args{
CTX,
&user.DeleteUserRequest{
UserId: "notexisting",
},
func(request *user.DeleteUserRequest) error { return nil },
func(*testing.T, *user.DeleteUserRequest) context.Context { return CTX },
},
wantErr: true,
},
{
name: "remove human, ok",
args: args{
ctx: CTX,
req: &user.DeleteUserRequest{},
prepare: func(request *user.DeleteUserRequest) error {
prepare: func(_ *testing.T, request *user.DeleteUserRequest) context.Context {
resp := Instance.CreateHumanUser(CTX)
request.UserId = resp.GetUserId()
return err
return CTX
},
},
want: &user.DeleteUserResponse{
@@ -1798,12 +1795,11 @@ func TestServer_DeleteUser(t *testing.T) {
{
name: "remove machine, ok",
args: args{
ctx: CTX,
req: &user.DeleteUserRequest{},
prepare: func(request *user.DeleteUserRequest) error {
prepare: func(_ *testing.T, request *user.DeleteUserRequest) context.Context {
resp := Instance.CreateMachineUser(CTX)
request.UserId = resp.GetUserId()
return err
return CTX
},
},
want: &user.DeleteUserResponse{
@@ -1816,15 +1812,37 @@ func TestServer_DeleteUser(t *testing.T) {
{
name: "remove dependencies, ok",
args: args{
ctx: CTX,
req: &user.DeleteUserRequest{},
prepare: func(request *user.DeleteUserRequest) error {
prepare: func(_ *testing.T, request *user.DeleteUserRequest) context.Context {
resp := Instance.CreateHumanUser(CTX)
request.UserId = resp.GetUserId()
Instance.CreateProjectUserGrant(t, CTX, projectResp.GetId(), request.UserId)
Instance.CreateProjectMembership(t, CTX, projectResp.GetId(), request.UserId)
Instance.CreateOrgMembership(t, CTX, request.UserId)
return err
return CTX
},
},
want: &user.DeleteUserResponse{
Details: &object.Details{
ChangeDate: timestamppb.Now(),
ResourceOwner: Instance.DefaultOrg.Id,
},
},
},
{
name: "remove self, ok",
args: args{
req: &user.DeleteUserRequest{},
prepare: func(t *testing.T, request *user.DeleteUserRequest) context.Context {
removeUser, err := Instance.Client.Mgmt.AddMachineUser(CTX, &mgmt.AddMachineUserRequest{
UserName: gofakeit.Username(),
Name: gofakeit.Name(),
})
request.UserId = removeUser.UserId
require.NoError(t, err)
tokenResp, err := Instance.Client.Mgmt.AddPersonalAccessToken(CTX, &mgmt.AddPersonalAccessTokenRequest{UserId: removeUser.UserId})
require.NoError(t, err)
return integration.WithAuthorizationToken(UserCTX, tokenResp.Token)
},
},
want: &user.DeleteUserResponse{
@@ -1837,10 +1855,8 @@ func TestServer_DeleteUser(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := tt.args.prepare(tt.args.req)
require.NoError(t, err)
got, err := Client.DeleteUser(tt.args.ctx, tt.args.req)
ctx := tt.args.prepare(t, tt.args.req)
got, err := Client.DeleteUser(ctx, tt.args.req)
if tt.wantErr {
require.Error(t, err)
return