better error reporting in user authorization action

[quix0rs-gnu-social.git] / actions / xrds.php

diff --git a/actions/xrds.php b/actions/xrds.php
index 4a9c3454c249bb5653b6be2e8294e917339c03f7..1d516aab72e78d6681e7b6d614f71810fc146eb5 100644 (file)
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -19,51 +19,114 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('OPENMICROBLOGGING01', 'http://openmicroblogging.org/protocol/0.1');
+require_once(INSTALLDIR.'/lib/omb.php');
 
 class XrdsAction extends Action {
 
+       function is_readonly() {                                
+               return true;
+       }
+
        function handle($args) {
                parent::handle($args);
                $nickname = $this->trimmed('nickname');
                $user = User::staticGet('nickname', $nickname);
                if (!$user) {
-                       common_user_error(_t('No such user.'));
+                       common_user_error(_('No such user.'));
                        return;
                }
                $this->show_xrds($user);
        }
 
        function show_xrds($user) {
-               
-               header('Content-Type: application/rdf+xml');
+
+               header('Content-Type: application/xrds+xml');
 
                common_start_xml();
-               common_element_start('xrds:XRDS', array('xmlns:xrds' => 'xri://$xrds',
-                                                                                               'xmlns' => 'xri://$xrd*($v*2.0)'));
-               common_element_start('XRD');
+               common_element_start('XRDS', array('xmlns' => 'xri://$xrds'));
+
+               common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                                 'xml:id' => 'oauth',
+                                                                                 'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
+                                                                                 'version' => '2.0'));
 
-               $this->show_service(OPENMICROBLOGGING01.'/identifier',
+               common_element('Type', NULL, 'xri://$xrds*simple');
+
+               $this->show_service(OAUTH_ENDPOINT_REQUEST,
+                                                       common_local_url('requesttoken'),
+                                                       array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
+                                                       array(OAUTH_HMAC_SHA1),
                                                        $user->uri);
 
+               $this->show_service(OAUTH_ENDPOINT_AUTHORIZE,
+                                                       common_local_url('userauthorization'),
+                                                       array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
+                                                       array(OAUTH_HMAC_SHA1));
+
+               $this->show_service(OAUTH_ENDPOINT_ACCESS,
+                                                       common_local_url('accesstoken'),
+                                                       array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
+                                                       array(OAUTH_HMAC_SHA1));
+
+               $this->show_service(OAUTH_ENDPOINT_RESOURCE,
+                                                       NULL,
+                                                       array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
+                                                       array(OAUTH_HMAC_SHA1));
+
+               common_element_end('XRD');
+
                # XXX: decide whether to include user's ID/nickname in postNotice URL
-               
-               foreach (array('requestToken', 'userAuthorization',
-                                          'accessToken', 'postNotice',
-                                          'updateProfile') as $type) {
-                       $this->show_service(OPENMICROBLOGGING01.'/'.$type,
-                                                               common_local_url(strtolower($type)));
-               }
-               
+
+               common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                                 'xml:id' => 'omb',
+                                                                                 'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
+                                                                                 'version' => '2.0'));
+
+               common_element('Type', NULL, 'xri://$xrds*simple');
+
+               $this->show_service(OMB_ENDPOINT_POSTNOTICE,
+                                                       common_local_url('postnotice'));
+
+               $this->show_service(OMB_ENDPOINT_UPDATEPROFILE,
+                                                       common_local_url('updateprofile'));
+
+               common_element_end('XRD');
+
+               common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                                                                 'version' => '2.0'));
+
+               common_element('Type', NULL, 'xri://$xrds*simple');
+
+               $this->show_service(OAUTH_DISCOVERY,
+                                                       '#oauth');
+               $this->show_service(OMB_NAMESPACE,
+                                                       '#omb');
+
                common_element_end('XRD');
-               common_element_end('xrds:XRDS');
+
+               common_element_end('XRDS');
                common_end_xml();
        }
-       
-       function show_service($type, $uri) {
+
+       function show_service($type, $uri, $params=NULL, $sigs=NULL, $localId=NULL) {
                common_element_start('Service');
-               common_element('Type', $type);
-               common_element('URI', $uri);
+               if ($uri) {
+                       common_element('URI', NULL, $uri);
+               }
+               common_element('Type', NULL, $type);
+               if ($params) {
+                       foreach ($params as $param) {
+                               common_element('Type', NULL, $param);
+                       }
+               }
+               if ($sigs) {
+                       foreach ($sigs as $sig) {
+                               common_element('Type', NULL, $sig);
+                       }
+               }
+               if ($localId) {
+                       common_element('LocalID', NULL, $localId);
+               }
                common_element_end('Service');
        }
 }
\ No newline at end of file