Merge pull request #30 from bshaffer/develop

v0.3

.travis.yml

@@ -5,7 +5,7 @@ php:
   - 5.4
   - 5.5
 env:
-  - CONTAINER_CONFIG=Resources/config/services_test.xml
+  - CONTAINER_CONFIG=Tests/Resources/config/services.xml
 before_script:
   - composer install
   - cp phpunit.xml.dist phpunit.xml

Entity/AccessToken.php

@@ -83,6 +83,13 @@ public function getUserId()
      */
     public function setExpires($expires)
     {
+        if (!$expires instanceof \DateTime) {
+            // @see https://github.com/bshaffer/oauth2-server-bundle/issues/24
+            $dateTime = new \DateTime();
+            $dateTime->setTimestamp($expires);
+            $expires = $dateTime;
+        }
+
         $this->expires = $expires;
 
         return $this;

Entity/AuthorizationCode.php

@@ -68,6 +68,13 @@ public function getCode()
      */
     public function setExpires($expires)
     {
+        if (!$expires instanceof \DateTime) {
+            // @see https://github.com/bshaffer/oauth2-server-bundle/issues/24
+            $dateTime = new \DateTime();
+            $dateTime->setTimestamp($expires);
+            $expires = $dateTime;
+        }
+
         $this->expires = $expires;
 
         return $this;

Entity/Client.php

@@ -23,10 +23,15 @@ class Client
     private $redirect_uri;
 
     /**
-     * @var array
+     * @var \OAuth2\ServerBundle\Entity\ClientPublicKey $public_key
      */
     private $grant_types;
 
+    /**
+     * @var string
+     */
+    private $public_key;
+
     /**
      * Set client_id
      *
@@ -145,4 +150,27 @@ public function getScopes()
     {
         return $this->scopes;
     }
+
+    /**
+     * Set public key
+     *
+     * @param  \OAuth2\ServerBundle\Entity\ClientPublicKey $public_key
+     * @return Client
+     */
+    public function setPublicKey(\OAuth2\ServerBundle\Entity\ClientPublicKey $public_key = null)
+    {
+        $this->public_key = $public_key;
+
+        return $this;
+    }
+
+    /**
+     * Get public key
+     *
+     * @return \OAuth2\ServerBundle\Entity\ClientPublicKey
+     */
+    public function getPublicKey()
+    {
+        return $this->public_key;
+    }
 }

Entity/ClientPublicKey.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace OAuth2\ServerBundle\Entity;
+
+/**
+ * Client
+ */
+class ClientPublicKey
+{
+    /**
+     * @var \OAuth2\ServerBundle\Entity\Client
+     */
+    private $client;
+
+    /**
+     * @var integer
+     */
+    private $client_id;
+
+    /**
+     * @var string
+     */
+    private $public_key;
+
+    /**
+     * Set client
+     *
+     * @param  \OAuth2\ServerBundle\Entity\Client $client
+     * @return ClientPublicKey
+     */
+    public function setClient(\OAuth2\ServerBundle\Entity\Client $client = null)
+    {
+        $this->client = $client;
+
+        // this is necessary as the client_id is the primary key
+        $this->client_id = $client->getClientId();
+
+        return $this;
+    }
+
+    /**
+     * Get client
+     *
+     * @return \OAuth2\ServerBundle\Entity\Client
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+    /**
+     * Set public key
+     *
+     * @param  string  $public_key
+     * @return Client
+     */
+    public function setPublicKey($public_key)
+    {
+        $this->public_key = $public_key;
+
+        return $this;
+    }
+
+    /**
+     * Get public key
+     *
+     * @return string
+     */
+    public function getPublicKey()
+    {
+        return $this->public_key;
+    }
+}

Entity/RefreshToken.php

@@ -86,6 +86,13 @@ public function getUserId()
      */
     public function setExpires($expires)
     {
+        if (!$expires instanceof \DateTime) {
+            // @see https://github.com/bshaffer/oauth2-server-bundle/issues/24
+            $dateTime = new \DateTime();
+            $dateTime->setTimestamp($expires);
+            $expires = $dateTime;
+        }
+
         $this->expires = $expires;
 
         return $this;

Manager/ClientManager.php

@@ -9,9 +9,15 @@ class ClientManager
 {
     private $em;
 
-    public function __construct(EntityManager $entityManager)
+    /**
+     * @var ScopeManagerInterface
+     */
+    private $sm;
+
+    public function __construct(EntityManager $entityManager, ScopeManagerInterface $scopeManager)
     {
         $this->em = $entityManager;
+        $this->sm = $scopeManager;
     }
 
     /**
@@ -38,7 +44,7 @@ public function createClient($identifier, array $redirect_uris = array(), array
         // Verify scopes
         foreach ($scopes as $scope) {
             // Get Scope
-            $scopeObject = $this->em->getRepository('OAuth2ServerBundle:Scope')->find($scope);
+            $scopeObject = $this->sm->findScopeByScope($scope);
             if (!$scopeObject) {
                 throw new ScopeNotFoundException();
             }

Manager/ScopeManager.php

@@ -4,7 +4,7 @@
 
 use Doctrine\ORM\EntityManager;
 
-class ScopeManager
+class ScopeManager implements ScopeManagerInterface
 {
     private $em;
 
@@ -34,4 +34,34 @@ public function createScope($scope, $description = null)
 
         return $scopeObject;
     }
+
+    /**
+     * Find a single scope by the scope
+     *
+     * @param $scope
+     * @return Scope
+     */
+    public function findScopeByScope($scope)
+    {
+        $scopeObject = $this->em->getRepository('OAuth2ServerBundle:Scope')->find($scope);
+
+        return $scopeObject;
+    }
+
+    /**
+     * Find all the scopes by an array of scopes
+     *
+     * @param array $scopes
+     * @return mixed|void
+     */
+    public function findScopesByScopes(array $scopes)
+    {
+        $scopeObjects = $this->em->getRepository('OAuth2ServerBundle:Scope')
+            ->createQueryBuilder('a')
+            ->where('a.scope in (?1)')
+            ->setParameter(1, implode(',', $scopes))
+            ->getQuery()->getResult();
+
+        return $scopeObjects;
+    }
 }

Manager/ScopeManagerInterface.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace OAuth2\ServerBundle\Manager;
+
+use Doctrine\ORM\EntityManager;
+
+interface ScopeManagerInterface
+{
+    public function __construct(EntityManager $entityManager);
+
+    /**
+     * Creates a new scope
+     *
+     * @param string $scope
+     *
+     * @param string $description
+     *
+     * @return Scope
+     */
+    public function createScope($scope, $description = null);
+
+    /**
+     * Find a single scope by the scope
+     *
+     * @param $scope
+     * @return Scope
+     */
+    public function findScopeByScope($scope);
+
+    /**
+     * Find all the scopes by an array of scopes
+     *
+     * @param array $scopes
+     * @return mixed
+     */
+    public function findScopesByScopes(array $scopes);
+}

README.md

@@ -1,10 +1,16 @@
 # OAuth2 Server Bundle
 
-OAuth2 Server Bundle for Symfony 2.
+OAuth2 Server Bundle for Symfony 2, built on the [oauth2-server-php](https://github.com/bshaffer/oauth2-server-php) library.
 
-[![Build Status](https://secure.travis-ci.org/bshaffer/oauth2-server-php.png)](http://travis-ci.org/bshaffer/oauth2-server-php)
+[![Build Status](https://secure.travis-ci.org/bshaffer/oauth2-server-bundle.png)](http://travis-ci.org/bshaffer/oauth2-server-bundle)
 
-## Overview
+## Getting Started
+
+See the [Complete Documentation](http://bshaffer.github.io/oauth2-server-php-docs/) for information regarding the OAuth2.0 protocol and the PHP library used by this bundle to implement it.
+
+For documentation specific to this bundle, continue reading below.
+
+## Bundle Overview
 
 The following grant types are supported out the box:
 
@@ -33,23 +39,13 @@ public function tokenAction()
 
 ### Step 1: Add package to Composer
 
-Add the bundle to your composer.json:
-
-``` js
-{
-    "require": {
-        "bshaffer/oauth2-server-bundle": "dev-master"
-    }
-}
-```
-
-Now tell composer to download the bundle by running the command:
+Use composer to add the requirement and download it by running the command:
 
 ``` bash
-$ php composer.phar update bshaffer/oauth2-server-bundle
+$ php composer.phar require bshaffer/oauth2-server-bundle
 ```
 
-Composer will install the bundle to your project's `vendor/bshaffer` directory.
+Composer will update your composer.json and install the bundle to your project's `vendor/bshaffer` directory.
 
 ### Step 2: Enable the bundle
 
@@ -206,4 +202,4 @@ class OAuth2CompilerPass implements CompilerPassInterface
     }
 }
 
-```
+```

Resources/config/doctrine/ClientPublicKey.orm.yml

@@ -0,0 +1,19 @@
+OAuth2\ServerBundle\Entity\ClientPublicKey:
+    type: entity
+    table: oauth_client_public_key
+    id:
+        client_id:
+            type:       string
+            length:     50
+    fields:
+        public_key:
+            type:       text
+    oneToOne:
+      client:
+        targetEntity: OAuth2\ServerBundle\Entity\Client
+        joinColumn:
+          name: client_id
+          referencedColumnName: client_id
+          onDelete: CASCADE
+          onUpdate: CASCADE
+    lifecycleCallbacks: {  }