1.0

authbucket · Jul 23, 2014 · bf43aa2 · bf43aa2
1 parent bee97c2
commit bf43aa2
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 66 deletions.
diff --git a/Controller/AuthorizeController.php b/Controller/AuthorizeController.php
@@ -11,63 +11,13 @@
 
 namespace AuthBucket\Bundle\OAuth2Bundle\Controller;
 
-use AuthBucket\OAuth2\Exception\InvalidScopeException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 
 class AuthorizeController extends Controller
 {
     public function authorizeAction(Request $request)
     {
-        // We only handle non-authorized scope here.
-        try {
-            return $this->get('authbucket_oauth2.authorize_controller')->authorizeAction($request);
-        } catch (InvalidScopeException $exception) {
-            $message = unserialize($exception->getMessage());
-            if ($message['error_description'] !== 'The requested scope is invalid.') {
-                throw $exception;
-            }
-        }
-
-        // Fetch parameters, which already checked.
-        $clientId = $request->query->get('client_id');
-        $username = $this->get('security.context')->getToken()->getUser()->getUsername();
-        $scope = preg_split('/\s+/', $request->query->get('scope', ''));
-
-        // Create form.
-        $form = $this->createFormBuilder()->getForm();
-        $form->handleRequest($request);
-
-        // Save authorized scope if submitted by POST.
-        if ($form->isValid()) {
-            $modelManager = $this->get('authbucket_oauth2.model_manager.factory');
-            $authorizeManager = $modelManager->getModelManager('authorize');
-            $authorize = $authorizeManager->findAuthorizeByClientIdAndUsername($clientId, $username);
-
-            // Update existing authorization if possible, else create new.
-            if ($authorize === null) {
-                $authorize = $authorizeManager->createAuthorize();
-            }
-
-            // Save authorization.
-            $authorize->setClientId($clientId)
-                ->setUsername($username)
-                ->setScope(array_merge($authorize->getScope(), $scope));
-            $authorizeManager->updateAuthorize($authorize);
-
-            // Back to this path, with original GET parameters.
-            return $this->redirect($request->getRequestUri());
-        }
-
-        // Display the form.
-        $authorizationRequest = $request->query->all();
-
-        return $this->render('TestBundle:oauth2:authorize.html.twig', array(
-            'client_id' => $clientId,
-            'username' => $username,
-            'scopes' => $scope,
-            'form' => $form->createView(),
-            'authorization_request' => $authorizationRequest,
-        ));
+        return $this->get('authbucket_oauth2.authorize_controller')->authorizeAction($request);
     }
 }
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Here is a minimal example of a `composer.json`:
 
     {
         "require": {
-            "authbucket/oauth2-bundle": "dev-master"
+            "authbucket/oauth2-bundle": "~1.0"
         }
     }
 
@@ -82,6 +82,7 @@ You have to add `AuthBucketOAuth2Bundle` to your `AppKernel.php`:
             $bundles = array(
                 new AuthBucket\Bundle\OAuth2Bundle\AuthBucketOAuth2Bundle(),
             );
+
             return $bundles;
         }
     }
@@ -109,7 +110,7 @@ Below is a list of recipes that cover some common use cases.
 We don't provide custom firewall for this endpoint, which you should
 protect it by yourself, authenticate and capture the user credential,
 e.g. by
