From 92938f0e591286b67a752af441e55626155af524 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Thu, 21 Aug 2014 17:09:07 +0200
Subject: [PATCH 1/1] use factory method for oauthprovider

---
 controller/apicontroller.php   |  2 +-
 controller/oauthcontroller.php |  6 +++---
 lib/oauth.php                  | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/controller/apicontroller.php b/controller/apicontroller.php
index 4c7af48..aa21429 100644
--- a/controller/apicontroller.php
+++ b/controller/apicontroller.php
@@ -67,7 +67,7 @@ class ApiController extends Controller
         $urlGen = $deps->urlGen;
 
         try {
-            $provider = new \OAuthProvider();
+            $provider = OAuth::getProvider();
             $oauth->registerHandler($provider)
                 ->registerAccessTokenHandler($provider);
             $provider->checkOAuthRequest(
diff --git a/controller/oauthcontroller.php b/controller/oauthcontroller.php
index d02b7b8..29198bc 100644
--- a/controller/oauthcontroller.php
+++ b/controller/oauthcontroller.php
@@ -72,7 +72,7 @@ class OauthController extends Controller
         $urlGen = $this->deps->urlGen;
 
         try {
-            $provider = new \OAuthProvider();
+            $provider = OAuth::getProvider();
             $oauth->registerHandler($provider)
                 ->registerVerificationTokenHandler($provider);
             $provider->checkOAuthRequest(
@@ -167,7 +167,7 @@ class OauthController extends Controller
         }
 
         //the user is logged in and authorized
-        $provider = new \OAuthProvider();
+        $provider = OAuth::getProvider();
 
         $newToken = new Token('verify');
         $newToken->tokenKey = $token->tokenKey;
@@ -230,7 +230,7 @@ class OauthController extends Controller
         $urlGen = $this->deps->urlGen;
 
         try {
-            $provider = new \OAuthProvider();
+            $provider = OAuth::getProvider();
             $oauth->registerHandler($provider);
             $provider->isRequestTokenEndpoint(true);
             $provider->checkOAuthRequest(
diff --git a/lib/oauth.php b/lib/oauth.php
index 7cfd4e0..e2eb651 100644
--- a/lib/oauth.php
+++ b/lib/oauth.php
@@ -106,7 +106,7 @@ class OAuth
     public function verifyOAuthUser($username, $url)
     {
         try {
-            $provider = new \OAuthProvider();
+            $provider = OAuth::getProvider();
             $this->registerHandler($provider);
             $this->registerAccessTokenHandler($provider);
             //do not use "user" in signature
@@ -131,5 +131,16 @@ class OAuth
         //var_dump($e);
         exit(1);
     }
+
+    /**
+     * Get a new oauth provider instance.
+     * Used to work around the fastcgi bug in oauthprovider.
+     * 
+     * @return \OAuthProvider
+     */
+    public static function getProvider()
+    {
+        return new \OAuthProvider();
+    }
 }
 ?>
-- 
2.30.2