From 030646eea41e17e58e11e73b19339630b6d6148e Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 28 Feb 2021 22:04:15 +0000 Subject: [PATCH] Set HCaptchaSiteKey on Link Account pages (#14834) When using HCaptcha on link account pages the site key needs to be passed in. This PR ensures that HCaptchaSiteKey is set in the data. Fix #14766 Signed-off-by: Andrew Thornton Co-authored-by: techknowlogick --- routers/user/auth.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routers/user/auth.go b/routers/user/auth.go index de74055d5..2d5e7bf44 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -751,6 +751,7 @@ func LinkAccount(ctx *context.Context) { ctx.Data["CaptchaType"] = setting.Service.CaptchaType ctx.Data["RecaptchaURL"] = setting.Service.RecaptchaURL ctx.Data["RecaptchaSitekey"] = setting.Service.RecaptchaSitekey + ctx.Data["HcaptchaSitekey"] = setting.Service.HcaptchaSitekey ctx.Data["DisableRegistration"] = setting.Service.DisableRegistration ctx.Data["ShowRegistrationButton"] = false @@ -804,6 +805,7 @@ func LinkAccountPostSignIn(ctx *context.Context) { ctx.Data["Captcha"] = context.GetImageCaptcha() ctx.Data["CaptchaType"] = setting.Service.CaptchaType ctx.Data["RecaptchaSitekey"] = setting.Service.RecaptchaSitekey + ctx.Data["HcaptchaSitekey"] = setting.Service.HcaptchaSitekey ctx.Data["DisableRegistration"] = setting.Service.DisableRegistration ctx.Data["ShowRegistrationButton"] = false @@ -890,6 +892,7 @@ func LinkAccountPostRegister(ctx *context.Context) { ctx.Data["Captcha"] = context.GetImageCaptcha() ctx.Data["CaptchaType"] = setting.Service.CaptchaType ctx.Data["RecaptchaSitekey"] = setting.Service.RecaptchaSitekey + ctx.Data["HcaptchaSitekey"] = setting.Service.HcaptchaSitekey ctx.Data["DisableRegistration"] = setting.Service.DisableRegistration ctx.Data["ShowRegistrationButton"] = false