Moar tests and updated documentation

Author: Luca Degasperi

README.md

@@ -85,12 +85,7 @@ state=1234567890
 Route::get('/oauth/authorize', array('before' => 'check-authorization-params|auth', function()
 {
     // get the data from the check-authorization-params filter
-    $params['client_id'] = Session::get('client_id');
-    $params['client_details'] = Session::get('client_details');
-    $params['redirect_uri'] = Session::get('redirect_uri');
-    $params['response_type'] = Session::get('response_type');
-    $params['scopes'] = Session::get('scopes');
-    $params['state'] = Session::get('state');
+    $params = Session::get('authorize-params');
 
     // get the user id
     $params['user_id'] = Auth::user()->id;
@@ -104,46 +99,26 @@ Route::get('/oauth/authorize', array('before' => 'check-authorization-params|aut
 Route::post('/oauth/authorize', array('before' => 'check-authorization-params|auth|csrf', function()
 {
     // get the data from the check-authorization-params filter
-    $params['client_id'] = Session::get('client_id');
-    $params['client_details'] = Session::get('client_details');
-    $params['redirect_uri'] = Session::get('redirect_uri');
-    $params['response_type'] = Session::get('response_type');
-    $params['scopes'] = Session::get('scopes');
-    $params['state'] = Session::get('state');
+    $params = Session::get('authorize-params')
 
     // get the user id
     $params['user_id'] = Auth::user()->id;
 
     // check if the user approved or denied the authorization request
     if (Input::get('approve') !== null) {
 
-        $code = AuthorizationServer::getGrantType('authorization_code')->newAuthoriseRequest('user', $params['user_id'], $params);
+        $code = AuthorizationServer::newAuthorizeRequest('user', $params['user_id'], $params);
 
-        // not appropriate
-        Session::flush();
+        Session::forget('authorize-params');
 
-        return Redirect::to(
-            AuthorizationServer::makeRedirect($params['redirect_uri'],
-            array(
-                'code'  =>  $code,
-                'state' =>  isset($params['state']) ? $params['state'] : ''
-            )
-        ));
+        return Redirect::to(AuthorizationServer::makeRedirectWithCode($code, $params));
     }
 
     if (Input::get('deny') !== null) {
 
-        // just for demonstration purposes (you should flush the vars individually)
-        Session::flush();
+        Session::forget('authorize-params');
 
-        return Redirect::to(
-            AuthorizationServer::makeRedirect($params['redirect_uri'],
-            array(
-                'error' =>  'access_denied',
-                'error_message' =>  AuthorizationServer::getExceptionMessage('access_denied'),
-                'state' =>  isset($params['state']) ? $params['state'] : ''
-            )
-        ));
+        return Redirect::to(AuthorizationServer::makeRedirectWithError($params));
     }
 });
 ```

src/LucaDegasperi/OAuth2Server/Proxies/AuthorizationServerProxy.php

@@ -38,11 +38,33 @@ public function makeRedirect($uri, $params = array(), $queryDelimeter = '?')
         return RedirectUri::make($uri, $params, $queryDelimeter);
     }
 
+    public function makeRedirectWithCode($code, $params = array())
+    {                
+        return $this->makeRedirect($params['redirect_uri'], array(
+            'code'  =>  $code,
+            'state' =>  isset($params['state']) ? $params['state'] : '',
+        ));
+    }
+
+    public function makeRedirectWithError($params = array())
+    {                
+        return $this->makeRedirect($params['redirect_uri'], array(
+            'error' =>  'access_denied',
+            'error_message' =>  $this->authServer->getExceptionMessage('access_denied'),
+            'state' =>  isset($params['state']) ? $params['state'] : ''
+        ));
+    }
+
     public function checkAuthorizeParams()
     {
         return $this->authServer->getGrantType('authorization_code')->checkAuthoriseParams();
     }
 
+    public function newAuthorizeRequest($owner, $owner_id, $options)
+    {
+        return $this->authServer->getGrantType('authorization_code')->newAuthoriseRequest($owner, $owner_id, $options);
+    }
+
     public function performAccessTokenFlow()
     {
         try {
@@ -61,7 +83,9 @@ public function performAccessTokenFlow()
             // make this better in order to return the correct headers via the response object
             $headers = $this->authServer->getExceptionHttpHeaders($this->authServer->getExceptionType($e->getCode()));
             foreach ($headers as $header) {
+                // @codeCoverageIgnoreStart
                 header($header);
+                // @codeCoverageIgnoreEnd
             }
 
         } catch (Exception $e) {

tests/AuthorizationServerProxyTest.php

@@ -36,6 +36,35 @@ public function test_make_redirect()
         $this->assertEquals('example?', $result);
     }
 
+    public function test_make_redirect_with_code()
+    {
+        $proxy = $this->getProxy($this->getMock());
+
+        $result = $proxy->makeRedirectWithCode('1234567890', array('redirect_uri' => 'example'));
+
+        $this->assertEquals('example?code=1234567890&state=', $result);
+
+        $result = $proxy->makeRedirectWithCode('1234567890', array('redirect_uri' => 'example', 'state' => 'random'));
+
+        $this->assertEquals('example?code=1234567890&state=random', $result);
+    }
+
+    public function test_make_redirect_with_error()
+    {
+        $mock = $this->getMock();
+        $mock->shouldReceive('getExceptionMessage')->twice()->andReturn('error_message');
+
+        $proxy = $this->getProxy($mock);
+
+        $result = $proxy->makeRedirectWithError(array('redirect_uri' => 'example'));
+
+        $this->assertEquals('example?error=access_denied&error_message=error_message&state=', $result);
+
+        $result = $proxy->makeRedirectWithError(array('redirect_uri' => 'example', 'state' => 'random'));
+
+        $this->assertEquals('example?error=access_denied&error_message=error_message&state=random', $result);
+    }
+
     public function test_check_authorize_params()
     {
         $mock = $this->getMock();