AuthN: use the default login icon if no icon is specified (#64327)

use the default login icon if empty string passed in
This commit is contained in:
Ieva 2023-03-07 15:14:36 +00:00 committed by GitHub
parent 3b2d5bca3e
commit 1b6b5dd7e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,44 +32,44 @@ const loginServices: () => LoginServices = () => {
bgColor: '#e84d3c',
enabled: oauthEnabled && Boolean(config.oauth.google),
name: config.oauth?.google?.name || 'Google',
icon: config.oauth?.google?.icon ?? ('google' as const),
icon: config.oauth?.google?.icon || ('google' as const),
},
azuread: {
bgColor: '#2f2f2f',
enabled: oauthEnabled && Boolean(config.oauth.azuread),
name: config.oauth?.azuread?.name || 'Microsoft',
icon: config.oauth?.azuread?.icon ?? ('microsoft' as const),
icon: config.oauth?.azuread?.icon || ('microsoft' as const),
},
github: {
bgColor: '#464646',
enabled: oauthEnabled && Boolean(config.oauth.github),
name: config.oauth?.github?.name || 'GitHub',
icon: config.oauth?.github?.icon ?? ('github' as const),
icon: config.oauth?.github?.icon || ('github' as const),
},
gitlab: {
bgColor: '#fc6d26',
enabled: oauthEnabled && Boolean(config.oauth.gitlab),
name: config.oauth?.gitlab?.name || 'GitLab',
icon: config.oauth?.gitlab?.icon ?? ('gitlab' as const),
icon: config.oauth?.gitlab?.icon || ('gitlab' as const),
},
grafanacom: {
bgColor: '#262628',
enabled: oauthEnabled && Boolean(config.oauth.grafana_com),
name: config.oauth?.grafana_com?.name || 'Grafana.com',
icon: config.oauth?.grafana_com?.icon ?? ('grafana' as const),
icon: config.oauth?.grafana_com?.icon || ('grafana' as const),
hrefName: 'grafana_com',
},
okta: {
bgColor: '#2f2f2f',
enabled: oauthEnabled && Boolean(config.oauth.okta),
name: config.oauth?.okta?.name || 'Okta',
icon: config.oauth?.okta?.icon ?? ('okta' as const),
icon: config.oauth?.okta?.icon || ('okta' as const),
},
oauth: {
bgColor: '#262628',
enabled: oauthEnabled && Boolean(config.oauth.generic_oauth),
name: config.oauth?.generic_oauth?.name || 'OAuth',
icon: config.oauth?.generic_oauth?.icon ?? ('signin' as const),
icon: config.oauth?.generic_oauth?.icon || ('signin' as const),
hrefName: 'generic_oauth',
},
};