X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmkws-core.js;h=ce0636754e3a2394f43e6eabc9015d96532feb22;hb=ba2cb6020bd6e7663e519f89130bdf73099173a2;hp=3632a643871ae9ab2ff427fc1edf9939cd177209;hpb=779b8c03f3340a2a02753f6276438514ad6fa0ec;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 3632a64..ce06367 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -167,7 +167,12 @@ mkws.setMkwsConfig = function(overrides) {
   var config_default = {
     use_service_proxy: true,
     pazpar2_url:        "//mkws.indexdata.com/service-proxy/",
-    service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth",
+    service_proxy_auth: undefined, // generally rolled from the next three properties
+    // Was: //mkws.indexdata.com/service-proxy-auth
+    pp2_hostname: "mkws.indexdata.com",
+    sp_path: "service-proxy-auth",
+    sp_auth_query: undefined, // Will be: "command=auth&action=perconfig",
+    credentials: undefined,
     lang: "",
     sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
     perpage_options: [10, 20, 30, 50],
@@ -650,9 +655,33 @@ mkws.pagerNext = function(tname) {
       }
     */
 
+    function sp_auth_url(config) {
+      if (config.service_proxy_auth) {
+	mkws.log("using pre-baked sp_auth_url '" + config.service_proxy_auth + "'");
+	return config.service_proxy_auth;
+      } else {
+	var s = '//';
+	s += config.auth_hostname ? config.auth_hostname : config.pp2_hostname;
+	s += '/' + config.sp_path;
+        var q = config.sp_auth_query;
+        if (q) {
+          s += '?' + q;
+        }
+	var c = config.credentials;
+	if (c) {
+	  if (c) {
+	    s += ('&username=' + c.substr(0, c.indexOf('/')) +
+		  '&password=' + c.substr(c.indexOf('/')+1));
+	  }
+	}
+	mkws.log("generated sp_auth_url '" + s + "'");
+	return s;
+      }
+    }
+
     if (mkws.config.use_service_proxy) {
       if (!mkws.authenticated) {
-        authenticateSession(mkws.config.service_proxy_auth,
+        authenticateSession(sp_auth_url(mkws.config),
                             mkws.config.service_proxy_auth_domain,
                             mkws.config.pazpar2_url);
       }