Fixes for examples

examples/composer.lock

@@ -145,21 +145,16 @@
         {
             "name": "league/oauth2-server",
             "version": "dev-V5-WIP",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/oauth2-server.git",
-                "reference": "95919a688e29c911d1e4e83112cacd18f719700f"
-            },
             "dist": {
                 "type": "path",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/95919a688e29c911d1e4e83112cacd18f719700f",
+                "url": "../",
-                "reference": "168e7640c6e8217b7e961151de522810b3edce6e",
+                "reference": "d635b3484bdf41b494b6e6107f88ad61f9859af7",
                 "shasum": null
             },
             "require": {
                 "lcobucci/jwt": "^3.1",
                 "league/event": "~2.1",
-                "namshi/jose": "^6.0",
+                "paragonie/random_compat": "^1.1",
                 "php": ">=5.5.9",
                 "zendframework/zend-diactoros": "~1.1"
             },
@@ -168,10 +163,14 @@
                 "lncd/oauth2": "*"
             },
             "require-dev": {
-                "codeception/codeception": "~2.0",
+                "league/plates": "^3.1",
-                "flow/jsonpath": "0.2.*",
+                "phpunit/phpunit": "^4.8"
-                "mockery/mockery": "0.9.*",
+            },
-                "phpunit/phpunit": "4.8.*"
+            "suggest": {
+                "league/plates": "Used for parsing authorization code templates",
+                "mustache/mustache": "Used for parsing authorization code templates",
+                "smarty/smarty": "Used for parsing authorization code templates",
+                "twig/twig": "Used for parsing authorization code templates"
             },
             "type": "library",
             "extra": {
@@ -186,7 +185,7 @@
             },
             "autoload-dev": {
                 "psr-4": {
-                    "LeagueTests\\": "tests/unit/"
+                    "LeagueTests\\": "tests/"
                 }
             },
             "license": [
@@ -271,66 +270,6 @@
             ],
             "time": "2015-07-09 02:14:40"
         },
-        {
-            "name": "namshi/jose",
-            "version": "6.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/namshi/jose.git",
-                "reference": "0ae1eae2be4f7e31a649ab9e3b782c3aedf81ebd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/namshi/jose/zipball/0ae1eae2be4f7e31a649ab9e3b782c3aedf81ebd",
-                "reference": "0ae1eae2be4f7e31a649ab9e3b782c3aedf81ebd",
-                "shasum": ""
-            },
-            "require": {
-                "ext-date": "*",
-                "ext-hash": "*",
-                "ext-json": "*",
-                "ext-openssl": "*",
-                "ext-pcre": "*",
-                "ext-spl": "*",
-                "php": ">=5.5",
-                "phpseclib/phpseclib": "2.0.*"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.5|^5.0",
-                "satooshi/php-coveralls": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Namshi\\JOSE": "src/",
-                    "Namshi\\JOSE\\Test": "test/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Alessandro Nadalin",
-                    "email": "alessandro.nadalin@gmail.com"
-                },
-                {
-                    "name": "Alessandro Cinelli (cirpo)",
-                    "email": "alessandro.cinelli@gmail.com"
-                }
-            ],
-            "description": "JSON Object Signing and Encryption library for PHP.",
-            "keywords": [
-                "JSON Web Signature",
-                "JSON Web Token",
-                "JWS",
-                "json",
-                "jwt",
-                "token"
-            ],
-            "time": "2016-01-13 10:17:13"
-        },
         {
             "name": "nikic/fast-route",
             "version": "v0.6.0",
@@ -375,92 +314,52 @@
             "time": "2015-06-18 19:15:47"
         },
         {
-            "name": "phpseclib/phpseclib",
+            "name": "paragonie/random_compat",
-            "version": "2.0.0",
+            "version": "v1.2.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpseclib/phpseclib.git",
+                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "a74aa9efbe61430fcb60157c8e025a48ec8ff604"
+                "reference": "b3313b618f4edd76523572531d5d7e22fe747430"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/a74aa9efbe61430fcb60157c8e025a48ec8ff604",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/b3313b618f4edd76523572531d5d7e22fe747430",
-                "reference": "a74aa9efbe61430fcb60157c8e025a48ec8ff604",
+                "reference": "b3313b618f4edd76523572531d5d7e22fe747430",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.2.0"
             },
             "require-dev": {
-                "phing/phing": "~2.7",
+                "phpunit/phpunit": "4.*|5.*"
-                "phpunit/phpunit": "~4.0",
-                "sami/sami": "~2.0",
-                "squizlabs/php_codesniffer": "~2.0"
             },
             "suggest": {
-                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-                "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
-                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
-                "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 5.0.0."
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
+                "files": [
-                    "phpseclib\\": "phpseclib/"
+                    "lib/random.php"
-                }
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "phpseclib/"
-            ],
             "license": [
                 "MIT"
             ],
             "authors": [
                 {
-                    "name": "Jim Wigginton",
+                    "name": "Paragon Initiative Enterprises",
-                    "email": "terrafrost@php.net",
+                    "email": "security@paragonie.com",
-                    "role": "Lead Developer"
+                    "homepage": "https://paragonie.com"
-                },
-                {
-                    "name": "Patrick Monnerat",
-                    "email": "pm@datasphere.ch",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Andreas Fischer",
-                    "email": "bantu@phpbb.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Hans-Jürgen Petrich",
-                    "email": "petrich@tronic-media.com",
-                    "role": "Developer"
                 }
             ],
