From 8a101357bc35f73d631e819c2648568cf3967cc0 Mon Sep 17 00:00:00 2001 From: Hossein Ahmadian-Yazdi Date: Wed, 2 Sep 2020 10:28:43 -0400 Subject: [PATCH] Use old saml library if new one is enabled (#15371) Co-authored-by: Mattermod --- app/enterprise.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/enterprise.go b/app/enterprise.go index 6cca286df9..655a2ff641 100644 --- a/app/enterprise.go +++ b/app/enterprise.go @@ -167,6 +167,9 @@ func (a *App) initEnterprise() { if *a.Config().ExperimentalSettings.UseNewSAMLLibrary && samlInterfaceNew != nil { mlog.Debug("Loading new SAML2 library") a.srv.Saml = samlInterfaceNew(a) + } else if *a.Config().ExperimentalSettings.UseNewSAMLLibrary && samlInterfaceNew == nil { + mlog.Debug("Ignoring configuration setting to use the Experimental SAML library") + a.srv.Saml = samlInterface(a) } else { mlog.Debug("Loading original SAML library") a.srv.Saml = samlInterface(a)