From 483bda4b2d954692b197f93e813402f2a95a9360 Mon Sep 17 00:00:00 2001
From: Gusted <williamzijl7@hotmail.com>
Date: Tue, 1 Feb 2022 03:45:58 +0100
Subject: [PATCH] Use `ImagedProvider` for gplus oauth2 provider (#18504)
(#18505)
- Bacport of #18504
Co-authored-by: 6543 <6543@obermui.de>
---
services/auth/source/oauth2/providers_simple.go | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/services/auth/source/oauth2/providers_simple.go b/services/auth/source/oauth2/providers_simple.go
index a4d61eb2f3..39d3d74f6d 100644
--- a/services/auth/source/oauth2/providers_simple.go
+++ b/services/auth/source/oauth2/providers_simple.go
@@ -70,13 +70,13 @@ func init() {
}))
// named gplus due to legacy gplus -> google migration (Google killed Google+). This ensures old connections still work
- RegisterGothProvider(NewSimpleProvider("gplus", "Google", []string{"email"},
+ RegisterGothProvider(NewImagedProvider("/assets/img/auth/google.png", NewSimpleProvider("gplus", "Google", []string{"email"},
func(clientKey, secret, callbackURL string, scopes ...string) goth.Provider {
if setting.OAuth2Client.UpdateAvatar || setting.OAuth2Client.EnableAutoRegistration {
scopes = append(scopes, "profile")
}
return google.New(clientKey, secret, callbackURL, scopes...)
- }))
+ })))
RegisterGothProvider(NewSimpleProvider("twitter", "Twitter", nil,
func(clientKey, secret, callbackURL string, scopes ...string) goth.Provider {
@@ -107,5 +107,4 @@ func init() {
return microsoftonline.New(clientID, secret, callbackURL, scopes...)
},
))
-
}