Auth: add name parameter to auth.saml (#39883)

* add name parameter to auth.saml

* Create constant to store default SAML name

packages/grafana-data/src/types/constants.ts

@@ -1,2 +1,3 @@
 export const GAUGE_DEFAULT_MINIMUM = 0;
 export const GAUGE_DEFAULT_MAXIMUM = 100;
+export const DEFAULT_SAML_NAME = 'SAML';

packages/grafana-runtime/src/config.ts

@@ -44,6 +44,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
   ldapEnabled = false;
   sigV4AuthEnabled = false;
   samlEnabled = false;
+  samlName = '';
   autoAssignOrg = true;
   verifyEmailEnabled = false;
   oauth: any;

pkg/api/login.go

@@ -97,6 +97,7 @@ func (hs *HTTPServer) LoginView(c *models.ReqContext) {
 
 	viewData.Settings["oauth"] = enabledOAuths
 	viewData.Settings["samlEnabled"] = hs.samlEnabled()
+	viewData.Settings["samlName"] = hs.samlName()
 
 	if loginError, ok := hs.tryGetEncryptedCookie(c, loginErrorCookieName); ok {
 		// this cookie is only set whenever an OAuth login fails
@@ -346,6 +347,10 @@ func (hs *HTTPServer) samlEnabled() bool {
 	return hs.SettingsProvider.KeyValue("auth.saml", "enabled").MustBool(false) && hs.License.HasValidLicense()
 }
 
+func (hs *HTTPServer) samlName() string {
+	return hs.SettingsProvider.KeyValue("auth.saml", "name").MustString("SAML")
+}
+
 func (hs *HTTPServer) samlSingleLogoutEnabled() bool {
 	return hs.SettingsProvider.KeyValue("auth.saml", "single_logout").MustBool(false) && hs.samlEnabled()
 }

public/app/core/components/Login/LoginServiceButtons.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import config from 'app/core/config';
 import { css, cx } from '@emotion/css';
 import { Icon, IconName, LinkButton, useStyles, useTheme2, VerticalGroup } from '@grafana/ui';
-import { GrafanaTheme, GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme, GrafanaTheme2, DEFAULT_SAML_NAME } from '@grafana/data';
 import { pickBy } from 'lodash';
 
 export interface LoginService {
@@ -24,7 +24,7 @@ const loginServices: () => LoginServices = () => {
     saml: {
       bgColor: '#464646',
       enabled: config.samlEnabled,
-      name: 'SAML',
+      name: config.samlName || DEFAULT_SAML_NAME,
       icon: 'key-skeleton-alt',
     },
     google: {