-[SecurityServiceProvider](http://silex.sensiolabs.org/doc/providers/security.html):
+[SecurityBundle](http://symfony.com/doc/current/reference/configuration/security.html):
 
     # app/config/security.yml
 
@@ -209,8 +210,8 @@ endpoint:
                     options:
                         token_path:     http://example.com/oauth2/token
                         debug_path:     http://example.com/oauth2/debug
-                        client_id:      'http://democlient1.com/'
-                        client_secret:  'demosecret1'
+                        client_id:      http://democlient1.com/
+                        client_secret:  demosecret1
                         cache:          true
 
 Demo

diff --git a/Tests/TestBundle/Controller/AuthorizeController.php b/Tests/TestBundle/Controller/AuthorizeController.php
@@ -11,13 +11,63 @@
 
 namespace AuthBucket\Bundle\OAuth2Bundle\Tests\TestBundle\Controller;
 
+use AuthBucket\OAuth2\Exception\InvalidScopeException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 
 class AuthorizeController extends Controller
 {
     public function authorizeAction(Request $request)
     {
-        return $this->get('authbucket_oauth2.authorize_controller')->authorizeAction($request);
+        // We only handle non-authorized scope here.
+        try {
+            return $this->get('authbucket_oauth2.authorize_controller')->authorizeAction($request);
+        } catch (InvalidScopeException $exception) {
+            $message = unserialize($exception->getMessage());
+            if ($message['error_description'] !== 'The requested scope is invalid.') {
+                throw $exception;
+            }
+        }
+
+        // Fetch parameters, which already checked.
+        $clientId = $request->query->get('client_id');
+        $username = $this->get('security.context')->getToken()->getUser()->getUsername();
+        $scope = preg_split('/\s+/', $request->query->get('scope', ''));
+
+        // Create form.
+        $form = $this->createFormBuilder()->getForm();
+        $form->handleRequest($request);
+
+        // Save authorized scope if submitted by POST.
+        if ($form->isValid()) {
+            $modelManager = $this->get('authbucket_oauth2.model_manager.factory');
+            $authorizeManager = $modelManager->getModelManager('authorize');
+            $authorize = $authorizeManager->findAuthorizeByClientIdAndUsername($clientId, $username);
+
+            // Update existing authorization if possible, else create new.
+            if ($authorize === null) {
+                $authorize = $authorizeManager->createAuthorize();
+            }
+
+            // Save authorization.
+            $authorize->setClientId($clientId)
+                ->setUsername($username)
+                ->setScope(array_merge($authorize->getScope(), $scope));
+            $authorizeManager->updateAuthorize($authorize);
+
+            // Back to this path, with original GET parameters.
+            return $this->redirect($request->getRequestUri());
+        }
+
+        // Display the form.
+        $authorizationRequest = $request->query->all();
+
+        return $this->render('TestBundle:oauth2:authorize.html.twig', array(
+            'client_id' => $clientId,
+            'username' => $username,
+            'scopes' => $scope,
+            'form' => $form->createView(),
+            'authorization_request' => $authorizationRequest,
+        ));
     }
 }
diff --git a/Tests/TestBundle/Controller/DefaultController.php b/Tests/TestBundle/Controller/DefaultController.php
@@ -43,7 +43,7 @@ public function adminRefreshDatabaseAction(Request $request)
         }
 
         $classes = array();
-        foreach ($this->get('authbucket_oauth2.model') as $class) {
+        foreach ($this->container->getParameter('authbucket_oauth2.model') as $class) {
             $classes[] = $em->getClassMetadata($class);
         }
 

diff --git a/Tests/TestBundle/Resources/config/routing_client.yml b/Tests/TestBundle/Resources/config/routing_client.yml
@@ -1,3 +1,4 @@
 client_index:
     path:       /client
     defaults:   { _controller: TestBundle:Client:clientIndex }
+    methods:    [ GET ]
diff --git a/Tests/TestBundle/Resources/config/routing_demo.yml b/Tests/TestBundle/Resources/config/routing_demo.yml
@@ -1,43 +1,54 @@
 demo_index:
     path:       /demo
     defaults:   { _controller: TestBundle:Demo:demoIndex }
+    methods:    [ GET ]
 
 demo_authorize_code:
     path:       /demo/authorize/code
     defaults:   { _controller: TestBundle:Demo:demoAuthorizeCode }
+    methods:    [ GET ]
 
 demo_authorize_token:
     path:       /demo/authorize/token
     defaults:   { _controller: TestBundle:Demo:demoAuthorizeToken }
+    methods:    [ GET ]
 
 demo_response_type_code:
     path:       /demo/response_type/code
     defaults:   { _controller: TestBundle:Demo:demoResponseTypeCode }
+    methods:    [ GET ]
 
 demo_response_type_token:
     path:       /demo/response_type/token
     defaults:   { _controller: TestBundle:Demo:demoResponseTypeToken }
+    methods:    [ GET ]
 
 demo_grant_type_authorization_code:
     path:       /demo/grant_type/authorization_code
     defaults:   { _controller: TestBundle:Demo:demoGrantTypeAuthorizationCode }
+    methods:    [ GET ]
 
 demo_grant_type_password:
     path:       /demo/grant_type/password
     defaults:   { _controller: TestBundle:Demo:demoGrantTypePassword }
+    methods:    [ GET ]
 
 demo_grant_type_client_credentials:
     path:       /demo/grant_type/client_credentials
     defaults:   { _controller: TestBundle:Demo:demoGrantTypeClientCredentials }
+    methods:    [ GET ]
 
 demo_grant_type_refresh_token:
     path:       /demo/grant_type/refresh_token
     defaults:   { _controller: TestBundle:Demo:demoGrantTypeRefreshToken }
+    methods:    [ GET ]
 
 demo_resource_type_model:
     path:       /demo/resource_type/model
     defaults:   { _controller: TestBundle:Demo:demoResourceTypeModel }
+    methods:    [ GET ]
 
 demo_resource_type_debug_endpoint:
     path:       /demo/resource_type/debug_endpoint
     defaults:   { _controller: TestBundle:Demo:demoResourceTypeDebugEndpoint }
+    methods:    [ GET ]
diff --git a/Tests/TestBundle/Resources/config/routing_oauth2.yml b/Tests/TestBundle/Resources/config/routing_oauth2.yml
@@ -1,19 +1,29 @@
-authbucketoauth2bundle:
-    prefix:     /oauth2
-    resource:   "@AuthBucketOAuth2Bundle/Resources/config/routing.yml"
-
 oauth2_index:
     path:       /oauth2
     defaults:   { _controller: TestBundle:OAuth2:oauth2Index }
+    methods:    [ GET ]
 
 oauth2_login:
     path:       /oauth2/login
     defaults:   { _controller: TestBundle:OAuth2:oauth2Login }
+    methods:    [ GET ]
 
 oauth2_authorize_http:
     path:       /oauth2/authorize/http
+    defaults:   { _controller: AuthBucketOAuth2Bundle:Authorize:authorize }
+    methods:    [ GET ]
+
+oauth2_authorize:
+    pattern:    /oauth2/authorize
     defaults:   { _controller: TestBundle:Authorize:authorize }
-    methods:    [GET]
+
+oauth2_token:
+    pattern:    /oauth2/token
+    defaults:   { _controller: AuthBucketOAuth2Bundle:Token:token }
+
+oauth2_debug:
+    pattern:    /oauth2/debug
+    defaults:   { _controller: AuthBucketOAuth2Bundle:Debug:debug }
 
 oauth2_authorize_login_check:
     path:       /oauth2/authorize/login_check

diff --git a/Tests/TestBundle/Resources/config/routing_resource.yml b/Tests/TestBundle/Resources/config/routing_resource.yml
@@ -1,6 +1,7 @@
 resource_index:
     path:       /resource
     defaults:   { _controller: TestBundle:Resource:resourceIndex }
+    methods:    [ GET ]
 
 resource_resource_type_model:
     path:       /resource/resource_type/model

diff --git a/Tests/TestBundle/Resources/views/index.html.twig b/Tests/TestBundle/Resources/views/index.html.twig
@@ -25,7 +25,7 @@
                 <p>Here is a minimal example of a <code>composer.json</code>:</p>
 <pre><code class="json">{
     &quot;require&quot;: {
-        &quot;authbucket/oauth2-bundle&quot;: &quot;dev-master&quot;
+        &quot;authbucket/oauth2-bundle&quot;: &quot;~1.0&quot;
     }
 }</code></pre>
 
@@ -69,6 +69,7 @@ class AppKernel extends Kernel
         $bundles = array(
             new AuthBucket\Bundle\OAuth2Bundle\AuthBucketOAuth2Bundle(),
         );
+
         return $bundles;
     }
 }</code></pre>