-            "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-            "homepage": "http://phpseclib.sourceforge.net",
             "keywords": [
-                "BigInteger",
+                "csprng",
-                "aes",
+                "pseudorandom",
-                "asn.1",
+                "random"
-                "asn1",
-                "blowfish",
-                "crypto",
-                "cryptography",
-                "encryption",
-                "rsa",
-                "security",
-                "sftp",
-                "signature",
-                "signing",
-                "ssh",
-                "twofish",
-                "x.509",
-                "x509"
             ],
-            "time": "2015-08-04 04:48:03"
+            "time": "2016-03-11 19:54:08"
         },
         {
             "name": "pimple/pimple",

examples/src/Entities/ClientEntity.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace OAuth2ServerExamples\Entities;
+
+use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface;
+use League\OAuth2\Server\Entities\Traits\EntityTrait;
+
+class ClientEntity implements ClientEntityInterface
+{
+    use EntityTrait;
+
+    private $name;
+
+    private $secret;
+
+    private $redirectUri;
+
+    /**
+     * Get the client's name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set the client's name.
+     *
+     * @param string $name
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * @param string $secret
+     */
+    public function setSecret($secret)
+    {
+        $this->secret = $secret;
+    }
+
+    /**
+     * Get the hashed client secret
+     *
+     * @return string
+     */
+    public function getSecret()
+    {
+        return $this->secret;
+    }
+
+    /**
+     * Set the client's redirect uri.
+     *
+     * @param string $redirectUri
+     */
+    public function setRedirectUri($redirectUri)
+    {
+        $this->redirectUri = $redirectUri;
+    }
+
+    /**
+     * Returns the registered redirect URI.
+     *
+     * @return string
+     */
+    public function getRedirectUri()
+    {
+        return $this->redirectUri;
+    }
+
+    /**
+     * Returns true if the client is capable of keeping it's secrets secret.
+     *
+     * @return bool
+     */
+    public function canKeepASecret()
+    {
+        return $this->secret !== null;
+    }
+}

examples/src/Entities/ScopeEntity.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace OAuth2ServerExamples\Entities;
+
+use League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface;
+use League\OAuth2\Server\Entities\Traits\EntityTrait;
+
+class ScopeEntity implements ScopeEntityInterface
+{
+    use EntityTrait;
+
+    function jsonSerialize()
+    {
+        return $this->getIdentifier();
+    }
+}

examples/src/Repositories/ClientRepository.php

@@ -2,8 +2,8 @@
 
 namespace OAuth2ServerExamples\Repositories;
 
-use League\OAuth2\Server\Entities\ClientEntity;
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
+use OAuth2ServerExamples\Entities\ClientEntity;
 
 class ClientRepository implements ClientRepositoryInterface
 {
@@ -22,22 +22,14 @@ class ClientRepository implements ClientRepositoryInterface
 
         // Check if client is registered
         if (array_key_exists($clientIdentifier, $clients) === false) {
-            return;
+            return null;
-        }
-
-        // Check if client secret is valid
-        if ($clientSecret !== null && password_verify($clientSecret, $clients[$clientIdentifier]['secret']) === false) {
-            return;
-        }
-
-        // Check if redirect URI is valid
-        if ($redirectUri !== null && $redirectUri !== $clients[$clientIdentifier]['redirect_uri']) {
-            return;
         }
 
         $client = new ClientEntity();
         $client->setIdentifier($clientIdentifier);
         $client->setName($clients[$clientIdentifier]['name']);
+        $client->setRedirectUri($clients[$clientIdentifier]['redirect_uri']);
+        $client->setSecret($clients[$clientIdentifier]['secret']);
 
         return $client;
     }

examples/src/Repositories/ScopeRepository.php

@@ -2,8 +2,8 @@
 
 namespace OAuth2ServerExamples\Repositories;
 
-use League\OAuth2\Server\Entities\ScopeEntity;
 use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
+use OAuth2ServerExamples\Entities\ScopeEntity;
 
 class ScopeRepository implements ScopeRepositoryInterface
 {
@@ -22,7 +22,7 @@ class ScopeRepository implements ScopeRepositoryInterface
         ];
 
         if (array_key_exists($scopeIdentifier, $scopes) === false) {
-            return;
+            return null;
         }
 
         $scope = new ScopeEntity();