Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/api/api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions backend/api/handler/coze/loop/apis/wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ func InitFoundationHandler(
idgen idgen.IIDGenerator,
db db.Provider,
objectStorage fileserver.BatchObjectStorage,
configFactory conf.IConfigLoaderFactory,
) (*FoundationHandler, error) {
wire.Build(
foundationSet,
Expand Down
5 changes: 2 additions & 3 deletions backend/api/handler/coze/loop/apis/wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions backend/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAx
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA=
github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
Expand Down
75 changes: 63 additions & 12 deletions backend/modules/foundation/application/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import (
"context"
"net/mail"
"strconv"
"strings"

"github.com/bytedance/gg/gptr"
"github.com/bytedance/gg/gslice"

"github.com/coze-dev/coze-loop/backend/infra/middleware/session"
Expand All @@ -17,31 +19,64 @@ import (
"github.com/coze-dev/coze-loop/backend/modules/foundation/domain/user/entity"
"github.com/coze-dev/coze-loop/backend/modules/foundation/domain/user/service"
"github.com/coze-dev/coze-loop/backend/modules/foundation/pkg/errno"
"github.com/coze-dev/coze-loop/backend/pkg/conf"
"github.com/coze-dev/coze-loop/backend/pkg/errorx"
"github.com/coze-dev/coze-loop/backend/pkg/lang/conv"
"github.com/coze-dev/coze-loop/backend/pkg/lang/ptr"
"github.com/coze-dev/coze-loop/backend/pkg/lang/slices"
"github.com/coze-dev/coze-loop/backend/pkg/logs"
)

type UserApplicationImpl struct {
userService service.IUserService
}

func NewUserApplication(
userService service.IUserService,
) user.UserService {
return &UserApplicationImpl{
userService: userService,
configFactory conf.IConfigLoaderFactory,
) (user.UserService, error) {
ua := &UserApplicationImpl{
userService: userService,
registerController: userRegisterController{},
}
if loader, err := configFactory.NewConfigLoader("foundation.yaml"); err == nil {
ua.registerController.configLoader = loader
}
return ua, nil
}

func (u *UserApplicationImpl) Register(ctx context.Context, request *user.UserRegisterRequest) (r *user.UserRegisterResponse, err error) {
if request.Email == nil || request.Password == nil {
return nil, errorx.NewByCode(errno.CommonInvalidParamCode)
type UserApplicationImpl struct {
userService service.IUserService
registerController userRegisterController
}

type userRegisterController struct {
// configLoader weak dependency, might be nil
configLoader conf.IConfigLoader
}

type userRegisterControlConfig struct {
Block bool `mapstructure:"block"`
AllowedEmails string `mapstructure:"allowed_emails"`
}

func (u *userRegisterController) allowRegister(ctx context.Context, email string) bool {
if u.configLoader == nil {
return true
}

const keyUserRegisterControl = "user_register_control"
var config userRegisterControlConfig
if err := u.configLoader.UnmarshalKey(ctx, keyUserRegisterControl, &config); err != nil {
logs.CtxWarn(ctx, "load user_register_control config fail, err: %v", err)
return false
}

if !config.Block {
return true
}
return slices.Contains(strings.Split(config.AllowedEmails, ";"), email)
}

if _, err = mail.ParseAddress(*request.Email); err != nil {
return nil, errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("email is invalid"))
func (u *UserApplicationImpl) Register(ctx context.Context, request *user.UserRegisterRequest) (r *user.UserRegisterResponse, err error) {
if err := u.validateRegisterReq(ctx, request); err != nil {
return nil, err
}

userDO, err := u.userService.Create(ctx, &service.CreateUserRequest{
Expand All @@ -66,6 +101,22 @@ func (u *UserApplicationImpl) Register(ctx context.Context, request *user.UserRe
return r, nil
}

func (u *UserApplicationImpl) validateRegisterReq(ctx context.Context, request *user.UserRegisterRequest) error {
if request.Email == nil || request.Password == nil {
return errorx.NewByCode(errno.CommonInvalidParamCode)
}

if _, err := mail.ParseAddress(gptr.Indirect(request.Email)); err != nil {
return errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("email is invalid"))
}

if !u.registerController.allowRegister(ctx, request.GetEmail()) {
return errorx.NewByCode(errno.UserRegistrationControlBlockCode)
}

return nil
}

func (u *UserApplicationImpl) ResetPassword(ctx context.Context, request *user.ResetPasswordRequest) (r *user.ResetPasswordResponse, err error) {
r = user.NewResetPasswordResponse()

Expand Down
Loading
Loading