Просмотр исходного кода

Merge pull request #2541 from overleaf/revert-2382-msm-remove-recaptcha-default-config

Revert "Remove Recaptcha default config"

GitOrigin-RevId: 70e5b7b1f52e89a676fc0cea3654fbe5f59739ce
Simon Detheridge 6 лет назад
Родитель
Сommit
08a35b8998
2 измененных файлов с 7 добавлено и 1 удалено
  1. 2 1
      services/web/app/views/layout.pug
  2. 5 0
      services/web/config/settings.defaults.coffee

+ 2 - 1
services/web/app/views/layout.pug

@@ -1,3 +1,4 @@
+
 doctype html
 html(
 	lang=(currentLngCode || 'en')
@@ -80,7 +81,7 @@ html(
 
 
 	body
-		if(settings.recaptcha)
+		if(settings.recaptcha && (settings.recaptcha.siteKey || settings.recaptcha.siteKeyV3))
 			if (settings.recaptcha.siteKeyV3)
 				script(src="https://www.google.com/recaptcha/api.js?render="+settings.recaptcha.siteKeyV3)
 			else

+ 5 - 0
services/web/config/settings.defaults.coffee

@@ -488,6 +488,11 @@ module.exports = settings =
 		# Example:
 		#   header_extras: [{text: "Some Page", url: "http://example.com/some/page", class: "subdued"}]
 
+	recaptcha:
+		disabled:
+			invite: true
+			register: true
+
 	customisation: {}
 
 #	templates: [{