From 332920954e904518b3fa10e0b161eb4583ac8f70 Mon Sep 17 00:00:00 2001 From: gotjosh Date: Tue, 9 Jul 2019 10:15:52 +0100 Subject: [PATCH] SAML: Show SAML login button even if OAuth is disabled (#17993) * Move the SAML button outside of the oauth div * Don't attempt to search cookies with an empty name --- pkg/middleware/middleware.go | 4 ++++ public/app/partials/login.html | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index 49ec9f54b2a..d4a0b2da2aa 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -182,6 +182,10 @@ func initContextWithBasicAuth(ctx *models.ReqContext, orgId int64) bool { } func initContextWithToken(authTokenService models.UserTokenService, ctx *models.ReqContext, orgID int64) bool { + if setting.LoginCookieName == "" { + return false + } + rawToken := ctx.GetCookie(setting.LoginCookieName) if rawToken == "" { return false diff --git a/public/app/partials/login.html b/public/app/partials/login.html index 8acc0527fdb..78ff178c151 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -45,6 +45,10 @@
+ + + Sign in with SAML +
-