Make the OpenID settings work with new framework

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

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index 1c1db8fbc4f0aab97dfe72aaa2ef6550d1c95a90..ad03b7019047c98908b0ca8373eae6698cb34aa9 100644 (file)
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -21,21 +21,24 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class AccesstokenAction extends Action {
-       function handle($args) {
-               parent::handle($args);
-               try {
-                       common_debug('getting request from env variables', __FILE__);
-                       $req = OAuthRequest::from_request();
-                       common_debug('getting a server', __FILE__);                     
-                       $server = omb_oauth_server();
-                       common_debug('fetching the access token', __FILE__);                                            
-                       $token = $server->fetch_access_token($req);
-                       common_debug('got this token: "'.print_r($token,TRUE).'"', __FILE__);
-                       common_debug('printing the access token', __FILE__);                                            
-                       print $token;
-               } catch (OAuthException $e) {
-                       common_server_error($e->getMessage());
-               }
-       }
+class AccesstokenAction extends Action
+{
+    function handle($args)
+    {
+        parent::handle($args);
+        try {
+            common_debug('getting request from env variables', __FILE__);
+            common_remove_magic_from_request();
+            $req = OAuthRequest::from_request();
+            common_debug('getting a server', __FILE__);
+            $server = omb_oauth_server();
+            common_debug('fetching the access token', __FILE__);
+            $token = $server->fetch_access_token($req);
+            common_debug('got this token: "'.print_r($token,true).'"', __FILE__);
+            common_debug('printing the access token', __FILE__);
+            print $token;
+        } catch (OAuthException $e) {
+            $this->serverError($e->getMessage());
+        }
+    }
 }