evin/nodebb-plugin-sso-saml
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "additional null checks"

Browse source 
This reverts commit cd28397223.
This commit is contained in:
Christian Ulrich 2020-04-30 12:12:06 +02:00
parent cd28397223
commit c590cab920
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
library.js
View file

@ -38,13 +38,9 @@
params.router.get('/admin/plugins/sso-saml', params.middleware.admin.buildHeader, render); params.router.get('/admin/plugins/sso-saml', params.middleware.admin.buildHeader, render);
params.router.get('/api/admin/plugins/sso-saml', render); params.router.get('/api/admin/plugins/sso-saml', render);
if (master_config.idp_entry_point != null && if (master_config.idp_entry_point !== "" &&
master_config.idp_entry_point !== "" &&
master_config.callback_path != null &&
master_config.callback_path !== "" && master_config.callback_path !== "" &&
master_config.issuer != null &&
master_config.issuer !== "" && master_config.issuer !== "" &&
master_config.metadata != null &&
master_config.metadata !== "") { master_config.metadata !== "") {
console.log("creating samlObj"); console.log("creating samlObj");
samlObj = new passportSAML({ samlObj = new passportSAML({
@ -86,9 +82,9 @@
if (samlObj){ if (samlObj){
if (master_config.metadata != null && master_config.metadata !== "") { if (master_config.metadata !== "") {
params.router.get(master_config.metadata, function(req, res) { params.router.get(master_config.metadata, function(req, res) {
if (master_config.metadata != null && master_config.server_crt !== ""){ if (master_config.server_crt !== ""){
var cert = fs.readFileSync(master_config.server_crt, 'utf-8'); var cert = fs.readFileSync(master_config.server_crt, 'utf-8');
res.header("Content-Type", "application/xml"); res.header("Content-Type", "application/xml");
res.send(samlObj.generateServiceProviderMetadata(cert)) res.send(samlObj.generateServiceProviderMetadata(cert))
@ -102,8 +98,7 @@
params.router.post(master_config.callback_path, params.router.post(master_config.callback_path,
passport.authenticate('saml'), passport.authenticate('saml'),
function(req, res, next){ function(req, res, next){
if (master_config.login_redirect_url != null && if (master_config.login_redirect_url !== ""){
master_config.login_redirect_url !== ""){
res.redirect(master_config.login_redirect_url); res.redirect(master_config.login_redirect_url);
} }
else{ else{
@ -114,8 +109,7 @@
); );
if (master_config.logout_url != null && if (master_config.logout_url !== "") {
master_config.logout_url !== "") {
params.router.get(master_config.logout_url,function(req,res){ params.router.get(master_config.logout_url,function(req,res){
if (req.user && parseInt(req.user.uid, 10) > 0) { if (req.user && parseInt(req.user.uid, 10) > 0) {
@ -126,8 +120,7 @@
req.logout(); req.logout();
if (master_config.logout_redirect_url != null && if (master_config.logout_redirect_url !== ""){
master_config.logout_redirect_url !== ""){
res.redirect(master_config.logout_redirect_url); res.redirect(master_config.logout_redirect_url);
} }
else{ else{