Skip to content

Commit 16a4230

Browse files
committed
feat(install): Add LoginRequired configuration when install
1 parent a8d4094 commit 16a4230

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

internal/install/install_from_env.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ type Env struct {
2828
AdminName string `json:"name"`
2929
AdminPassword string `json:"password"`
3030
AdminEmail string `json:"email"`
31+
LoginRequired bool `json:"login_required"`
3132
}
3233

3334
func TryToInstallByEnv() (installByEnv bool, err error) {
@@ -105,6 +106,7 @@ func initBaseInfo(env *Env) (err error) {
105106
AdminName: env.AdminName,
106107
AdminPassword: env.AdminPassword,
107108
AdminEmail: env.AdminEmail,
109+
LoginRequired: env.LoginRequired,
108110
}
109111
return requestAPI(req, "POST", "/installation/base-info", InitBaseInfo)
110112
}

internal/install/install_req.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ type InitBaseInfoReq struct {
8484
AdminName string `validate:"required,gt=3,lte=30" json:"name"`
8585
AdminPassword string `validate:"required,gte=8,lte=32" json:"password"`
8686
AdminEmail string `validate:"required,email,gt=0,lte=500" json:"email"`
87+
LoginRequired bool `json:"login_required"`
8788
}
8889

8990
func (r *InitBaseInfoReq) Check() (errFields []*validator.FormErrorField, err error) {

internal/migrations/init.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ type InitNeedUserInputData struct {
3232
AdminName string
3333
AdminPassword string
3434
AdminEmail string
35+
LoginRequired bool
3536
}
3637

3738
func (m *Mentor) InitDB() error {
@@ -159,7 +160,7 @@ func (m *Mentor) initSiteInfoLoginConfig() {
159160
loginConfig := map[string]bool{
160161
"allow_new_registrations": true,
161162
"allow_email_registrations": true,
162-
"login_required": false,
163+
"login_required": m.userData.LoginRequired,
163164
}
164165
loginConfigDataBytes, _ := json.Marshal(loginConfig)
165166
_, m.err = m.engine.Context(m.ctx).Insert(&entity.SiteInfo{

0 commit comments

Comments
 (0)