@@ -84,7 +85,7 @@ authbucketoauth2bundle:
                 <p>Below is a list of recipes that cover some common use cases.</p>
 
                 <h3 id="authorization-endpoint">Authorization Endpoint</h3>
-                <p>We don't provide custom firewall for this endpoint, which you should protect it by yourself, authenticate and capture the user credential, e.g. by <a href="http://silex.sensiolabs.org/doc/providers/security.html">SecurityServiceProvider</a>:</p>
+                <p>We don't provide custom firewall for this endpoint, which you should protect it by yourself, authenticate and capture the user credential, e.g. by <a href="http://symfony.com/doc/current/reference/configuration/security.html">SecurityBundle</a>:</p>
 <pre><code class="no-highlight"># app/config/security.yml
 
 security:

diff --git a/Tests/TestBundle/TestBundle.php b/Tests/TestBundle/TestBundle.php
@@ -18,6 +18,5 @@ class TestBundle extends Bundle
 {
     public function bulid(ContainerBuilder $container)
     {
-
     }
 }
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "minimum-stability": "dev",
     "name": "authbucket/oauth2-bundle",
     "require": {
-        "authbucket/oauth2": "dev-master",
+        "authbucket/oauth2": "~1.0",
         "php": ">=5.3.3",
         "symfony/framework-bundle": "~2.3",
         "symfony/security-bundle": "~2.3"