Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

feat(site-users): add site info config about users

LinkinStarsec4c7ab6a70b
diff --git a/internal/controller/siteinfo_controller.go b/internal/controller/siteinfo_controller.go
index b2a95bdf..425280b2 100644
--- a/internal/controller/siteinfo_controller.go
+++ b/internal/controller/siteinfo_controller.go
@@ -64,6 +64,10 @@ func (sc *SiteinfoController) GetSiteInfo(ctx *gin.Context) {
if err != nil {
log.Error(err)
}
+ resp.SiteUsers, err = sc.siteInfoService.GetSiteUsers(ctx)
+ if err != nil {
+ log.Error(err)
+ }
handler.HandleResponse(ctx, nil, resp)
}
diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.go
index 496dbb34..70e52921 100644
--- a/internal/schema/siteinfo_schema.go
+++ b/internal/schema/siteinfo_schema.go
@@ -94,7 +94,13 @@ type GetSiteLegalInfoResp struct {
// SiteUsersReq site users config request
type SiteUsersReq struct {
- DefaultAvatar string `validate:"required,oneof=system gravatar" form:"default_avatar" json:"default_avatar"`
+ DefaultAvatar string `validate:"required,oneof=system gravatar" form:"default_avatar" json:"default_avatar"`
+ AllowUpdateDisplayName bool `form:"allow_update_display_name" json:"allow_update_display_name"`
+ AllowUpdateUsername bool `form:"allow_update_username" json:"allow_update_username"`
+ AllowUpdateAvatar bool `form:"allow_update_avatar" json:"allow_update_avatar"`
+ AllowUpdateBio bool `form:"allow_update_bio" json:"allow_update_bio"`
+ AllowUpdateWebsite bool `form:"allow_update_website" json:"allow_update_website"`
+ AllowUpdateLocation bool `form:"allow_update_location" json:"allow_update_location"`
}
// SiteLoginReq site login request
@@ -179,6 +185,7 @@ type SiteInfoResp struct {
Theme *SiteThemeResp `json:"theme"`
CustomCssHtml *SiteCustomCssHTMLResp `json:"custom_css_html"`
SiteSeo *SiteSeoReq `json:"site_seo"`
+ SiteUsers *SiteUsersResp `json:"site_users"`
Version string `json:"version"`
}
type TemplateSiteInfoResp struct {
diff --git a/internal/service/user_service.go b/internal/service/user_service.go
index 0af62656..52916f69 100644
--- a/internal/service/user_service.go
+++ b/internal/service/user_service.go
@@ -248,6 +248,18 @@ func (us *UserService) UserModifyPassword(ctx context.Context, request *schema.U
// UpdateInfo update user info
func (us *UserService) UpdateInfo(ctx context.Context, req *schema.UpdateInfoRequest) (
errFields []*validator.FormErrorField, err error) {
+ siteUsers, err := us.siteInfoService.GetSiteUsers(ctx)
+ if err != nil {
+ return nil, err
+ }
+ oldUserInfo, exist, err := us.userRepo.GetByUserID(ctx, req.UserID)
+ if err != nil {
+ return nil, err
+ }
+ if !exist {
+ return nil, errors.BadRequest(reason.UserNotFound)
+ }
+
if len(req.Username) > 0 {
userInfo, exist, err := us.userRepo.GetByUsername(ctx, req.Username)
if err != nil {
@@ -268,23 +280,48 @@ func (us *UserService) UpdateInfo(ctx context.Context, req *schema.UpdateInfoReq
return errFields, errors.BadRequest(reason.UsernameInvalid)
}
}
- avatar, err := json.Marshal(req.Avatar)
- if err != nil {
- return nil, errors.BadRequest(reason.UserSetAvatar).WithError(err).WithStack()
- }
- userInfo := entity.User{}
- userInfo.ID = req.UserID
- userInfo.Avatar = string(avatar)
- userInfo.DisplayName = req.DisplayName
- userInfo.Bio = req.Bio
- userInfo.BioHTML = req.BioHTML
- userInfo.Location = req.Location
- userInfo.Website = req.Website
- userInfo.Username = req.Username
- err = us.userRepo.UpdateInfo(ctx, &userInfo)
+
+ cond := us.formatUserInfoForUpdateInfo(oldUserInfo, req, siteUsers)
+ err = us.userRepo.UpdateInfo(ctx, cond)
return nil, err
}
+func (us *UserService) formatUserInfoForUpdateInfo(
+ oldUserInfo *entity.User, req *schema.UpdateInfoRequest, siteUsersConf *schema.SiteUsersResp) *entity.User {
+ avatar, _ := json.Marshal(req.Avatar)
+
+ userInfo := &entity.User{}
+ userInfo.DisplayName = oldUserInfo.DisplayName
+ userInfo.Username = oldUserInfo.Username
+ userInfo.Avatar = oldUserInfo.Avatar
+ userInfo.Bio = oldUserInfo.Bio
+ userInfo.BioHTML = oldUserInfo.BioHTML
+ userInfo.Website = oldUserInfo.Website
+ userInfo.Location = oldUserInfo.Location
+ userInfo.ID = req.UserID
+
+ if siteUsersConf.AllowUpdateDisplayName {
+ userInfo.DisplayName = req.DisplayName
+ }
+ if siteUsersConf.AllowUpdateUsername {
+ userInfo.Username = req.Username
+ }
+ if siteUsersConf.AllowUpdateAvatar {
+ userInfo.Avatar = string(avatar)
+ }
+ if siteUsersConf.AllowUpdateBio {
+ userInfo.Bio = req.Bio
+ userInfo.BioHTML = req.BioHTML
+ }
+ if siteUsersConf.AllowUpdateWebsite {
+ userInfo.Website = req.Website
+ }
+ if siteUsersConf.AllowUpdateLocation {
+ userInfo.Location = req.Location
+ }
+ return userInfo
+}
+
func (us *UserService) UserEmailHas(ctx context.Context, email string) (bool, error) {
_, has, err := us.userRepo.GetByEmail(ctx, email)
if err != nil {