Fix login page redirected from password reset (#24032)

5 years ago · afc78339bd
parent 670c96a1db
commit afc78339bd
1 changed files with 2 additions and 2 deletions
--- a/public/app/core/components/Login/LoginServiceButtons.tsx
+++ b/public/app/core/components/Login/LoginServiceButtons.tsx
@ -16,7 +16,7 @@ const loginServices: () => LoginServices = () => {
      name: 'Google',
    },
    azuread: {
-      enabled: config.oauth.azuread,
+      enabled: oauthEnabled && config.oauth.azuread,
      name: 'Microsoft',
    },
    github: {
@ -34,7 +34,7 @@ const loginServices: () => LoginServices = () => {
      icon: 'grafana_com',
    },
    okta: {
-      enabled: config.oauth.okta,
+      enabled: oauthEnabled && config.oauth.okta,
      name: 'Okta',
    },
    oauth: {