From 7b8417c7135cd07679bd8595fa3ae3dffb3af4c9 Mon Sep 17 00:00:00 2001
From: Arthur Egberink <arthur.egberink@aareon.nl>
Date: Wed, 23 Nov 2016 08:32:09 +0000
Subject: [PATCH] svn path=/Website/branches/v2016.2/; revision=31630

---
 CUST/PNBR/SAML/default.asp | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/CUST/PNBR/SAML/default.asp b/CUST/PNBR/SAML/default.asp
index 49a75f862b..61b206ae4e 100644
--- a/CUST/PNBR/SAML/default.asp
+++ b/CUST/PNBR/SAML/default.asp
@@ -16,27 +16,10 @@
 <!-- #include file="../../../appl/Shared/common.inc" -->
 <!-- #include file="../../../appl/shared/login.inc" -->
 <%
-//    for (i=1; i <= Request.ServerVariables.Count; i++)
-//    {
-//        __DoLog(Request.ServerVariables.key(i) + ": " + Request.ServerVariables(i));
-//    }
+    var uname = "";
+    var email = String(Request.ServerVariables("HTTP_FCLTUPN"));
 
-    var uname = String(Request.ServerVariables("UPN"));
-//    __DoLog("uname: " + uname);
-    Response.Write("SAML user detected as: " + uname);
-    var sql = "SELECT prs_perslid_oslogin"
-            + "  FROM prs_perslid pp"
-            + "     , prs_kenmerklink pkl"
-            + " WHERE pp.prs_perslid_key = pkl.prs_link_key"
-            + "   AND pkl.prs_kenmerklink_niveau = 'P'"
-            + "   AND pkl.prs_kenmerk_key = 1000" // IID
-            + "   AND pkl.prs_kenmerklink_waarde = " + safe.quoted_sql(uname)
-    var oRs = Oracle.Execute(sql);
-    if (!oRs.Eof)
-    {
-        uname = oRs("prs_perslid_oslogin").Value;
-       __Log("IID vertaald naar: " + uname);
-    }
+    settings.overrule_setting("login_use_email", 1);
 
     var newUrl = rooturl + "/";
     if (Session("SSO_URL")) // binnen via sso=1 route
@@ -56,13 +39,13 @@
             newUrl += "?" + sso_qs;
     }
 
-    if (tryLogin(uname, null))
+    if (tryLogin(email, null))
     {
         //Response.Write("Hoera: je bent user: " + user_key);
     }
     else
     {   // Automatisch naar het inlogscherm
-        __DoLog("SAML login not found in Facilitor: " + uname);
+        __DoLog("SAML inlog niet gelukt (Email:" + email);
     }
     Response.Redirect(newUrl);
 %>
\ No newline at end of file