domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Use inline SVG for built-in OAuth providers (#25171) (#25234)

Browse source 
Backport #25171 by @silverwind

The plan is that all built-in auth providers use inline SVG for more
flexibility in styling and to get the GitHub icon to follow
`currentcolor`. This only removes the `public/img/auth` directory and
adds the missing svgs to our svg build.

It should map the built-in providers to these SVGs and render them. If
the user has set a Icon URL, it should render that as an `img` tag
instead.

```
gitea-azure-ad
gitea-bitbucket
gitea-discord
gitea-dropbox
gitea-facebook
gitea-gitea
gitea-gitlab
gitea-google
gitea-mastodon
gitea-microsoftonline
gitea-nextcloud
gitea-twitter
gitea-yandex
octicon-mark-github
```

GitHub logo is now white again on dark theme:

<img width="431" alt="Screenshot 2023-06-12 at 21 45 34"
src="27a43504-d60a-4132-a502-336b25883e4d">

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Giteabot 2023-06-13 08:04:40 -04:00 • committed by GitHub
parent c207b94e0c
commit 9cef7a4600
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 57 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
services/auth/source/oauth2/providers_base.go
View file

@ -3,7 +3,12 @@
package oauth2
import "code.gitea.io/gitea/modules/setting"
import (
"html/template"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/svg"
)
// BaseProvider represents a common base for Provider
type BaseProvider struct {
@ -21,14 +26,21 @@ func (b *BaseProvider) DisplayName() string {
return b.displayName
}
// IconURL returns an icon path for this provider
// Use svg for default icons, providers_openid has its own IconURL function
func (b *BaseProvider) IconURL() string {
name := b.name
if b.name == "gplus" {
name = "google"
// IconHTML returns icon HTML for this provider
func (b *BaseProvider) IconHTML() template.HTML {
svgName := "gitea-" + b.name
switch b.name {
case "gplus":
svgName = "gitea-google"
case "github":
svgName = "octicon-mark-github"
}
return setting.AppSubURL + "/assets/img/auth/" + name + ".svg"
svgHTML := svg.RenderHTML(svgName, 20, "gt-mr-3")
if svgHTML == "" {
log.Error("No SVG icon for oauth2 provider %q", b.name)
svgHTML = svg.RenderHTML("gitea-openid", 20, "gt-mr-3")
}
return svgHTML
}
// CustomURLSettings returns the custom url settings for this provider