added more OpenID service types and handling of append='qxri' attribute

* added OpenID 1.1 and 2.0 service types to SERVICE_CLASSES
* append qxri to URI in presence of append='qxri' attribute (append='authority'
  is yet to be handled)
* added more OpenID service type URIs to friendlyServiceName()

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 22 insertions, 6 deletions

diff --git a/src/components/xriProtocolHandler.js b/src/components/xriProtocolHandler.js
index 1105874..3d27784 100755
--- a/src/components/xriProtocolHandler.js
+++ b/src/components/xriProtocolHandler.js
@@ -46,12 +46,15 @@ const XP_ANY_UNORDERED_NODE_TYPE = 8;
 const XP_FIRST_ORDERED_NODE_TYPE = 9;

 

 

 var SERVICE_CLASSES = {

         'xri://+i-service*(+contact)*($v*1.0)': 'i-contact',

         'http://openid.net/signon/1.0': 'openid',

+        'http://openid.net/signon/1.1': 'openid',

+        'http://specs.openid.net/auth/2.0/signon': 'openid',

+        'http://specs.openid.net/auth/2.0/server': 'openid',

         'xri://$res*auth*($v*2.0)': 'res-auth',

         'xri://+i-service*(+authn)*(+saml)*($v*1.0)': 'authn-saml',

         'xri://+i-service*(+metadata)*(+saml)*($v*1.0)' : 'metadata-saml',

         'xri://+i-service*(+forwarding)*($v*1.0)': 'i-forwarding'

 };

 

@@ -234,16 +237,17 @@ function renderService(srv, doc, qxri)
                 if (m.nodeValue) {

                         html_mediatypes += "<strong>Media Type:</strong> " + m.nodeValue + "<br/>";

                 }

         }

 

 

-        res = runExpr(doc, srv, "xrd:URI/text()");

-        var u;

-        while (u = res.iterateNext()) {

-                if (!u.nodeValue)

+        res = runExpr(doc, srv, "xrd:URI");

+        var uu;

+        while (uu = res.iterateNext()) {

+                var u = uu.firstChild;

+                if (!(u.nodeValue && u.nodeType==3))

                         continue;

 

                 var srvType = guessServiceTypeByURI(u.nodeValue);

                 if (!knownServiceType) {

                         knownServiceType = srvType;

                 }

@@ -282,13 +286,20 @@ function renderService(srv, doc, qxri)
                         uriParts = uriParts[2].match('^(.*)\\?.*screenname=([^&]*)', 'i');

                         if (uriParts) {

                                 linkContent = "<img src=\"chrome://foxri/content/aim_logo.gif\" alt=\"Chat with " + uriParts[2] + "\"/> Chat with " + uriParts[2];

                         }

                 }

 

-                html_uris += "<a href=\""+u.nodeValue+"\">"

+                var linkhref = u.nodeValue;

+                var xrap = uu.getAttribute('append');

+                if(xrap=='qxri') {

+                        linkhref += qxri.replace(/^xri:\/\//,'');

+                }else if(xrap!=null){

+                        dump("Unhandled @append: "+xrap+"\n");

+                }

+                html_uris += "<a href=\""+linkhref+"\">"

                         + linkContent + "</a>";

                 html_uris += "</div>";

         }

 

         var html = "<div class=\"service srv_" + getServiceClass(knownServiceType) + "\">\n";

         html += html_types;

@@ -389,13 +400,18 @@ function guessServiceTypeByMime(mimeType)
 

 function friendlyServiceName(srvType, uri)

 {

         if (srvType && srvType == "xri://+i-service*(+contact)*($v*1.0)") {

                 return "Contact Service";

         }

-        else if (srvType && srvType == "http://openid.net/signon/1.0") {

+        else if (srvType && (

+                             srvType == "http://openid.net/signon/1.0"

+                             || srvType == "http://openid.net/signon/1.1"

+                             || srvType == "http://specs.openid.net/auth/2.0/signon"

+                             || srcType == "http://specs.openid.net/auth/2.0/server"

+                            ) ) {

                 return "OpenID Authentication Service";

         }

         else if (srvType && srvType == "xri://$res*auth*($v*2.0)") {

                 return "Authority Resolution Service";

         }

         else {