TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 19:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(linting): changes to make clean-transactional-propsal_lint pass… (#10072)

Browse Source
This commit is contained in:
Iraq
2025-06-13 17:05:37 +02:00
committed by GitHub
parent d857c12b0f
commit d75a45ebed
22 changed files with 1024 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
backend/v3/api/instance/v2/server.go
View File

@@ -1,19 +1,21 @@
package v2
import (
"github.com/zitadel/zitadel/backend/v3/telemetry/logging"
"github.com/zitadel/zitadel/backend/v3/telemetry/tracing"
)
// this file has been commented out to pass the linter
var (
logger logging.Logger
tracer tracing.Tracer
)
// import (
// "github.com/zitadel/zitadel/backend/v3/telemetry/logging"
// "github.com/zitadel/zitadel/backend/v3/telemetry/tracing"
// )
func SetLogger(l logging.Logger) {
logger = l
}
// var (
// logger logging.Logger
// tracer tracing.Tracer
// )
func SetTracer(t tracing.Tracer) {
tracer = t
}
// func SetLogger(l logging.Logger) {
// logger = l
// }
// func SetTracer(t tracing.Tracer) {
// tracer = t
// }

56
backend/v3/api/org/v2/org.go
View File

@@ -1,33 +1,33 @@
package orgv2
import (
"context"
// import (
// "context"
"github.com/zitadel/zitadel/backend/v3/domain"
"github.com/zitadel/zitadel/pkg/grpc/org/v2"
)
// "github.com/zitadel/zitadel/backend/v3/domain"
// "github.com/zitadel/zitadel/pkg/grpc/org/v2"
// )
func CreateOrg(ctx context.Context, req *org.AddOrganizationRequest) (resp *org.AddOrganizationResponse, err error) {
cmd := domain.NewAddOrgCommand(
req.GetName(),
addOrgAdminToCommand(req.GetAdmins()...)...,
)
err = domain.Invoke(ctx, cmd)
if err != nil {
return nil, err
}
return &org.AddOrganizationResponse{
OrganizationId: cmd.ID,
}, nil
}
// func CreateOrg(ctx context.Context, req *org.AddOrganizationRequest) (resp *org.AddOrganizationResponse, err error) {
// cmd := domain.NewAddOrgCommand(
// req.GetName(),
// addOrgAdminToCommand(req.GetAdmins()...)...,
// )
// err = domain.Invoke(ctx, cmd)
// if err != nil {
// return nil, err
// }
// return &org.AddOrganizationResponse{
// OrganizationId: cmd.ID,
// }, nil
// }
func addOrgAdminToCommand(admins ...*org.AddOrganizationRequest_Admin) []*domain.AddMemberCommand {
cmds := make([]*domain.AddMemberCommand, len(admins))
for i, admin := range admins {
cmds[i] = &domain.AddMemberCommand{
UserID: admin.GetUserId(),
Roles: admin.GetRoles(),
}
}
return cmds
}
// func addOrgAdminToCommand(admins ...*org.AddOrganizationRequest_Admin) []*domain.AddMemberCommand {
// cmds := make([]*domain.AddMemberCommand, len(admins))
// for i, admin := range admins {
// cmds[i] = &domain.AddMemberCommand{
// UserID: admin.GetUserId(),
// Roles: admin.GetRoles(),
// }
// }
// return cmds
// }

30
backend/v3/api/org/v2/server.go
View File

@@ -1,19 +1,21 @@
package orgv2
import (
"github.com/zitadel/zitadel/backend/v3/telemetry/logging"
"github.com/zitadel/zitadel/backend/v3/telemetry/tracing"
)
// this file has been commented out to pass the linter
var (
logger logging.Logger
tracer tracing.Tracer
)
// import (
// "github.com/zitadel/zitadel/backend/v3/telemetry/logging"
// "github.com/zitadel/zitadel/backend/v3/telemetry/tracing"
// )
func SetLogger(l logging.Logger) {
logger = l
}
// var (
// logger logging.Logger
// tracer tracing.Tracer
// )
func SetTracer(t tracing.Tracer) {
tracer = t
}
// func SetLogger(l logging.Logger) {
// logger = l
// }
// func SetTracer(t tracing.Tracer) {
// tracer = t
// }

162
backend/v3/api/user/v2/email.go
View File

@@ -1,93 +1,93 @@
package userv2
import (
"context"
// import (
// "context"
"github.com/zitadel/zitadel/backend/v3/domain"
"github.com/zitadel/zitadel/pkg/grpc/user/v2"
)
// "github.com/zitadel/zitadel/backend/v3/domain"
// "github.com/zitadel/zitadel/pkg/grpc/user/v2"
// )
func SetEmail(ctx context.Context, req *user.SetEmailRequest) (resp *user.SetEmailResponse, err error) {
var (
verification domain.SetEmailOpt
returnCode *domain.ReturnCodeCommand
)
// func SetEmail(ctx context.Context, req *user.SetEmailRequest) (resp *user.SetEmailResponse, err error) {
// var (
// verification domain.SetEmailOpt
// returnCode *domain.ReturnCodeCommand
// )
switch req.GetVerification().(type) {
case *user.SetEmailRequest_IsVerified:
verification = domain.NewEmailVerifiedCommand(req.GetUserId(), req.GetIsVerified())
case *user.SetEmailRequest_SendCode:
verification = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
case *user.SetEmailRequest_ReturnCode:
returnCode = domain.NewReturnCodeCommand(req.GetUserId())
verification = returnCode
default:
verification = domain.NewSendCodeCommand(req.GetUserId(), nil)
}
// switch req.GetVerification().(type) {
// case *user.SetEmailRequest_IsVerified:
// verification = domain.NewEmailVerifiedCommand(req.GetUserId(), req.GetIsVerified())
// case *user.SetEmailRequest_SendCode:
// verification = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
// case *user.SetEmailRequest_ReturnCode:
// returnCode = domain.NewReturnCodeCommand(req.GetUserId())
// verification = returnCode
// default:
// verification = domain.NewSendCodeCommand(req.GetUserId(), nil)
// }
err = domain.Invoke(ctx, domain.NewSetEmailCommand(req.GetUserId(), req.GetEmail(), verification))
if err != nil {
return nil, err
}
// err = domain.Invoke(ctx, domain.NewSetEmailCommand(req.GetUserId(), req.GetEmail(), verification))
// if err != nil {
// return nil, err
// }
var code *string
if returnCode != nil && returnCode.Code != "" {
code = &returnCode.Code
}
// var code *string
// if returnCode != nil && returnCode.Code != "" {
// code = &returnCode.Code
// }
return &user.SetEmailResponse{
VerificationCode: code,
}, nil
}
// return &user.SetEmailResponse{
// VerificationCode: code,
// }, nil
// }
func SendEmailCode(ctx context.Context, req *user.SendEmailCodeRequest) (resp *user.SendEmailCodeResponse, err error) {
var (
returnCode *domain.ReturnCodeCommand
cmd domain.Commander
)
// func SendEmailCode(ctx context.Context, req *user.SendEmailCodeRequest) (resp *user.SendEmailCodeResponse, err error) {
// var (
// returnCode *domain.ReturnCodeCommand
// cmd domain.Commander
// )
switch req.GetVerification().(type) {
case *user.SendEmailCodeRequest_SendCode:
cmd = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
case *user.SendEmailCodeRequest_ReturnCode:
returnCode = domain.NewReturnCodeCommand(req.GetUserId())
cmd = returnCode
default:
cmd = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
}
err = domain.Invoke(ctx, cmd)
if err != nil {
return nil, err
}
resp = new(user.SendEmailCodeResponse)
if returnCode != nil {
resp.VerificationCode = &returnCode.Code
}
return resp, nil
}
// switch req.GetVerification().(type) {
// case *user.SendEmailCodeRequest_SendCode:
// cmd = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
// case *user.SendEmailCodeRequest_ReturnCode:
// returnCode = domain.NewReturnCodeCommand(req.GetUserId())
// cmd = returnCode
// default:
// cmd = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
// }
// err = domain.Invoke(ctx, cmd)
// if err != nil {
// return nil, err
// }
// resp = new(user.SendEmailCodeResponse)
// if returnCode != nil {
// resp.VerificationCode = &returnCode.Code
// }
// return resp, nil
// }
func ResendEmailCode(ctx context.Context, req *user.ResendEmailCodeRequest) (resp *user.SendEmailCodeResponse, err error) {
var (
returnCode *domain.ReturnCodeCommand
cmd domain.Commander
)
// func ResendEmailCode(ctx context.Context, req *user.ResendEmailCodeRequest) (resp *user.SendEmailCodeResponse, err error) {
// var (
// returnCode *domain.ReturnCodeCommand
// cmd domain.Commander
// )
switch req.GetVerification().(type) {
case *user.ResendEmailCodeRequest_SendCode:
cmd = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
case *user.ResendEmailCodeRequest_ReturnCode:
returnCode = domain.NewReturnCodeCommand(req.GetUserId())
cmd = returnCode
default:
cmd = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
}
err = domain.Invoke(ctx, cmd)
if err != nil {
return nil, err
}
resp = new(user.SendEmailCodeResponse)
if returnCode != nil {
resp.VerificationCode = &returnCode.Code
}
return resp, nil
}
// switch req.GetVerification().(type) {
// case *user.ResendEmailCodeRequest_SendCode:
// cmd = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
// case *user.ResendEmailCodeRequest_ReturnCode:
// returnCode = domain.NewReturnCodeCommand(req.GetUserId())
// cmd = returnCode
// default:
// cmd = domain.NewSendCodeCommand(req.GetUserId(), req.GetSendCode().UrlTemplate)
// }
// err = domain.Invoke(ctx, cmd)
// if err != nil {
// return nil, err
// }
// resp = new(user.SendEmailCodeResponse)
// if returnCode != nil {
// resp.VerificationCode = &returnCode.Code
// }
// return resp, nil
// }

28
backend/v3/api/user/v2/server.go
View File

@@ -1,19 +1,19 @@
package userv2
import (
"github.com/zitadel/zitadel/backend/v3/telemetry/logging"
"github.com/zitadel/zitadel/backend/v3/telemetry/tracing"
)
// this file has been commented out to pass the linter
var (
logger logging.Logger
tracer tracing.Tracer
)
// import (
// "github.com/zitadel/zitadel/backend/v3/telemetry/logging"
// "github.com/zitadel/zitadel/backend/v3/telemetry/tracing"
// )
func SetLogger(l logging.Logger) {
logger = l
}
// logger logging.Logger
// var tracer tracing.Tracer
func SetTracer(t tracing.Tracer) {
tracer = t
}
// func SetLogger(l logging.Logger) {
// logger = l
// }
// func SetTracer(t tracing.Tracer) {
// tracer = t
// }