mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-14 03:27:34 +00:00
fixup! fixup! Merge branch 'main' into org_api
This commit is contained in:
@@ -12,13 +12,13 @@ import (
|
|||||||
"github.com/zitadel/zitadel/internal/command"
|
"github.com/zitadel/zitadel/internal/command"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta"
|
v2beta_org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta"
|
||||||
user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta"
|
user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Test_createOrganizationRequestToCommand(t *testing.T) {
|
func Test_createOrganizationRequestToCommand(t *testing.T) {
|
||||||
type args struct {
|
type args struct {
|
||||||
request *org.CreateOrganizationRequest
|
request *v2beta_org.CreateOrganizationRequest
|
||||||
}
|
}
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -29,9 +29,9 @@ func Test_createOrganizationRequestToCommand(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "nil user",
|
name: "nil user",
|
||||||
args: args{
|
args: args{
|
||||||
request: &org.CreateOrganizationRequest{
|
request: &v2beta_org.CreateOrganizationRequest{
|
||||||
Name: "name",
|
Name: "name",
|
||||||
Admins: []*org.CreateOrganizationRequest_Admin{
|
Admins: []*v2beta_org.CreateOrganizationRequest_Admin{
|
||||||
{},
|
{},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -41,11 +41,11 @@ func Test_createOrganizationRequestToCommand(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "user ID",
|
name: "user ID",
|
||||||
args: args{
|
args: args{
|
||||||
request: &org.CreateOrganizationRequest{
|
request: &v2beta_org.CreateOrganizationRequest{
|
||||||
Name: "name",
|
Name: "name",
|
||||||
Admins: []*org.CreateOrganizationRequest_Admin{
|
Admins: []*v2beta_org.CreateOrganizationRequest_Admin{
|
||||||
{
|
{
|
||||||
UserType: &org.CreateOrganizationRequest_Admin_UserId{
|
UserType: &v2beta_org.CreateOrganizationRequest_Admin_UserId{
|
||||||
UserId: "userID",
|
UserId: "userID",
|
||||||
},
|
},
|
||||||
Roles: nil,
|
Roles: nil,
|
||||||
@@ -66,11 +66,11 @@ func Test_createOrganizationRequestToCommand(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "human user",
|
name: "human user",
|
||||||
args: args{
|
args: args{
|
||||||
request: &org.CreateOrganizationRequest{
|
request: &v2beta_org.CreateOrganizationRequest{
|
||||||
Name: "name",
|
Name: "name",
|
||||||
Admins: []*org.CreateOrganizationRequest_Admin{
|
Admins: []*v2beta_org.CreateOrganizationRequest_Admin{
|
||||||
{
|
{
|
||||||
UserType: &org.CreateOrganizationRequest_Admin_Human{
|
UserType: &v2beta_org.CreateOrganizationRequest_Admin_Human{
|
||||||
Human: &user.AddHumanUserRequest{
|
Human: &user.AddHumanUserRequest{
|
||||||
Profile: &user.SetHumanProfile{
|
Profile: &user.SetHumanProfile{
|
||||||
GivenName: "firstname",
|
GivenName: "firstname",
|
||||||
@@ -123,7 +123,7 @@ func Test_createdOrganizationToPb(t *testing.T) {
|
|||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
args args
|
args args
|
||||||
want *org.CreateOrganizationResponse
|
want *v2beta_org.CreateOrganizationResponse
|
||||||
wantErr error
|
wantErr error
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
@@ -144,10 +144,10 @@ func Test_createdOrganizationToPb(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
want: &org.CreateOrganizationResponse{
|
want: &v2beta_org.CreateOrganizationResponse{
|
||||||
CreationDate: timestamppb.New(now),
|
CreationDate: timestamppb.New(now),
|
||||||
Id: "orgID",
|
Id: "orgID",
|
||||||
CreatedAdmins: []*org.CreatedAdmin{
|
CreatedAdmins: []*v2beta_org.CreatedAdmin{
|
||||||
{
|
{
|
||||||
UserId: "id",
|
UserId: "id",
|
||||||
EmailCode: gu.Ptr("emailCode"),
|
EmailCode: gu.Ptr("emailCode"),
|
||||||
|
Reference in New Issue
Block a user