From a22be81febd6f0bad118e8722e62c841836af807 Mon Sep 17 00:00:00 2001
From: Norihito Nakae <norihito.n@gmail.com>
Date: Wed, 29 Nov 2017 15:45:32 +0900
Subject: [PATCH] fixed the SAML callback URL to unconfigurable.

---
 config.json.example        | 1 -
 lib/config/default.js      | 1 -
 lib/web/auth/saml/index.js | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/config.json.example b/config.json.example
index db1dd94..00165f5 100644
--- a/config.json.example
+++ b/config.json.example
@@ -79,7 +79,6 @@
             "idpSsoUrl": "change: authentication endpoint of IdP",
             "idpCert": "change: certificate file path of IdP in PEM format",
             "issuer": "change or delete: identity of the service provider (default: serverurl)",
-            "callbackUrl": "change or delete: callback url to consume assertions (default: serverurl+'/auth/saml/callback')",
             "identifierFormat": "change or delete: name identifier format (default: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress')",
             "groupAttribute": "change or delete: attribute name for group list (ex: memberOf)",
             "requiredGroups": [ "change or delete: group names that allowed" ],
diff --git a/lib/config/default.js b/lib/config/default.js
index ff1e3a3..96bfe79 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -102,7 +102,6 @@ module.exports = {
     idpSsoUrl: undefined,
     idpCert: undefined,
     issuer: undefined,
-    callbackUrl: undefined,
     identifierFormat: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
     groupAttribute: undefined,
     externalGroups: [],
diff --git a/lib/web/auth/saml/index.js b/lib/web/auth/saml/index.js
index 575c6f3..063fa1d 100644
--- a/lib/web/auth/saml/index.js
+++ b/lib/web/auth/saml/index.js
@@ -13,7 +13,7 @@ const intersection = function (array1, array2) { return array1.filter((n) => arr
 let samlAuth = module.exports = Router()
 
 passport.use(new SamlStrategy({
-  callbackUrl: config.saml.callbackUrl || config.serverurl + '/auth/saml/callback',
+  callbackUrl: config.serverurl + '/auth/saml/callback',
   entryPoint: config.saml.idpSsoUrl,
   issuer: config.saml.issuer || config.serverurl,
   cert: fs.readFileSync(config.saml.idpCert, 'utf-8'),