feat(ui): Legal checkboxes
This commit is contained in:
parent
81c45b163d
commit
e07451ad20
7 changed files with 47 additions and 6 deletions
|
|
@ -89,6 +89,8 @@ var Service = struct {
|
||||||
ValidSiteURLSchemes []string
|
ValidSiteURLSchemes []string
|
||||||
UsernameCooldownPeriod int64
|
UsernameCooldownPeriod int64
|
||||||
MaxUserRedirects int64
|
MaxUserRedirects int64
|
||||||
|
TermsOfServiceURL string
|
||||||
|
PrivacyPolicyURL string
|
||||||
|
|
||||||
// OpenID settings
|
// OpenID settings
|
||||||
EnableOpenIDSignIn bool
|
EnableOpenIDSignIn bool
|
||||||
|
|
@ -297,6 +299,9 @@ func loadServiceFrom(rootCfg ConfigProvider) {
|
||||||
}
|
}
|
||||||
Service.MaxUserRedirects = sec.Key("MAX_USER_REDIRECTS").MustInt64(maxUserRedirectsDefault)
|
Service.MaxUserRedirects = sec.Key("MAX_USER_REDIRECTS").MustInt64(maxUserRedirectsDefault)
|
||||||
|
|
||||||
|
Service.TermsOfServiceURL = sec.Key("TERMS_OF_SERVICE_URL").MustString("")
|
||||||
|
Service.PrivacyPolicyURL = sec.Key("PRIVACY_POLICY_URL").MustString("")
|
||||||
|
|
||||||
mustMapSetting(rootCfg, "service.explore", &Service.Explore)
|
mustMapSetting(rootCfg, "service.explore", &Service.Explore)
|
||||||
|
|
||||||
loadOpenIDSetting(rootCfg)
|
loadOpenIDSetting(rootCfg)
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,8 @@ func CommonTemplateContextData() ContextData {
|
||||||
"EnableOpenIDSignIn": setting.Service.EnableOpenIDSignIn,
|
"EnableOpenIDSignIn": setting.Service.EnableOpenIDSignIn,
|
||||||
"PageStartTime": time.Now(),
|
"PageStartTime": time.Now(),
|
||||||
|
|
||||||
"RunModeIsProd": setting.IsProd,
|
"RunModeIsProd": setting.IsProd,
|
||||||
|
"TermsOfServiceURL": setting.Service.TermsOfServiceURL,
|
||||||
|
"PrivacyPolicyURL": setting.Service.PrivacyPolicyURL,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,8 @@ licenses = Licenses
|
||||||
return_to_forgejo = Return to Forgejo
|
return_to_forgejo = Return to Forgejo
|
||||||
toggle_menu = Toggle menu
|
toggle_menu = Toggle menu
|
||||||
more_items = More items
|
more_items = More items
|
||||||
|
terms_of_service = Terms of Service
|
||||||
|
privacy_policy = Privacy Policy
|
||||||
|
|
||||||
username = Username
|
username = Username
|
||||||
email = Email address
|
email = Email address
|
||||||
|
|
@ -37,6 +39,8 @@ captcha = CAPTCHA
|
||||||
twofa = Two-factor authentication
|
twofa = Two-factor authentication
|
||||||
twofa_scratch = Two-factor scratch code
|
twofa_scratch = Two-factor scratch code
|
||||||
passcode = Passcode
|
passcode = Passcode
|
||||||
|
consent.terms_of_service = I have read and agree to the <a href="%s">Terms of Service</a>
|
||||||
|
consent.privacy_policy = I acknowledge that I have read the <a href="%s">Privacy Policy</a>
|
||||||
|
|
||||||
webauthn_insert_key = Insert your security key
|
webauthn_insert_key = Insert your security key
|
||||||
webauthn_sign_in = Press the button on your security key. If your security key has no button, re-insert it.
|
webauthn_sign_in = Press the button on your security key. If your security key has no button, re-insert it.
|
||||||
|
|
@ -479,6 +483,7 @@ password_pwned_err = Could not complete request to HaveIBeenPwned
|
||||||
last_admin = You cannot remove the last admin. There must be at least one admin.
|
last_admin = You cannot remove the last admin. There must be at least one admin.
|
||||||
back_to_sign_in = Back to Sign in
|
back_to_sign_in = Back to Sign in
|
||||||
sign_in_openid = Proceed with OpenID
|
sign_in_openid = Proceed with OpenID
|
||||||
|
must_consent = You must agree to the Terms of Service and Privacy Policy to register an account.
|
||||||
|
|
||||||
[mail]
|
[mail]
|
||||||
view_it_on = View it on %s
|
view_it_on = View it on %s
|
||||||
|
|
|
||||||
|
|
@ -448,6 +448,11 @@ func SignUpPost(ctx *context.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !form.ConsentTerms || !form.ConsentPrivacy {
|
||||||
|
ctx.RenderWithErr(ctx.Tr("auth.must_consent"), tplSignUp, &form)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
context.VerifyCaptcha(ctx, tplSignUp, form)
|
context.VerifyCaptcha(ctx, tplSignUp, form)
|
||||||
if ctx.Written() {
|
if ctx.Written() {
|
||||||
return
|
return
|
||||||
|
|
|
||||||
|
|
@ -92,10 +92,12 @@ func (f *InstallForm) Validate(req *http.Request, errs binding.Errors) binding.E
|
||||||
|
|
||||||
// RegisterForm form for registering
|
// RegisterForm form for registering
|
||||||
type RegisterForm struct {
|
type RegisterForm struct {
|
||||||
UserName string `binding:"Required;Username;MaxSize(40)"`
|
UserName string `binding:"Required;Username;MaxSize(40)"`
|
||||||
Email string `binding:"Required;MaxSize(254)"`
|
Email string `binding:"Required;MaxSize(254)"`
|
||||||
Password string `binding:"MaxSize(255)"`
|
Password string `binding:"MaxSize(255)"`
|
||||||
Retype string
|
Retype string
|
||||||
|
ConsentTerms bool
|
||||||
|
ConsentPrivacy bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate validates the fields
|
// Validate validates the fields
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<a href="{{AssetUrlPrefix}}/licenses.txt">{{ctx.Locale.Tr "licenses"}}</a>
|
<a href="{{AssetUrlPrefix}}/licenses.txt">{{ctx.Locale.Tr "licenses"}}</a>
|
||||||
{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
|
{{if .TermsOfServiceURL}}<a href="{{.TermsOfServiceURL}}">{{ctx.Locale.Tr "terms_of_service"}}</a>{{end}}
|
||||||
|
{{if .PrivacyPolicyURL}}<a href="{{.PrivacyPolicyURL}}">{{ctx.Locale.Tr "privacy_policy"}}</a>{{end}}
|
||||||
{{template "custom/extra_links_footer" .}}
|
{{template "custom/extra_links_footer" .}}
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
|
||||||
21
templates/user/auth/consent.tmpl
Normal file
21
templates/user/auth/consent.tmpl
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
{{ if (.TermsOfServiceURL) }}
|
||||||
|
<div class="inline field required">
|
||||||
|
<div class="ui checkbox">
|
||||||
|
<input id="consent_terms" name="consent_terms" type="checkbox">
|
||||||
|
<label for="consent_terms">{{ ctx.Locale.Tr "consent.terms_of_service" .TermsOfServiceURL }}</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{ else }}
|
||||||
|
<input id="consent_terms" name="consent_terms" type="checkbox" checked hidden>
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
|
{{ if (.PrivacyPolicyURL) }}
|
||||||
|
<div class="inline field required">
|
||||||
|
<div class="ui checkbox">
|
||||||
|
<input id="consent_privacy" name="consent_privacy" type="checkbox">
|
||||||
|
<label for="consent_privacy">{{ ctx.Locale.Tr "consent.privacy_policy" .PrivacyPolicyURL }}</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{ else }}
|
||||||
|
<input id="consent_privacy" name="consent_privacy" type="checkbox" checked hidden>
|
||||||
|
{{ end }}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue