This commit is contained in:
@@ -37,7 +37,7 @@ func CreateUserResolver(ctx context.Context, params model.CreateUserInput) (*mod
|
||||
return res, fmt.Errorf("unauthorized")
|
||||
}
|
||||
|
||||
log := log.New();
|
||||
log := log.New()
|
||||
|
||||
if params.PhoneNumber != nil {
|
||||
// verify if phone number is unique
|
||||
@@ -47,6 +47,15 @@ func CreateUserResolver(ctx context.Context, params model.CreateUserInput) (*mod
|
||||
}
|
||||
}
|
||||
|
||||
if params.EmailVerified != nil {
|
||||
if *params.EmailVerified {
|
||||
now := time.Now().Unix()
|
||||
params.EmailVerifiedAt = &now
|
||||
} else {
|
||||
params.EmailVerifiedAt = nil
|
||||
}
|
||||
}
|
||||
|
||||
if params.Email != nil {
|
||||
// check if valid email
|
||||
if !validators.IsValidEmail(*params.Email) {
|
||||
@@ -64,6 +73,7 @@ func CreateUserResolver(ctx context.Context, params model.CreateUserInput) (*mod
|
||||
|
||||
hostname := parsers.GetHost(gc)
|
||||
params.Email = &newEmail
|
||||
params.EmailVerifiedAt = nil
|
||||
// insert verification request
|
||||
_, nonceHash, err := utils.GenerateNonce()
|
||||
if err != nil {
|
||||
@@ -100,36 +110,38 @@ func CreateUserResolver(ctx context.Context, params model.CreateUserInput) (*mod
|
||||
|
||||
// json-typed model to store in database
|
||||
userdata := models.User{
|
||||
Email: *params.Email,
|
||||
Password: params.Password,
|
||||
GivenName: params.GivenName,
|
||||
FamilyName: params.FamilyName,
|
||||
MiddleName: params.MiddleName,
|
||||
Nickname: params.Nickname, // slug
|
||||
PhoneNumber: params.PhoneNumber,
|
||||
Picture: params.Picture,
|
||||
Email: *params.Email,
|
||||
EmailVerifiedAt: params.EmailVerifiedAt,
|
||||
CreatedAt: *params.CreatedAt,
|
||||
UpdatedAt: *params.UpdatedAt,
|
||||
Password: params.Password,
|
||||
GivenName: params.GivenName,
|
||||
FamilyName: params.FamilyName,
|
||||
MiddleName: params.MiddleName,
|
||||
Nickname: params.Nickname, // slug
|
||||
PhoneNumber: params.PhoneNumber,
|
||||
Picture: params.Picture,
|
||||
}
|
||||
|
||||
var user *models.User
|
||||
user, err = db.Provider.AddUser(ctx, &userdata)
|
||||
|
||||
if err != nil {
|
||||
log.Debug("Failed to create user: ", err)
|
||||
log.Debug("Failed to update user: ", err)
|
||||
return res, err
|
||||
}
|
||||
|
||||
// Convert the user data to the appropriate type for the GraphQL response
|
||||
createdAt := user.CreatedAt
|
||||
updatedAt := user.UpdatedAt
|
||||
res = &model.User{
|
||||
ID: user.ID,
|
||||
Email: user.Email,
|
||||
GivenName: user.GivenName,
|
||||
FamilyName: user.FamilyName,
|
||||
MiddleName: user.MiddleName,
|
||||
Nickname: user.Nickname,
|
||||
PhoneNumber: user.PhoneNumber,
|
||||
Picture: user.Picture,
|
||||
ID: user.ID,
|
||||
Email: user.Email,
|
||||
Picture: user.Picture,
|
||||
GivenName: user.GivenName,
|
||||
FamilyName: user.FamilyName,
|
||||
Roles: strings.Split(user.Roles, ","),
|
||||
CreatedAt: &createdAt,
|
||||
UpdatedAt: &updatedAt,
|
||||
}
|
||||
|
||||
|
||||
return res, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user