From bed4c98534d9cb4838ae20f3dde56de8fd82cd09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20M=2E=20Gonz=C3=A1lez=20Mart=C3=ADn?= Date: Tue, 25 Apr 2017 16:13:49 +0100 Subject: [PATCH 1/8] Update .semver --- .semver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semver b/.semver index 6700f56e3..75bf20832 100644 --- a/.semver +++ b/.semver @@ -1,5 +1,5 @@ --- :major: 5 :minor: 0 -:patch: 2 +:patch: 3 :special: '' From 3ea39ad28baef0d60fff19c980bb4e2b502b7b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20M=2E=20Gonz=C3=A1lez=20Mart=C3=ADn?= Date: Tue, 25 Apr 2017 16:15:41 +0100 Subject: [PATCH 2/8] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bafddcc6..39f171a84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ Changelog Releases for CakePHP 3 ------------- +* 5.0.3 + * Implemented event dispatching on social login + * Fixed bugs reported + * Don't check for allowed actions in other controllers + * 5.0.2 * Fixed bug parsing rule urls when application installed in a subdirectory From 51a74644a7048f6e44db7ecf70a005931bdcbe97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20M=2E=20Gonz=C3=A1lez=20Mart=C3=ADn?= Date: Tue, 25 Apr 2017 16:16:04 +0100 Subject: [PATCH 3/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a20f99bc6..8c397f8ac 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Versions and branches | CakePHP | CakeDC Users Plugin | Tag | Notes | | :-------------: | :------------------------: | :--: | :---- | | 2.x | [2.x](https://github.com/cakedc/users/tree/2.x) | 2.1.2 | Note CakePHP 2.7 is currently not supported, we are working on it now | -| 3.4+ | [master](https://github.com/cakedc/users/tree/master) | 5.0.2 | stable | +| 3.4+ | [master](https://github.com/cakedc/users/tree/master) | 5.0.3 | stable | | 3.4+ | [develop](https://github.com/cakedc/users/tree/develop) | - | unstable | | 3.0 | [3.0.x](https://github.com/cakedc/users/tree/3.0.x) | 3.0.0 | stable | | 3.1 | [3.1.x](https://github.com/cakedc/users/tree/3.1.x) | 3.1.0 | stable | From 18182259b6cffed1849a77f8f640676adc95380f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20M=2E=20Gonz=C3=A1lez=20Mart=C3=ADn?= Date: Mon, 8 May 2017 13:33:55 +0100 Subject: [PATCH 4/8] improve example permissions.php file --- config/permissions.php | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/config/permissions.php b/config/permissions.php index 9db03d365..c4e296fa1 100644 --- a/config/permissions.php +++ b/config/permissions.php @@ -1,11 +1,11 @@ [ + //admin role allowed to all the things [ - 'role' => '*', - 'plugin' => 'CakeDC/Users', + 'role' => 'admin', + 'prefix' => '*', + 'extension' => '*', + 'plugin' => '*', 'controller' => '*', 'action' => '*', ], + //specific actions allowed for the all roles in Users plugin [ - 'role' => 'user', + 'role' => '*', 'plugin' => 'CakeDC/Users', 'controller' => 'Users', - 'action' => ['register', 'edit', 'view'], + 'action' => ['profile', 'logout'], ], [ 'role' => '*', @@ -77,17 +81,12 @@ return false; } ], + //all roles allowed to Pages/display [ - 'role' => 'user', - 'plugin' => 'CakeDC/Users', - 'controller' => 'Users', - 'action' => '*', - 'allowed' => false, - ], - [ - 'role' => ['user'], - 'controller' => ['Pages'], - 'action' => ['other', 'display'], - 'allowed' => true, + 'role' => '*', + //'plugin' => null, + 'controller' => 'Pages', + 'action' => 'display', ], - ]]; + ] +]; From 0618cb68f3eac5811007dc7cfacdba87eb6701f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20M=2E=20Gonz=C3=A1lez=20Mart=C3=ADn?= Date: Mon, 8 May 2017 13:35:40 +0100 Subject: [PATCH 5/8] Update permissions.php --- config/permissions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/permissions.php b/config/permissions.php index c4e296fa1..4a9efbfde 100644 --- a/config/permissions.php +++ b/config/permissions.php @@ -1,11 +1,11 @@ Date: Mon, 8 May 2017 16:25:40 +0100 Subject: [PATCH 6/8] update codesniffer to stable --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 303ead93f..40c825cdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,9 @@ before_script: - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi" - - sh -c "if [ '$PHPCS' = '1' ]; then composer require cakephp/cakephp-codesniffer:dev-master; fi" + - sh -c "if [ '$PHPCS' = '1' ]; then composer require 'cakephp/cakephp-codesniffer:@stable'; fi" - - sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi" + - sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev 'satooshi/php-coveralls:@stable'; fi" - sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi" script: From 8f8da6ec50a5d9a153d961df9606c0d78fffd51f Mon Sep 17 00:00:00 2001 From: Alejandro Ibarra Date: Wed, 17 May 2017 14:40:28 -0500 Subject: [PATCH 7/8] Implement dynamic providers --- src/Auth/SocialAuthenticate.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Auth/SocialAuthenticate.php b/src/Auth/SocialAuthenticate.php index 0fbbe059a..3406144ba 100755 --- a/src/Auth/SocialAuthenticate.php +++ b/src/Auth/SocialAuthenticate.php @@ -201,6 +201,7 @@ protected function _authenticate(ServerRequest $request) $code = $request->getQuery('code'); try { + $token = $provider->getAccessToken('authorization_code', compact('code')); return compact('token') + $provider->getResourceOwner($token)->toArray(); @@ -433,10 +434,10 @@ public function getUser(ServerRequest $request) protected function _getProviderName($request = null) { $provider = false; - if (!is_null($this->_provider)) { - $provider = SocialUtils::getProvider($this->_provider); - } elseif (!empty($request)) { + if (!empty($request->getParam('provider'))) { $provider = ucfirst($request->getParam('provider')); + } elseif (!is_null($this->_provider)) { + $provider = SocialUtils::getProvider($this->_provider); } return $provider; @@ -455,7 +456,7 @@ protected function _mapUser($provider, $data) if (empty($provider)) { throw new MissingProviderException(__d('CakeDC/Users', "Provider cannot be empty")); } - $providerMapperClass = "\\CakeDC\\Users\\Auth\\Social\\Mapper\\$provider"; + $providerMapperClass = $this->getConfig('providers.' . strtolower($provider) . '.options.mapper') ?: "\\CakeDC\\Users\\Auth\\Social\\Mapper\\$provider"; $providerMapper = new $providerMapperClass($data); $user = $providerMapper(); $user['provider'] = $provider; From be8a9f7db7b2bb6cab62684184b3191a1f42b0c7 Mon Sep 17 00:00:00 2001 From: Alejandro Ibarra Date: Wed, 17 May 2017 15:00:56 -0500 Subject: [PATCH 8/8] Fix phpcs --- src/Auth/SocialAuthenticate.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Auth/SocialAuthenticate.php b/src/Auth/SocialAuthenticate.php index 3406144ba..4ce4fb648 100755 --- a/src/Auth/SocialAuthenticate.php +++ b/src/Auth/SocialAuthenticate.php @@ -201,7 +201,6 @@ protected function _authenticate(ServerRequest $request) $code = $request->getQuery('code'); try { - $token = $provider->getAccessToken('authorization_code', compact('code')); return compact('token') + $provider->getResourceOwner($token)->toArray();