From 3524ffb6effba91bd40ac26471b18553fc1d3ab1 Mon Sep 17 00:00:00 2001 From: Christian Ulrich Date: Thu, 30 Apr 2020 12:18:42 +0200 Subject: [PATCH] initialize samlObj in getStrategy --- library.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/library.js b/library.js index 0b68d8a..7fcbdb3 100644 --- a/library.js +++ b/library.js @@ -38,6 +38,22 @@ params.router.get('/admin/plugins/sso-saml', params.middleware.admin.buildHeader, render); params.router.get('/api/admin/plugins/sso-saml', render); + console.log("[sso-saml] init done"); + callback(); + }; + + SAML.get_config = function(options, callback) { + meta.settings.get('sso_saml', function(err, settings) { + if (err) { + return callback(null, options); + } + master_config = settings; + options.sso_saml = settings; + callback(null, options); + }); + }, + + SAML.initSaml = function() { if (master_config.idp_entry_point && master_config.callback_path && master_config.issuer && master_config.metadata) { console.log("creating samlObj"); samlObj = new passportSAML({ @@ -75,8 +91,6 @@ ); } - console.log("[sso-saml] samlObj", samlObj); - if (samlObj){ if (master_config.metadata) { @@ -133,26 +147,12 @@ else { console.log("[sso-saml] Cannot create samlObj"); } - - console.log("[sso-saml] init done"); - callback(); - }; - - - SAML.get_config = function(options, callback) { - meta.settings.get('sso_saml', function(err, settings) { - if (err) { - return callback(null, options); - } - master_config = settings; - options.sso_saml = settings; - callback(null, options); - }); - }, - + } SAML.getStrategy = function(strategies, callback) { + initSaml(); + if (samlObj){ passport.use(samlObj);