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(login): add private mode and allowed user sign up config

LinkinStar1fe69bcb65b4
diff --cc cmd/answer/wire_gen.go
index 4b3e11c6,56b71382..64dbd4be
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@@ -121,9 -120,10 +121,9 @@@ func initApplication(debug bool, server
captchaRepo := captcha.NewCaptchaRepo(dataData)
captchaService := action.NewCaptchaService(captchaRepo)
uploaderService := uploader.NewUploaderService(serviceConf, siteInfoCommonService)
-- userController := controller.NewUserController(authService, userService, captchaService, emailService, uploaderService)
++ userController := controller.NewUserController(authService, userService, captchaService, emailService, uploaderService, siteInfoCommonService)
commentRepo := comment.NewCommentRepo(dataData, uniqueIDRepo)
commentCommonRepo := comment.NewCommentCommonRepo(dataData, uniqueIDRepo)
- userCommon := usercommon.NewUserCommon(userRepo)
answerRepo := answer.NewAnswerRepo(dataData, uniqueIDRepo, userRankRepo, activityRepo)
questionRepo := question.NewQuestionRepo(dataData, uniqueIDRepo)
tagCommonRepo := tag_common.NewTagCommonRepo(dataData, uniqueIDRepo)
@@@ -186,7 -186,7 +186,7 @@@
reasonService := reason2.NewReasonService(reasonRepo)
reasonController := controller.NewReasonController(reasonService)
themeController := controller_backyard.NewThemeController()
-- siteInfoService := siteinfo.NewSiteInfoService(siteInfoRepo, emailService, tagCommonService)
++ siteInfoService := siteinfo.NewSiteInfoService(siteInfoRepo, siteInfoCommonService, emailService, tagCommonService)
siteInfoController := controller_backyard.NewSiteInfoController(siteInfoService)
siteinfoController := controller.NewSiteinfoController(siteInfoCommonService)
notificationRepo := notification.NewNotificationRepo(dataData)
diff --cc i18n/en_US.yaml
index e8212ac4,9ab2f526..e3d475db
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@@ -143,6 -143,6 +143,8 @@@ backend
other: "Can’t create the config.yaml file."
cannot_update_your_role:
other: "You cannot modify your role."
++ not_allowed_registration:
++ other: "Currently the site is not open for registration"
report:
spam:
name:
diff --cc i18n/zh_CN.yaml
index 4b9bf2b0,55b70b03..0e21b5b3
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@@ -115,6 -115,6 +115,8 @@@ backend
other: "头像设置错误"
cannot_update_your_role:
other: "你无法修改自己的角色"
++ not_allowed_registration:
++ other: "目前该网站尚未开放注册"
revision:
review_underway:
other: "目前无法编辑,有一个版本在审阅队列中。"
diff --cc internal/base/constant/constant.go
index f7f2a9cc,f7f2a9cc..72c4077a
--- a/internal/base/constant/constant.go
+++ b/internal/base/constant/constant.go
@@@ -58,4 -58,4 +58,5 @@@ const
SiteTypeWrite = "write"
SiteTypeLegal = "legal"
SiteTypeSeo = "seo"
++ SiteTypeLogin = "login"
)
diff --cc internal/base/reason/reason.go
index c3a5333c,c3a5333c..5f30a4c6
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@@ -58,4 -58,4 +58,5 @@@ const
RevisionReviewUnderway = "error.revision.review_underway"
RevisionNoPermission = "error.revision.no_permission"
UserCannotUpdateYourRole = "error.user.cannot_update_your_role"
++ NotAllowedRegistration = "error.user.not_allowed_registration"
)
diff --cc internal/controller/siteinfo_controller.go
index 6337b133,6337b133..2ec71992
--- a/internal/controller/siteinfo_controller.go
+++ b/internal/controller/siteinfo_controller.go
@@@ -44,6 -44,6 +44,11 @@@ func (sc *SiteinfoController) GetSiteIn
if err != nil {
log.Error(err)
}
++
++ resp.Login, err = sc.siteInfoService.GetSiteLogin(ctx)
++ if err != nil {
++ log.Error(err)
++ }
handler.HandleResponse(ctx, nil, resp)
}
diff --cc internal/controller/user_controller.go
index 099adc42,099adc42..553f8914
--- a/internal/controller/user_controller.go
+++ b/internal/controller/user_controller.go
@@@ -11,6 -11,6 +11,7 @@@ import
"github.com/answerdev/answer/internal/service/action"
"github.com/answerdev/answer/internal/service/auth"
"github.com/answerdev/answer/internal/service/export"
++ "github.com/answerdev/answer/internal/service/siteinfo_common"
"github.com/answerdev/answer/internal/service/uploader"
"github.com/gin-gonic/gin"
"github.com/segmentfault/pacman/errors"
@@@ -18,11 -18,11 +19,12 @@@
// UserController user controller
type UserController struct {
-- userService *service.UserService
-- authService *auth.AuthService
-- actionService *action.CaptchaService
-- uploaderService *uploader.UploaderService
-- emailService *export.EmailService
++ userService *service.UserService
++ authService *auth.AuthService
++ actionService *action.CaptchaService
++ uploaderService *uploader.UploaderService
++ emailService *export.EmailService
++ siteInfoCommonService *siteinfo_common.SiteInfoCommonService
}
// NewUserController new controller
@@@ -32,13 -32,13 +34,15 @@@ func NewUserController
actionService *action.CaptchaService,
emailService *export.EmailService,
uploaderService *uploader.UploaderService,
++ siteInfoCommonService *siteinfo_common.SiteInfoCommonService,
) *UserController {
return &UserController{
-- authService: authService,
-- userService: userService,
-- actionService: actionService,
-- uploaderService: uploaderService,
-- emailService: emailService,
++ authService: authService,
++ userService: userService,
++ actionService: actionService,
++ uploaderService: uploaderService,
++ emailService: emailService,
++ siteInfoCommonService: siteInfoCommonService,
}
}
@@@ -203,6 -203,6 +207,17 @@@ func (uc *UserController) UserLogout(ct
// @Success 200 {object} handler.RespBody{data=schema.GetUserResp}
// @Router /answer/api/v1/user/register/email [post]
func (uc *UserController) UserRegisterByEmail(ctx *gin.Context) {
++ // check whether site allow register or not
++ siteInfo, err := uc.siteInfoCommonService.GetSiteLogin(ctx)
++ if err != nil {
++ handler.HandleResponse(ctx, err, nil)
++ return
++ }
++ if !siteInfo.AllowNewRegistrations {
++ handler.HandleResponse(ctx, errors.BadRequest(reason.NotAllowedRegistration), nil)
++ return
++ }
++
req := &schema.UserRegisterReq{}
if handler.BindAndCheck(ctx, req) {
return
diff --cc internal/controller_backyard/siteinfo_controller.go
index a8323504,a8323504..d6378741
--- a/internal/controller_backyard/siteinfo_controller.go
+++ b/internal/controller_backyard/siteinfo_controller.go
@@@ -100,6 -100,6 +100,19 @@@ func (sc *SiteInfoController) GetSeo(ct
handler.HandleResponse(ctx, err, resp)
}
++// GetSiteLogin get site info login config
++// @Summary get site info login config
++// @Description get site info login config
++// @Security ApiKeyAuth
++// @Tags admin
++// @Produce json
++// @Success 200 {object} handler.RespBody{data=schema.SiteLoginResp}
++// @Router /answer/admin/api/siteinfo/login [get]
++func (sc *SiteInfoController) GetSiteLogin(ctx *gin.Context) {
++ resp, err := sc.siteInfoService.GetSiteLogin(ctx)
++ handler.HandleResponse(ctx, err, resp)
++}
++
// GetRobots get site robots information
// @Summary get site robots information
// @Description get site robots information
@@@ -226,6 -226,6 +239,24 @@@ func (sc *SiteInfoController) UpdateSit
handler.HandleResponse(ctx, err, nil)
}
++// UpdateSiteLogin update site login
++// @Summary update site login
++// @Description update site login
++// @Security ApiKeyAuth
++// @Tags admin
++// @Produce json
++// @Param data body schema.SiteLegalReq true "login info"
++// @Success 200 {object} handler.RespBody{}
++// @Router /answer/admin/api/siteinfo/login [put]
++func (sc *SiteInfoController) UpdateSiteLogin(ctx *gin.Context) {
++ req := &schema.SiteLoginReq{}
++ if handler.BindAndCheck(ctx, req) {
++ return
++ }
++ err := sc.siteInfoService.SaveSiteLogin(ctx, req)
++ handler.HandleResponse(ctx, err, nil)
++}
++
// GetSMTPConfig get smtp config
// @Summary GetSMTPConfig get smtp config
// @Description GetSMTPConfig get smtp config
diff --cc internal/router/answer_api_router.go
index 54580eee,e81e706f..f98a6439
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@@ -253,11 -251,11 +253,13 @@@ func (a *AnswerAPIRouter) RegisterAnswe
r.GET("/siteinfo/write", a.siteInfoController.GetSiteWrite)
r.GET("/siteinfo/legal", a.siteInfoController.GetSiteLegal)
r.GET("/siteinfo/seo", a.siteInfoController.GetSeo)
++ r.GET("/siteinfo/login", a.siteInfoController.GetSiteLogin)
r.PUT("/siteinfo/general", a.siteInfoController.UpdateGeneral)
r.PUT("/siteinfo/interface", a.siteInfoController.UpdateInterface)
r.PUT("/siteinfo/branding", a.siteInfoController.UpdateBranding)
r.PUT("/siteinfo/write", a.siteInfoController.UpdateSiteWrite)
r.PUT("/siteinfo/legal", a.siteInfoController.UpdateSiteLegal)
++ r.PUT("/siteinfo/login", a.siteInfoController.UpdateSiteLogin)
r.PUT("/siteinfo/seo", a.siteInfoController.UpdateSeo)
r.GET("/setting/smtp", a.siteInfoController.GetSMTPConfig)
r.PUT("/setting/smtp", a.siteInfoController.UpdateSMTPConfig)
diff --cc internal/schema/siteinfo_schema.go
index 97ad7744,97ad7744..18ea7524
--- a/internal/schema/siteinfo_schema.go
+++ b/internal/schema/siteinfo_schema.go
@@@ -82,6 -82,6 +82,12 @@@ type GetSiteLegalInfoResp struct
PrivacyPolicyParsedText string `json:"privacy_policy_parsed_text,omitempty"`
}
++// SiteLoginReq site login request
++type SiteLoginReq struct {
++ AllowNewRegistrations bool `json:"allow_new_registrations"`
++ LoginRequired bool `json:"login_required"`
++}
++
// SiteGeneralResp site general response
type SiteGeneralResp SiteGeneralReq
@@@ -91,6 -91,6 +97,9 @@@ type SiteInterfaceResp SiteInterfaceRe
// SiteBrandingResp site branding response
type SiteBrandingResp SiteBrandingReq
++// SiteLoginResp site login response
++type SiteLoginResp SiteLoginReq
++
// SiteWriteResp site write response
type SiteWriteResp SiteWriteReq
@@@ -104,6 -104,6 +113,7 @@@ type SiteInfoResp struct
General *SiteGeneralResp `json:"general"`
Interface *SiteInterfaceResp `json:"interface"`
Branding *SiteBrandingResp `json:"branding"`
++ Login *SiteLoginResp `json:"login"`
}
type TemplateSiteInfoResp struct {
General *SiteGeneralResp `json:"general"`
diff --cc internal/service/siteinfo/siteinfo_service.go
index e9460a4d,e9460a4d..d0e088bc
--- a/internal/service/siteinfo/siteinfo_service.go
+++ b/internal/service/siteinfo/siteinfo_service.go
@@@ -18,65 -18,65 +18,38 @@@ import
)
type SiteInfoService struct {
-- siteInfoRepo siteinfo_common.SiteInfoRepo
-- emailService *export.EmailService
-- tagCommonService *tagcommon.TagCommonService
++ siteInfoRepo siteinfo_common.SiteInfoRepo
++ siteInfoCommonService *siteinfo_common.SiteInfoCommonService
++ emailService *export.EmailService
++ tagCommonService *tagcommon.TagCommonService
}
func NewSiteInfoService(
siteInfoRepo siteinfo_common.SiteInfoRepo,
++ siteInfoCommonService *siteinfo_common.SiteInfoCommonService,
emailService *export.EmailService,
tagCommonService *tagcommon.TagCommonService) *SiteInfoService {
return &SiteInfoService{
-- siteInfoRepo: siteInfoRepo,
-- emailService: emailService,
-- tagCommonService: tagCommonService,
++ siteInfoRepo: siteInfoRepo,
++ siteInfoCommonService: siteInfoCommonService,
++ emailService: emailService,
++ tagCommonService: tagCommonService,
}
}
// GetSiteGeneral get site info general
func (s *SiteInfoService) GetSiteGeneral(ctx context.Context) (resp *schema.SiteGeneralResp, err error) {
-- resp = &schema.SiteGeneralResp{}
-- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeGeneral)
-- if err != nil {
-- log.Error(err)
-- return resp, nil
-- }
-- if !exist {
-- return resp, nil
-- }
-- _ = json.Unmarshal([]byte(siteInfo.Content), resp)
-- return resp, nil
++ return s.siteInfoCommonService.GetSiteGeneral(ctx)
}
// GetSiteInterface get site info interface
func (s *SiteInfoService) GetSiteInterface(ctx context.Context) (resp *schema.SiteInterfaceResp, err error) {
-- resp = &schema.SiteInterfaceResp{}
-- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeInterface)
-- if err != nil {
-- log.Error(err)
-- return resp, nil
-- }
-- if !exist {
-- return resp, nil
-- }
-- _ = json.Unmarshal([]byte(siteInfo.Content), resp)
-- return resp, nil
++ return s.siteInfoCommonService.GetSiteInterface(ctx)
}
// GetSiteBranding get site info branding
--func (s *SiteInfoService) GetSiteBranding(ctx context.Context) (resp *schema.SiteBrandingReq, err error) {
-- resp = &schema.SiteBrandingReq{}
-- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeBranding)
-- if err != nil {
-- log.Error(err)
-- return resp, nil
-- }
-- if !exist {
-- return resp, nil
-- }
-- _ = json.Unmarshal([]byte(siteInfo.Content), resp)
-- return resp, nil
++func (s *SiteInfoService) GetSiteBranding(ctx context.Context) (resp *schema.SiteBrandingResp, err error) {
++ return s.siteInfoCommonService.GetSiteBranding(ctx)
}
// GetSiteWrite get site info write
@@@ -104,16 -104,16 +77,12 @@@ func (s *SiteInfoService) GetSiteWrite(
// GetSiteLegal get site legal info
func (s *SiteInfoService) GetSiteLegal(ctx context.Context) (resp *schema.SiteLegalResp, err error) {
-- resp = &schema.SiteLegalResp{}
-- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeLegal)
-- if err != nil {
-- return nil, err
-- }
-- if !exist {
-- return resp, nil
-- }
-- _ = json.Unmarshal([]byte(siteInfo.Content), resp)
-- return resp, nil
++ return s.siteInfoCommonService.GetSiteLegal(ctx)
++}
++
++// GetSiteLogin get site login info
++func (s *SiteInfoService) GetSiteLogin(ctx context.Context) (resp *schema.SiteLoginResp, err error) {
++ return s.siteInfoCommonService.GetSiteLogin(ctx)
}
func (s *SiteInfoService) SaveSiteGeneral(ctx context.Context, req schema.SiteGeneralReq) (err error) {
@@@ -207,6 -207,6 +176,17 @@@ func (s *SiteInfoService) SaveSiteLegal
return s.siteInfoRepo.SaveByType(ctx, constant.SiteTypeLegal, data)
}
++// SaveSiteLogin save site legal configuration
++func (s *SiteInfoService) SaveSiteLogin(ctx context.Context, req *schema.SiteLoginReq) (err error) {
++ content, _ := json.Marshal(req)
++ data := &entity.SiteInfo{
++ Type: constant.SiteTypeLogin,
++ Content: string(content),
++ Status: 1,
++ }
++ return s.siteInfoRepo.SaveByType(ctx, constant.SiteTypeLogin, data)
++}
++
// GetSMTPConfig get smtp config
func (s *SiteInfoService) GetSMTPConfig(ctx context.Context) (
resp *schema.GetSMTPConfigResp, err error,
diff --cc internal/service/siteinfo_common/siteinfo.go
index 1c501d2d,1c501d2d..00000000
deleted file mode 100644,100644
--- a/internal/service/siteinfo_common/siteinfo.go
+++ /dev/null
@@@ -1,12 -1,12 +1,0 @@@
--package siteinfo_common
--
--import (
-- "context"
--
-- "github.com/answerdev/answer/internal/entity"
--)
--
--type SiteInfoRepo interface {
-- SaveByType(ctx context.Context, siteType string, data *entity.SiteInfo) (err error)
-- GetByType(ctx context.Context, siteType string) (siteInfo *entity.SiteInfo, exist bool, err error)
--}
diff --cc internal/service/siteinfo_common/siteinfo_service.go
index 97d6006f,97d6006f..1925cb8c
--- a/internal/service/siteinfo_common/siteinfo_service.go
+++ b/internal/service/siteinfo_common/siteinfo_service.go
@@@ -5,13 -5,13 +5,21 @@@ import
"encoding/json"
"github.com/answerdev/answer/internal/base/constant"
++ "github.com/answerdev/answer/internal/entity"
"github.com/answerdev/answer/internal/schema"
)
++type SiteInfoRepo interface {
++ SaveByType(ctx context.Context, siteType string, data *entity.SiteInfo) (err error)
++ GetByType(ctx context.Context, siteType string) (siteInfo *entity.SiteInfo, exist bool, err error)
++}
++
++// SiteInfoCommonService site info common service
type SiteInfoCommonService struct {
siteInfoRepo SiteInfoRepo
}
++// NewSiteInfoCommonService new site info common service
func NewSiteInfoCommonService(siteInfoRepo SiteInfoRepo) *SiteInfoCommonService {
return &SiteInfoCommonService{
siteInfoRepo: siteInfoRepo,
@@@ -21,69 -21,69 +29,65 @@@
// GetSiteGeneral get site info general
func (s *SiteInfoCommonService) GetSiteGeneral(ctx context.Context) (resp *schema.SiteGeneralResp, err error) {
resp = &schema.SiteGeneralResp{}
-- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeGeneral)
-- if err != nil {
-- return resp, err
-- }
-- if !exist {
-- return resp, nil
++ if err = s.getSiteInfoByType(ctx, constant.SiteTypeGeneral, resp); err != nil {
++ return nil, err
}
-- _ = json.Unmarshal([]byte(siteInfo.Content), resp)
return resp, nil
}
// GetSiteInterface get site info interface
func (s *SiteInfoCommonService) GetSiteInterface(ctx context.Context) (resp *schema.SiteInterfaceResp, err error) {
resp = &schema.SiteInterfaceResp{}
-- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeInterface)
-- if err != nil {
-- return resp, err
-- }
-- if !exist {
-- return resp, nil
++ if err = s.getSiteInfoByType(ctx, constant.SiteTypeInterface, resp); err != nil {
++ return nil, err
}
-- _ = json.Unmarshal([]byte(siteInfo.Content), resp)
return resp, nil
}
// GetSiteBranding get site info branding
func (s *SiteInfoCommonService) GetSiteBranding(ctx context.Context) (resp *schema.SiteBrandingResp, err error) {
resp = &schema.SiteBrandingResp{}
-- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeBranding)
-- if err != nil {
-- return resp, err
-- }
-- if !exist {
-- return resp, nil
++ if err = s.getSiteInfoByType(ctx, constant.SiteTypeBranding, resp); err != nil {
++ return nil, err
}
-- _ = json.Unmarshal([]byte(siteInfo.Content), resp)
return resp, nil
}
// GetSiteWrite get site info write
func (s *SiteInfoCommonService) GetSiteWrite(ctx context.Context) (resp *schema.SiteWriteResp, err error) {
resp = &schema.SiteWriteResp{}
-- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeWrite)
-- if err != nil {
-- return resp, err
-- }
-- if !exist {
-- return resp, nil
++ if err = s.getSiteInfoByType(ctx, constant.SiteTypeWrite, resp); err != nil {
++ return nil, err
}
-- _ = json.Unmarshal([]byte(siteInfo.Content), resp)
return resp, nil
}
// GetSiteLegal get site info write
func (s *SiteInfoCommonService) GetSiteLegal(ctx context.Context) (resp *schema.SiteLegalResp, err error) {
resp = &schema.SiteLegalResp{}
-- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeLegal)
-- if err != nil {
++ if err = s.getSiteInfoByType(ctx, constant.SiteTypeLegal, resp); err != nil {
return nil, err
}
++ return resp, nil
++}
++
++// GetSiteLogin get site login config
++func (s *SiteInfoCommonService) GetSiteLogin(ctx context.Context) (resp *schema.SiteLoginResp, err error) {
++ resp = &schema.SiteLoginResp{}
++ if err = s.getSiteInfoByType(ctx, constant.SiteTypeLogin, resp); err != nil {
++ return nil, err
++ }
++ return resp, nil
++}
++
++func (s *SiteInfoCommonService) getSiteInfoByType(ctx context.Context, siteType string, resp interface{}) (err error) {
++ siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, siteType)
++ if err != nil {
++ return err
++ }
if !exist {
-- return resp, nil
++ return nil
}
_ = json.Unmarshal([]byte(siteInfo.Content), resp)
-- return resp, nil
++ return nil
}
diff --cc ui/build/index.html
index d07af796,d07af796..431e2ac3
--- a/ui/build/index.html
+++ b/ui/build/index.html
@@@ -1,1 -1,1 +1,1 @@@
--<!doctype html><html><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Answer</title><script defer="defer" src="/static/js/main.1e1d1dd2.js"></script><link href="/static/css/main.a1082d9a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
++<!doctype html><html><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Answer</title><script defer="defer" src="/static/js/main.2617abc6.js"></script><link href="/static/css/main.d4180d41.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"><style>@keyframes _doc-spin{to{transform:rotate(360deg)}}#doc-spinner{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%)}#doc-spinner .spinner{box-sizing:border-box;display:inline-block;width:2rem;height:2rem;vertical-align:-.125em;border:.25rem solid currentColor;border-right-color:transparent;color:rgba(108,117,125,.75);border-radius:50%;animation:.75s linear infinite _doc-spin}</style><div id="doc-spinner"><div class="spinner"></div></div></div></body></html>