feat(signup): almost done with new sign up flow, #2353

This commit is contained in:
Torkel Ödegaard
2015-08-31 11:35:07 +02:00
parent 13c70ac02c
commit d19e101e6b
11 changed files with 97 additions and 64 deletions
+10 -5
View File
@@ -75,11 +75,11 @@ var (
EmailCodeValidMinutes int
// User settings
AllowUserSignUp bool
AllowUserOrgCreate bool
AutoAssignOrg bool
AutoAssignOrgRole string
RequireEmailValidation bool
AllowUserSignUp bool
AllowUserOrgCreate bool
AutoAssignOrg bool
AutoAssignOrgRole string
VerifyEmailEnabled bool
// Http auth
AdminUser string
@@ -394,6 +394,7 @@ func NewConfigContext(args *CommandLineArgs) {
AllowUserOrgCreate = users.Key("allow_org_create").MustBool(true)
AutoAssignOrg = users.Key("auto_assign_org").MustBool(true)
AutoAssignOrgRole = users.Key("auto_assign_org_role").In("Editor", []string{"Editor", "Admin", "Read Only Editor", "Viewer"})
VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
// anonymous access
AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false)
@@ -425,6 +426,10 @@ func NewConfigContext(args *CommandLineArgs) {
readSessionConfig()
readSmtpSettings()
if VerifyEmailEnabled && !Smtp.Enabled {
log.Warn("require_email_validation is enabled but smpt is disabled")
}
}
func readSessionConfig() {