Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 934fd6e..90caf92 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -7,11 +7,8 @@
       var mkws_config = {
        pazpar2_url:        "//sp-mkws.indexdata.com/service-proxy/",
         // For now, we have to provide known-bad credentials to skip user/pw login: see bug MKSP-125
-        service_proxy_auth: undefined,
-        // Was: //sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig&username=XXX&password=XXX
-//        pp2_hostname: "sp-mkws.indexdata.com",
-//        sp_path: "service-proxy/",
-//        credentials: "XXX/XXX",
+       service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig&username=XXX&password=XXX"
+        // For explicit credential-based authentication, add: &username=orex&password=orexmkc
       };
     </script>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>

diff --git a/src/mkws-core.js b/src/mkws-core.js
index c388084..94060a2 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -166,11 +166,7 @@ mkws.setMkwsConfig = function(overrides) {
   var config_default = {
     use_service_proxy: true,
     pazpar2_url:        "//mkws.indexdata.com/service-proxy/",
-    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",
-    credentials: undefined,
+    service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth",
     lang: "",
     sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
     perpage_options: [10, 20, 30, 50],
@@ -627,28 +623,8 @@ 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 + '?command=auth&action=perconfig';
-        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) {
-      authenticateSession(sp_auth_url(mkws.config),
+      authenticateSession(mkws.config.service_proxy_auth,
                           mkws.config.service_proxy_auth_domain,
                           mkws.config.pazpar2_url);
     } else {