Changeset 4990

Timestamp:

04/16/14 12:11:14 (10 years ago)

Author:

Menzo Windhouwer

Message:

M mod-ISOcat-control-access/control/credentials.js

• skip the found Shibboleth header when going to the actual request
• disabled some debugging statements

M mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/js/org/isocat/gui/Explorer.js
M mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/js/org/isocat/gui/DCViewer.js

• use a general resetView method to prevent redundancy

Location:

cats/ISOcat/trunk

Files:

• mod-ISOcat-control-access/control/credentials.js (modified) (6 diffs)
• mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/js/org/isocat/gui/DCViewer.js (modified) (1 diff)
• mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/js/org/isocat/gui/Explorer.js (modified) (1 diff)

cats/ISOcat/trunk/mod-ISOcat-control-access/control/credentials.js

@@ -16 +16 @@
 cred = null;
 shib = null;
+shdr = null;
 
 // first try HTTP Basic authentication
@@ -45 +46 @@
 shres = context.issueSubRequest(shreq);
 if (shres != null) {
-    java.lang.System.out.println("DBG:credentials.js:shib headers["+shres.getAspects()+"]");
+    //java.lang.System.out.println("DBG:credentials.js:shib headers["+shres.getAspects()+"]");
     if (shres.hasAspect(DOMXDAAspect)) {
         shres = shres.getAspect(DOMXDAAspect);
-        java.lang.System.out.println("DBG:credentials.js:XDA["+shres+"]");
+        //java.lang.System.out.println("DBG:credentials.js:XDA["+shres+"]");
         if (shres != null) {
             shres = shres.getXDA();
             if (shres.isTrue("/nvp/header")) {
                 shres = shres.getText("/nvp/header",true);
-                java.lang.System.out.println("DBG:credentials.js:shib headers["+shres+"]");
+                //java.lang.System.out.println("DBG:credentials.js:shib headers["+shres+"]");
                 if (shres != "") {
                     shibHeaders = shres;
@@ -61 +62 @@
     }
 }
-java.lang.System.out.println("DBG:credentials.js:shib headers["+shibHeaders+"]");
+//java.lang.System.out.println("DBG:credentials.js:shib headers["+shibHeaders+"]");
 shibHeaders = shibHeaders.split(" ");
 for (i in shibHeaders) {
@@ -67 +68 @@
         var auth = req.getArgument(shibHeaders[i]);
         auth = auth.replace("data:text/plain,","");
-        java.lang.System.out.println("DBG:credentials.js:principal["+shibHeaders[i]+"]["+auth+"]");
+        //java.lang.System.out.println("DBG:credentials.js:principal["+shibHeaders[i]+"]["+auth+"]");
         if (auth != "") {
             shib = auth;
+            shdr = shibHeaders[i];
             break;
         }
@@ -148 +150 @@
 }
 
+java.lang.System.out.println("DBG:credentials.js:shiboleth principal["+shdr+"]["+shib+"]");
 //java.lang.System.out.println("DBG:credentials.js:authorization credentials["+cred+"]");
-//java.lang.System.out.println("DBG:credentials.js:shiboleth principal["+shib+"]");
 
 for(iter = req.getArguments(); iter.hasNext(); ) {
@@ -155 +157 @@
     if (arg.equals("Authorization")) {
         continue;
-    } else if (arg.equals("eduPersonPrincipalName")) {
-        continue;
-    } else if (arg.equals("eduPersonTargetedID")) {
+    } else if (shdr!=null && arg.equals(shdr)) {
         continue;
     } else if (arg.equals("principal")) {

cats/ISOcat/trunk/mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/js/org/isocat/gui/DCViewer.js

@@ -327 +327 @@
     };
     
-    DCViewer_prototype.loaded = function (objEvent) {
-        var req = objEvent.target;
-        var doc = req.getResponseXML();
-        
-        if ((req.getStatus() != 200) || (doc == null)) {
-            org.isocat.gui.DCViewer.log.info("DC request failed[" + req.getStatus() + "][" + doc + "][" + req.getResponseText() + "]");
-            org.isocat.APP.alert("DC loading failed", "The DC couldn't be loaded! You might not have the right to access it (anymore).", null, "OK");
-            
-            // hide the loading overlay
-            org.isocat.gui.Loading.load(this.view).hide();
-            org.isocat.gui.DCViewer.log.info("hiding loading overlay?");
-            
-            this.reset();
-            return;
-        }
-        
-        org.isocat.gui.DCViewer.log.info("DC request succeeded[" + req.getStatus() + "]");
-        
-        var div = doc.selectSingleNode("//div[@class='main']");
-        this.anchors(div, true);
-        
-        this.viewer.setText(div.toString(), true);
-        this.viewer.getRendered().scrollTop = 0;
-        this.viewer.getRendered().scrollLeft = 0;
-        
+    DCViewer_prototype.resetView = function () {
         // close some sections
         $('.dc-' + this.dc.id + '-adminrec').toggle();
         $('.dc-' + this.dc.id + '-langsec').toggle();
         $('.dc-' + this.dc.id + '-langsec-en').addClass('dc-' + this.dc.id + '-langsec');
+    };
+    
+    DCViewer_prototype.loaded = function (objEvent) {
+        var req = objEvent.target;
+        var doc = req.getResponseXML();
+        
+        if ((req.getStatus() != 200) || (doc == null)) {
+            org.isocat.gui.DCViewer.log.info("DC request failed[" + req.getStatus() + "][" + doc + "][" + req.getResponseText() + "]");
+            org.isocat.APP.alert("DC loading failed", "The DC couldn't be loaded! You might not have the right to access it (anymore).", null, "OK");
+            
+            // hide the loading overlay
+            org.isocat.gui.Loading.load(this.view).hide();
+            org.isocat.gui.DCViewer.log.info("hiding loading overlay?");
+            
+            this.reset();
+            return;
+        }
+        
+        org.isocat.gui.DCViewer.log.info("DC request succeeded[" + req.getStatus() + "]");
+        
+        var div = doc.selectSingleNode("//div[@class='main']");
+        this.anchors(div, true);
+        
+        this.viewer.setText(div.toString(), true);
+        this.viewer.getRendered().scrollTop = 0;
+        this.viewer.getRendered().scrollLeft = 0;
+        
+        this.resetView();
         
         // hide the loading overlay

cats/ISOcat/trunk/mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/js/org/isocat/gui/Explorer.js

@@ -382 +382 @@
                         view.controller.setWindow(window);// close some sections
                         
-                        $('.dc-'+dc.id+'-adminrec').toggle();
-                    $('.dc-'+dc.id+'-langsec').toggle();
-                    $('.dc-'+dc.id+'-langsec-en').addClass('dc-'+dc.id+'-langsec');
+                        view.controller.resetView();
                         
                         this.loadDataCategoryView();