From 6e601c11718d075cf17c463e997023058f18aa99 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 12 Nov 2009 14:21:47 +0000 Subject: Wrong XRDS service type for OMB was being supplied. Wrong since commit 54696f7c I think --- actions/xrds.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actions/xrds.php') diff --git a/actions/xrds.php b/actions/xrds.php index 8f09557d1..5db3489ad 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -117,7 +117,7 @@ class XrdsAction extends Action //omb $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xml:id' => 'oauth', + 'xml:id' => 'omb', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); -- cgit v1.2.3-54-g00ecf From 707efadbd4b44435741ad9b2b972a77f4069e689 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 12 Nov 2009 14:46:16 +0000 Subject: Some more XRDS fixes. With this and the previous commit, remote subs seem to work. Otherwise they don't. --- actions/xrds.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'actions/xrds.php') diff --git a/actions/xrds.php b/actions/xrds.php index 5db3489ad..76ccc9c6e 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -97,22 +97,18 @@ class XrdsAction extends Action $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_REQUEST, common_local_url('requesttoken'), - array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); - $xrdsOutputter->showXrdsService( OAUTH_ENDPOINT_AUTHORIZE, - common_local_url('userauthorization'), array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1), null, - $this->user->getIdentifierURI()); + $this->user->uri); + $xrdsOutputter->showXrdsService( OAUTH_ENDPOINT_AUTHORIZE, + common_local_url('userauthorization'), + array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_ACCESS, common_local_url('accesstoken'), - array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1), - null, - $this->user->getIdentifierURI()); + array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_RESOURCE, null, - array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1), - null, - $this->user->getIdentifierURI()); + array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); $xrdsOutputter->elementEnd('XRD'); //omb -- cgit v1.2.3-54-g00ecf From d8296df5d73fc189d393cddd9e2277f7c8a4cbf6 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 12 Nov 2009 20:57:09 +0000 Subject: A further change to the XRDS is required if 0.9.x is to be able to remote sub to a 0.8.x account, with the OpenID plugin enabled. --- actions/xrds.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'actions/xrds.php') diff --git a/actions/xrds.php b/actions/xrds.php index 76ccc9c6e..534182e3e 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -123,10 +123,10 @@ class XrdsAction extends Action common_local_url('updateprofile')); $xrdsOutputter->elementEnd('XRD'); + Event::handle('EndUserXRDS', array($this,&$xrdsOutputter)); + //misc $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xml:id' => 'oauth', - 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); $xrdsOutputter->showXrdsService(OAUTH_DISCOVERY, '#oauth'); @@ -134,8 +134,6 @@ class XrdsAction extends Action '#omb'); $xrdsOutputter->elementEnd('XRD'); - Event::handle('EndUserXRDS', array($this,&$xrdsOutputter)); - $xrdsOutputter->endXRDS(); } -- cgit v1.2.3-54-g00ecf