Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `ImagedProvider` for gplus oauth2 provider (#18504) (#18505) 

- Bacport of #18504

Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
Gusted 2022-02-01 03:45:58 +01:00 committed by GitHub
parent edd57028a1
commit 483bda4b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/auth/source/oauth2/providers_simple.go
View File

@ -70,13 +70,13 @@ func init() {
})) }))
// named gplus due to legacy gplus -> google migration (Google killed Google+). This ensures old connections still work // 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 { func(clientKey, secret, callbackURL string, scopes ...string) goth.Provider {
if setting.OAuth2Client.UpdateAvatar || setting.OAuth2Client.EnableAutoRegistration { if setting.OAuth2Client.UpdateAvatar || setting.OAuth2Client.EnableAutoRegistration {
scopes = append(scopes, "profile") scopes = append(scopes, "profile")
} }
return google.New(clientKey, secret, callbackURL, scopes...) return google.New(clientKey, secret, callbackURL, scopes...)
})) })))
RegisterGothProvider(NewSimpleProvider("twitter", "Twitter", nil, RegisterGothProvider(NewSimpleProvider("twitter", "Twitter", nil,
func(clientKey, secret, callbackURL string, scopes ...string) goth.Provider { func(clientKey, secret, callbackURL string, scopes ...string) goth.Provider {
@ -107,5 +107,4 @@ func init() {
return microsoftonline.New(clientID, secret, callbackURL, scopes...) return microsoftonline.New(clientID, secret, callbackURL, scopes...)
}, },
)) ))
} }