+
+2) Google Authentation app
+
+
+
diff --git a/Docs/Documentation/UserHelper.md b/Docs/Documentation/UserHelper.md
index 2191f4c1f..920f37f98 100644
--- a/Docs/Documentation/UserHelper.md
+++ b/Docs/Documentation/UserHelper.md
@@ -30,6 +30,20 @@ echo $this->User->socialLogin($provider); //provider is 'facebook', 'twitter', e
We recommend the use of [Bootstrap Social](http://lipis.github.io/bootstrap-social/) in order to automatically apply styles to buttons. Anyway you can always add your own style to the buttons.
+Connect Social Account
+-----------------
+
+You can use the helper included with the plugin to create some 'Connect with Facebook/Twitter' buttons:
+
+In templates, call socialConnectLinkList method to get links for all social providers enabled
+```php
+echo $this->User->socialConnectLinkList($user->social_accounts);
+```
+
+We recommend the use of [Bootstrap Social](http://lipis.github.io/bootstrap-social/) in order to automatically apply styles to buttons. Anyway you can always add your own style to the buttons.
+
+The user must be allowed to access the urls "/link-social/[provider]" and "/callback-link-social/[provider]".
+
Logout link
-----------------
diff --git a/Docs/Documentation/Yubico-U2F.md b/Docs/Documentation/Yubico-U2F.md
new file mode 100644
index 000000000..73511f16c
--- /dev/null
+++ b/Docs/Documentation/Yubico-U2F.md
@@ -0,0 +1,37 @@
+YubicoKey U2F
+=============
+
+The plugin offers an easy way to integrate U2F in the users login flow
+of your application.
+
+Enabling
+--------
+
+First install yubico/u2flib-server using composer:
+
+```
+composer require yubico/u2flib-server:^1.0
+```
+
+Then add this in your config/users.php file:
+
+```php
+ 'U2f.enabled' => true,
+```
+
+Disabling
+---------
+You can disable it by adding this in your config/users.php file:
+
+```php
+ 'U2f.enabled' => false,
+```
+
+How does it work
+----------------
+When the user log-in, he is requested to insert and tap his registered yubico key,
+if this is the first time he access he need to register the yubico key.
+
+Please check the yubico site for more information about U2F
+https://developers.yubico.com/U2F/
+
diff --git a/Docs/Home.md b/Docs/Home.md
index a67b3107b..4223b0e82 100644
--- a/Docs/Home.md
+++ b/Docs/Home.md
@@ -7,22 +7,242 @@ The plugin is thought as a base to extend your app specific users controller and
That it works out of the box doesn't mean it is thought to be used exactly like it is but to provide you a kick start.
-Requirements
-------------
-
-* CakePHP 3.1.*
-* PHP 5.4.16+
-
Documentation
-------------
* [Overview](Documentation/Overview.md)
* [Installation](Documentation/Installation.md)
* [Configuration](Documentation/Configuration.md)
-* [SimpleRbacAuthorize](Documentation/SimpleRbacAuthorize.md)
-* [SuperuserAuthorize](Documentation/SuperuserAuthorize.md)
-* [SocialAuthenticate](Documentation/SocialAuthenticate.md)
+* [Authentication](Documentation/Authentication.md)
+* [Authorization](Documentation/Authorization.md)
+* [SimpleRbacAuthorize](https://github.com/CakeDC/auth/blob/master/Docs/Documentation/SimpleRbacAuthorize.md)
+* [SuperuserAuthorize](https://github.com/CakeDC/auth/blob/master/Docs/Documentation/SuperuserAuthorize.md)
+* [Intercept Login Action](Documentation/InterceptLoginAction.md)
+* [Social Authentication](Documentation/SocialAuthentication.md)
+* [Google Authenticator](Documentation/Two-Factor-Authenticator.md)
+* [Yubico U2F](Documentation/Yubico-U2F.md)
* [UserHelper](Documentation/UserHelper.md)
+* [AuthLinkHelper](Documentation/AuthLinkHelper.md)
* [Events](Documentation/Events.md)
* [Extending the Plugin](Documentation/Extending-the-Plugin.md)
* [Translations](Documentation/Translations.md)
+
+I want to
+---------
+* extend the
+ * [model](Documentation/Extending-the-Plugin.md#extending-the-model-tableentity)
+ * [controller](Documentation/Extending-the-Plugin.md#extending-the-controller)
+ * [templates](Documentation/Extending-the-Plugin.md#updating-the-templates)
+
+* enable or disable
+ *
+
+ * email validation
+ + Add this to your config/users.php file to disable email validation + + ```php + 'Users.Email.validate' => false, + ``` + or this to enable (default) + + ```php + 'Users.Email.validate' => true, + ``` +
+
+ * registration
+ + Add this to your config/users.php file to disable registration + + ```php + 'Users.Registration.active' => false, + ``` + or this to enable (default) + + ```php + 'Users.Registration.active' => true, + ``` +
+
+ * reCaptcha on registration
+ + To enable reCaptcha you need to register your site at google reCaptcha console + and add this to your config/users.php file to enable on registration: + + ```php + 'Users.reCaptcha.key' => 'YOUR RECAPTCHA KEY', + 'Users.reCaptcha.secret' => 'YOUR RECAPTCHA SECRET', + 'Users.reCaptcha.registration' => true, + ``` + To disable (default) add this to your config/users.php + + ```php + 'Users.reCaptcha.registration' => false, + ``` +
+
+ * [social login](./Documentation/SocialAuthentication.md#setup)
+ * [OTP Two-factor authenticator](./Documentation/Two-Factor-Authenticator.md)
+ * [Yubico Key U2F Two-factor authenticator](./Documentation/Yubico-U2F.md)
+ * reCaptcha on login
+ + To enable reCaptcha you need to register your site at google reCaptcha console + and add this to your config/users.php file to enable on login: + + ```php + 'Users.reCaptcha.key' => 'YOUR RECAPTCHA KEY', + 'Users.reCaptcha.secret' => 'YOUR RECAPTCHA SECRET', + 'Users.reCaptcha.login' => true, + ``` + To disable (default) add this to your config/users.php + + ```php + 'Users.reCaptcha.login' => false, + ``` +
+
+ * Authentication component
+ + Add this to your config/users.php file to autoload the component (default): + + ```php + 'Auth.AuthenticationComponent.load' => true, + ``` + + To not autoload add this to your config/users.php + + ```php + 'Auth.AuthenticationComponent.load' => false, + ``` +
+
+
+ * Authorization component
+ + Add this to your config/users.php file to autoload the component (default): + + ```php + 'Auth.AuthorizationComponent.enabled' => true, + ``` + + To not autoload add this to your config/users.php + + ```php + 'Auth.AuthorizationComponent.enabled' => false, + ``` +
+
+
+ * TOS validation
+ + Add this to your config/users.php file to enable (default): + + ```php + 'Users.Tos.required' => true, + ``` + + To disable add this to your config/users.php + + ```php + 'Users.Tos.required' => false, + ``` +
+
+
+- allow access to
+ - [public actions (non-logged user)](./Documentation/Permissions.md#i-want-to-allow-access-to-public-actions-non-logged-user)
+ - [one specific action](./Documentation/Permissions.md#i-want-to-allow-access-to-one-specific-action)
+ - [all actions from one controller](./Documentation/Permissions.md#i-want-to-allow-access-to-all-actions-from-one-controller)
+ - [all controllers from one prefix](./Documentation/Permissions.md#i-want-to-allow-access-to-all-controllers-from-one-prefix)
+ - [entity owned by the user](./Documentation/Permissions.md#i-want-to-allow-access-to-entity-owned-by-the-user)
+ - [action using a custom logic](./Documentation/Permissions.md#i-want-to-allow-access-to-action-using-a-custom-logic)
+
+- customize my login page to
+ - remember me
+ + Add this to your config/users.php file to enable (default): + + ```php + 'Users.RememberMe.active' => true, + ``` + + To disable add this to your config/users.php + + ```php + 'Users.RememberMe.active' => false, + ``` +
+
+
+ - use my template
+ Copy the login file from `{project_dir}/vendor/cakedc/users/templates/Users/` + to `{project_dir}/templates/plugin/CakeDC/Users/Users`. +
+
+
+ - use a custom finder
+ First add this to your config/users.php: + + ``` + 'Auth.Identifiers.Password.resolver.finder' => 'myFinderName', + 'Auth.Identifiers.Social.authFinder' => 'myFinderName', + 'Auth.Identifiers.Token.resolver.finder' => 'myFinderName', + ``` + Important: You must have extended the model, see how to at [Extending the Plugin](Documentation/Extending-the-Plugin.md) +
+
+
+ - use a custom redirect url
+ To use a custom redirect url on login add this to your config/users.php: + + ``` + 'Auth.AuthenticationComponent.loginRedirect' => '/some/url/', + ``` + or + ``` + 'Auth.AuthenticationComponent.loginRedirect' => ['plugin' => false, 'controller' => 'Example', 'action' => 'home'], + ``` + Important: when using array you should pass `'plugin' => false,` to match your app controller. +
+
+ - [use user's email to login](./Documentation/Configuration.md#using-the-users-email-to-login)
+ - [override the password hasher](./Documentation/Configuration.md#password-hasher-customization)
+
+- add custom logic before
+ - [user logout](./Documentation/Events.md#i-want-to-add-custom-logic-before-user-logout)
+ - [user register](./Documentation/Events.md#i-want-to-add-custom-logic-before-user-register)
+ - [linking social account](./Documentation/Events.md#i-want-to-add-custom-logic-before-linking-social-account)
+ - [creating social account](./Documentation/Events.md#i-want-to-add-custom-logic-before-creating-social-account)
+
+- add custom logic after
+ - [user login](./Documentation/Events.md#i-want-to-add-custom-logic-after-user-login)
+ - [user logout](./Documentation/Events.md#i-want-to-add-custom-logic-after-user-logout)
+ - [user register](./Documentation/Events.md#i-want-to-add-custom-logic-after-user-register)
+ - [user changed the password](./Documentation/Events.md#i-want-to-add-custom-logic-after-user-changed-the-password)
+ - [sending the token for user validation](./Documentation/Events.md#i-want-to-add-custom-logic-after-sending-the-token-for-user-validation)
+ - [user email is validated](./Documentation/Events.md#i-want-to-add-custom-logic-after-user-email-is-validated)
+ - [user email is validated to autologin user](./Documentation/Events.md#i-want-to-add-custom-logic-after-user-email-is-validated-to-autologin-user)
+ - [intercept login action](./Documentation/InterceptLoginAction.md)
+
+
+Migration guides
+----------------
+
+* [4.x to 5.0](Documentation/Migration/4.x-5.0.md)
+* [6.x to 7.0](Documentation/Migration/6.x-7.0.md)
+* [8.x to 9.0](Documentation/Migration/8.x-9.0.md)
diff --git a/LICENSE.txt b/LICENSE.txt
index 6ee7e8fc0..5448b2520 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,11 +1,11 @@
The MIT License
-Copyright 2009-2014
+Copyright 2009-2018
Cake Development Corporation
1785 E. Sahara Avenue, Suite 490-423
Las Vegas, Nevada 89104
Phone: +1 702 425 5085
-http://cakedc.com
+https://www.cakedc.com
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -23,4 +23,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index f369f656c..fbd5af5f4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
CakeDC Users Plugin
===================
-[](http://travis-ci.org/CakeDC/users)
+[](https://github.com/CakeDC/users/actions?query=workflow%3ACI+branch%3Amaster)
+[](https://codecov.io/gh/CakeDC/users)
[](https://packagist.org/packages/CakeDC/users)
[](https://packagist.org/packages/CakeDC/users)
[](https://packagist.org/packages/CakeDC/users)
@@ -11,24 +12,31 @@ 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.2+ | [master](https://github.com/cakedc/users/tree/master) | 3.x | stable |
-| 3.2+ | [develop](https://github.com/cakedc/users/tree/develop) | 3.x | unstable |
-| 3.0 | [3.0.x](https://github.com/cakedc/users/tree/3.0.x) | 3.0.0 | stability is beta, but pretty stable now |
-| 3.1 | [3.1.x](https://github.com/cakedc/users/tree/3.1.x) | 3.1.0 | stability is beta, but pretty stable now |
+| ^4.3 | [master](https://github.com/cakedc/users/tree/master) | 11.0.0 | stable |
+| ^4.3 | [11.0](https://github.com/cakedc/users/tree/11.next-cake4) | 11.0.0 | stable |
+| ^4.0 | [9.0](https://github.com/cakedc/users/tree/9.next) | 9.0.5 | stable |
+| ^3.7 <4.0 | [8.5](https://github.com/cakedc/users/tree/8.next) | 8.5.1 | stable |
+| ^3.7 <4.0 | [develop](https://github.com/cakedc/users/tree/develop) | - | unstable |
+| 3.6 | [8.1](https://github.com/cakedc/users/tree/8.1.0) | 8.1.0 | stable |
+| 3.5 | [6.x](https://github.com/cakedc/users/tree/6.x) | 6.0.1 | stable |
+| 3.4 | [5.x](https://github.com/cakedc/users/tree/5.x) | 5.2.0 | stable |
+| >=3.2.9 <3.4.0 | [4.x](https://github.com/cakedc/users/tree/4.x) | 4.2.1 | stable |
+| ^2.10 | [2.x](https://github.com/cakedc/users/tree/2.x) | 2.2.0 |stable |
+
+The **Users** plugin covers the following features:
-The **Users** plugin is back!
-
-It covers the following features:
* User registration
* Login/logout
* Social login (Facebook, Twitter, Instagram, Google, Linkedin, etc)
-* Simple RBAC
-* Remember me (Cookie)
+* Simple RBAC via https://github.com/CakeDC/auth
+* Remember me (Cookie) via https://github.com/CakeDC/auth
* Manage user's profile
* Admin management
+* Yubico U2F for Two-Factor Authentication
+* One-Time Password for Two-Factor Authentication
The plugin is here to provide users related features following 2 approaches:
+
* Quick drop-in working solution for users login/registration. Get users working in 5 minutes.
* Extensible solution for a bigger/custom application. You'll be able to extend:
* UsersAuth Component
@@ -44,8 +52,8 @@ Another decision made was limiting the plugin dependencies on other packages as
Requirements
------------
-* CakePHP 3.2.9+
-* PHP 5.5.9+
+* CakePHP 4.0+
+* PHP 7.2+
Documentation
-------------
@@ -57,16 +65,16 @@ Support
For bugs and feature requests, please use the [issues](https://github.com/CakeDC/users/issues) section of this repository.
-Commercial support is also available, [contact us](http://cakedc.com/contact) for more information.
+Commercial support is also available, [contact us](https://www.cakedc.com/contact) for more information.
Contributing
------------
-This repository follows the [CakeDC Plugin Standard](http://cakedc.com/plugin-standard). If you'd like to contribute new features, enhancements or bug fixes to the plugin, please read our [Contribution Guidelines](http://cakedc.com/contribution-guidelines) for detailed instructions.
+This repository follows the [CakeDC Plugin Standard](https://www.cakedc.com/plugin-standard). If you'd like to contribute new features, enhancements or bug fixes to the plugin, please read our [Contribution Guidelines](https://www.cakedc.com/contribution-guidelines) for detailed instructions.
License
-------
-Copyright 2015 Cake Development Corporation (CakeDC). All rights reserved.
+Copyright 2019 Cake Development Corporation (CakeDC). All rights reserved.
Licensed under the [MIT](http://www.opensource.org/licenses/mit-license.php) License. Redistributions of the source code included in this repository must retain the copyright notice found in each file.
diff --git a/composer.json b/composer.json
index 362d13241..3a94372d7 100644
--- a/composer.json
+++ b/composer.json
@@ -26,25 +26,40 @@
"issues": "https://github.com/CakeDC/users/issues",
"source": "https://github.com/CakeDC/users"
},
+ "minimum-stability": "dev",
+ "prefer-stable": true,
"require": {
- "cakephp/cakephp": ">=3.2.9 <4.0.0"
+ "php": ">=7.2.0",
+ "cakephp/cakephp": "^4.0",
+ "cakedc/auth": "^7.0",
+ "cakephp/authorization": "^2.0.0",
+ "cakephp/authentication": "^2.0.0"
},
"require-dev": {
- "phpunit/phpunit": "@stable",
- "cakephp/cakephp-codesniffer": "^2.0",
+ "phpunit/phpunit": "^9.5",
"league/oauth2-facebook": "@stable",
"league/oauth2-instagram": "@stable",
"league/oauth2-google": "@stable",
"league/oauth2-linkedin": "@stable",
- "google/recaptcha": "@stable"
+ "luchianenco/oauth2-amazon": "^1.1",
+ "google/recaptcha": "@stable",
+ "robthree/twofactorauth": "^1.6",
+ "yubico/u2flib-server": "^1.0",
+ "php-coveralls/php-coveralls": "^2.1",
+ "league/oauth1-client": "^1.7",
+ "cakephp/cakephp-codesniffer": "^4.0",
+ "web-auth/webauthn-lib": "v3.3.x-dev"
},
"suggest": {
"league/oauth1-client": "Provides Social Authentication with Twitter",
"league/oauth2-facebook": "Provides Social Authentication with Facebook",
"league/oauth2-instagram": "Provides Social Authentication with Instagram",
"league/oauth2-google": "Provides Social Authentication with Google+",
+ "luchianenco/oauth2-amazon": "Provides Social Authentication with Amazon",
"league/oauth2-linkedin": "Provides Social Authentication with LinkedIn",
- "google/recaptcha": "Provides reCAPTCHA validation for registration form"
+ "google/recaptcha": "Provides reCAPTCHA validation for registration form",
+ "robthree/twofactorauth": "Provides Google Authenticator functionality",
+ "cakephp/authorization": "Provide authorization for users"
},
"autoload": {
"psr-4": {
@@ -54,7 +69,30 @@
"autoload-dev": {
"psr-4": {
"CakeDC\\Users\\Test\\": "tests",
- "CakeDC\\Users\\Test\\Fixture\\": "tests"
+ "CakeDC\\Users\\Test\\Fixture\\": "tests",
+ "TestApp\\": "tests/test_app/TestApp/"
}
+ },
+ "scripts": {
+ "analyse": [
+ "@stan",
+ "@psalm"
+ ],
+ "check": [
+ "@cs-check",
+ "@test",
+ "@analyse"
+ ],
+ "cs-check": "phpcs -n -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests",
+ "cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests",
+ "test": "phpunit --stderr",
+ "stan": "phpstan analyse src/",
+ "psalm": "php vendor/psalm/phar/psalm.phar --show-info=false src/ ",
+ "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:0.12.94 psalm/phar:~4.9.2 && mv composer.backup composer.json",
+ "stan-rebuild-baseline": "phpstan analyse --configuration phpstan.neon --error-format baselineNeon src/ > phpstan-baseline.neon",
+ "psalm-rebuild-baseline": "php vendor/psalm/phar/psalm.phar --show-info=false --set-baseline=psalm-baseline.xml src/",
+ "rector": "rector process src/",
+ "rector-setup": "cp composer.json composer.backup && composer require --dev rector/rector:^0.11.2 && mv composer.backup composer.json",
+ "coverage-test": "phpunit --stderr --coverage-clover=clover.xml"
}
}
diff --git a/config/Migrations/20150513201111_initial.php b/config/Migrations/20150513201111_initial.php
index b9e09fc69..2379afa67 100644
--- a/config/Migrations/20150513201111_initial.php
+++ b/config/Migrations/20150513201111_initial.php
@@ -1,15 +1,15 @@
table('users');
+ /**
+ * Limiting secret field to 32 chars
+ * @see https://en.wikipedia.org/wiki/Google_Authenticator#Technical_description
+ */
+ $table->addColumn('secret', 'string', [
+ 'after' => 'activation_date',
+ 'default' => null,
+ 'limit' => 32,
+ 'null' => true,
+ ]);
+ $table->addColumn('secret_verified', 'boolean', [
+ 'after' => 'secret',
+ 'default' => null,
+ 'null' => true,
+ ]);
+ $table->update();
+ }
+}
diff --git a/config/Migrations/20190208174112_AddAdditionalDataToUsers.php b/config/Migrations/20190208174112_AddAdditionalDataToUsers.php
new file mode 100644
index 000000000..731be0fc5
--- /dev/null
+++ b/config/Migrations/20190208174112_AddAdditionalDataToUsers.php
@@ -0,0 +1,32 @@
+table('users');
+ $table->addColumn('additional_data', 'text', [
+ 'default' => null,
+ 'null' => true,
+ ]);
+ $table->update();
+ }
+}
diff --git a/config/Migrations/20210929202041_AddLastLoginToUsers.php b/config/Migrations/20210929202041_AddLastLoginToUsers.php
new file mode 100644
index 000000000..5a533c250
--- /dev/null
+++ b/config/Migrations/20210929202041_AddLastLoginToUsers.php
@@ -0,0 +1,24 @@
+table('users');
+ $table->addColumn('last_login', 'datetime', [
+ 'default' => null,
+ 'null' => true,
+ ]);
+ $table->update();
+ }
+}
diff --git a/config/Migrations/schema-dump-default.lock b/config/Migrations/schema-dump-default.lock
new file mode 100644
index 000000000..9c437b3c1
Binary files /dev/null and b/config/Migrations/schema-dump-default.lock differ
diff --git a/config/bootstrap.php b/config/bootstrap.php
index 4592fb2e1..d78acc8b7 100644
--- a/config/bootstrap.php
+++ b/config/bootstrap.php
@@ -1,19 +1,16 @@
each(function ($file) {
Configure::load($file);
});
+UsersUrl::setupConfigUrls();
-TableRegistry::config('Users', ['className' => Configure::read('Users.table')]);
-TableRegistry::config('CakeDC/Users.Users', ['className' => Configure::read('Users.table')]);
-
-if (Configure::check('Users.auth')) {
- Configure::write('Auth.authenticate.all.userModel', Configure::read('Users.table'));
-}
-
-if (Configure::read('Users.Social.login') && php_sapi_name() != 'cli') {
- try {
- EventManager::instance()->on(\CakeDC\Users\Controller\Component\UsersAuthComponent::EVENT_FAILED_SOCIAL_LOGIN, [new \CakeDC\Users\Controller\UsersController(), 'failedSocialLoginListener']);
- } catch (MissingPluginException $e) {
- Log::error($e->getMessage());
+$locator = TableRegistry::getTableLocator();
+foreach (['Users', 'CakeDC/Users.Users'] as $modelKey) {
+ if (!$locator->exists($modelKey)) {
+ $locator->setConfig($modelKey, ['className' => Configure::read('Users.table')]);
}
}
-
-$oauthPath = Configure::read('OAuth.path');
-if (is_array($oauthPath)) {
- Router::scope('/auth', function ($routes) use ($oauthPath) {
- $routes->connect(
- '/:provider',
- $oauthPath,
- ['provider' => implode('|', array_keys(Configure::read('OAuth.providers')))]
- );
- });
+$oldConfigs = [
+ 'Users.auth',
+ 'Users.Social.authenticator',
+ 'Users.GoogleAuthenticator',
+ 'GoogleAuthenticator',
+ 'Auth.authenticate',
+ 'Auth.authorize',
+];
+foreach ($oldConfigs as $configKey) {
+ if (Configure::check($configKey)) {
+ trigger_error(__("Users plugin configuration key \"{0}\" was removed, please check migration guide https://github.com/CakeDC/users/blob/master/Docs/Documentation/Migration/8.x-9.0.md", $configKey));
+ }
}
diff --git a/config/permissions.php b/config/permissions.php
index 0f8451259..5c52467fb 100644
--- a/config/permissions.php
+++ b/config/permissions.php
@@ -1,11 +1,11 @@
['edit', 'delete'],
'allowed' => function(array $user, $role, Request $request) {
$postId = Hash::get($request->params, 'pass.0');
- $post = TableRegistry::get('Posts')->get($postId);
+ $post = TableRegistry::getTableLocator()->get('Posts')->get($postId);
$userId = Hash::get($user, 'id');
if (!empty($post->user_id) && !empty($userId)) {
return $post->user_id === $userId;
@@ -50,30 +50,95 @@
*/
return [
- 'Users.SimpleRbac.permissions' => [
+ 'CakeDC/Auth.permissions' => [
+ //all bypass
[
- 'role' => '*',
+ 'prefix' => false,
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => [
+ // LoginTrait
+ 'socialLogin',
+ 'login',
+ 'logout',
+ 'socialEmail',
+ 'verify',
+ // RegisterTrait
+ 'register',
+ 'validateEmail',
+ // PasswordManagementTrait used in RegisterTrait
+ 'changePassword',
+ 'resetPassword',
+ 'requestResetPassword',
+ // UserValidationTrait used in PasswordManagementTrait
+ 'resendTokenValidation',
+ 'linkSocial',
+ //U2F actions
+ 'u2f',
+ 'u2fRegister',
+ 'u2fRegisterFinish',
+ 'u2fAuthenticate',
+ 'u2fAuthenticateFinish',
+ 'webauthn2fa',
+ 'webauthn2faRegister',
+ 'webauthn2faRegisterOptions',
+ 'webauthn2faAuthenticate',
+ 'webauthn2faAuthenticateOptions',
+ ],
+ 'bypassAuth' => true,
+ ],
+ [
+ 'prefix' => false,
'plugin' => 'CakeDC/Users',
+ 'controller' => 'SocialAccounts',
+ 'action' => [
+ 'validateAccount',
+ 'resendValidation',
+ ],
+ 'bypassAuth' => true,
+ ],
+ //admin role allowed to all the things
+ [
+ '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', 'linkSocial', 'callbackLinkSocial'],
],
[
- 'role' => 'user',
+ 'role' => '*',
'plugin' => 'CakeDC/Users',
'controller' => 'Users',
- 'action' => '*',
- 'allowed' => false,
+ 'action' => 'resetOneTimePasswordAuthenticator',
+ 'allowed' => function (array $user, $role, \Cake\Http\ServerRequest $request) {
+ $userId = \Cake\Utility\Hash::get($request->getAttribute('params'), 'pass.0');
+ if (!empty($userId) && !empty($user)) {
+ return $userId === $user['id'];
+ }
+
+ return false;
+ }
],
+ //all roles allowed to Pages/display
[
- 'role' => ['user'],
- 'controller' => ['Pages'],
- 'action' => ['other', 'display'],
- 'allowed' => true,
+ 'role' => '*',
+ 'controller' => 'Pages',
+ 'action' => 'display',
+ ],
+ [
+ 'role' => '*',
+ 'plugin' => 'DebugKit',
+ 'controller' => '*',
+ 'action' => '*',
+ 'bypassAuth' => true,
],
- ]];
+ ]
+];
diff --git a/config/routes.php b/config/routes.php
index 6c4331798..81ac70cc1 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -1,31 +1,52 @@
connect('/accounts/validate/*', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'SocialAccounts',
+ 'action' => 'validate'
+]);
+// Google Authenticator related routes
+if (Configure::read('OneTimePasswordAuthenticator.login')) {
+ $routes->connect('/verify', UsersUrl::actionRouteParams('verify'));
+
+ $routes->connect('/resetOneTimePasswordAuthenticator', UsersUrl::actionRouteParams('resetOneTimePasswordAuthenticator'));
+}
+
+$routes->connect('/profile/*', UsersUrl::actionRouteParams('profile'));
+$routes->connect('/login', UsersUrl::actionRouteParams('login'));
+$routes->connect('/logout', UsersUrl::actionRouteParams('logout'));
+$routes->connect('/link-social/*', UsersUrl::actionRouteParams('linkSocial'));
+$routes->connect('/callback-link-social/*', UsersUrl::actionRouteParams('callbackLinkSocial'));
+$routes->connect('/register', UsersUrl::actionRouteParams('register'));
-Router::plugin('CakeDC/Users', ['path' => '/users'], function ($routes) {
- $routes->fallbacks('DashedRoute');
+$oauthPath = Configure::read('OAuth.path');
+if (is_array($oauthPath)) {
+ $routes->scope('/auth', function (RouteBuilder $routes) use ($oauthPath) {
+ $routes->connect(
+ '/{provider}',
+ $oauthPath,
+ ['provider' => implode('|', array_keys(Configure::read('OAuth.providers')))]
+ );
});
+}
-Router::connect('/auth/twitter', [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => 'twitterLogin',
- 'provider' => 'twitter'
- ]);
-Router::connect('/accounts/validate/*', [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'SocialAccounts',
- 'action' => 'validate'
- ]);
-Router::connect('/profile/*', ['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'profile']);
-Router::connect('/login', ['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login']);
-Router::connect('/logout', ['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'logout']);
\ No newline at end of file
+$routes->connect('/social-accounts/:action/*', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'SocialAccounts',
+]);
+$routes->connect('/users/{action}/*', UsersUrl::actionRouteParams(null));
diff --git a/config/users.php b/config/users.php
index 7d2662ec1..23dfeb9d1 100644
--- a/config/users.php
+++ b/config/users.php
@@ -1,157 +1,317 @@
getHost();
+ if ($fullBaseHost) {
+ $allowedRedirectHosts[] = $fullBaseHost;
+ }
+ } catch (Exception $ex) {
+ Log::warning('Invalid host from App.fullBasedUrl in CakeDC/Users configuration: ' . $ex->getMessage());
+ }
+}
$config = [
'Users' => [
- //Table used to manage users
+ // Table used to manage users
'table' => 'CakeDC/Users.Users',
- //configure Auth component
- 'auth' => true,
- //Password Hasher
+ // Controller used to manage users plugin features & actions
+ 'controller' => 'CakeDC/Users.Users',
+ // Password Hasher
'passwordHasher' => '\Cake\Auth\DefaultPasswordHasher',
- //token expiration, 1 hour
+ 'middlewareQueueLoader' => \CakeDC\Users\Loader\MiddlewareQueueLoader::class,
+ // token expiration, 1 hour
'Token' => ['expiration' => 3600],
'Email' => [
- //determines if the user should include email
+ // determines if the user should include email
'required' => true,
- //determines if registration workflow includes email validation
+ // determines if registration workflow includes email validation
'validate' => true,
],
'Registration' => [
- //determines if the register is enabled
+ // determines if the register is enabled
'active' => true,
- //determines if the reCaptcha is enabled for registration
+ // determines if the reCaptcha is enabled for registration
'reCaptcha' => true,
- //allow a logged in user to access the registration form
+ // allow a logged in user to access the registration form
'allowLoggedIn' => false,
//ensure user is active (confirmed email) to reset his password
- 'ensureActive' => false
+ 'ensureActive' => false,
+ // default role name used in registration
+ 'defaultRole' => 'user',
+ // show verbose error to users
+ 'showVerboseError' => false,
],
'reCaptcha' => [
- //reCaptcha key goes here
+ // reCaptcha key goes here
'key' => null,
- //reCaptcha secret
+ // reCaptcha secret
'secret' => null,
- //use reCaptcha in registration
+ // use reCaptcha in registration
'registration' => false,
- //use reCaptcha in login, valid values are false, true
+ // use reCaptcha in login, valid values are false, true
'login' => false,
],
'Tos' => [
- //determines if the user should include tos accepted
+ // determines if the user should include tos accepted
'required' => true,
],
'Social' => [
- //enable social login
+ // enable social login
'login' => false,
],
'Profile' => [
- //Allow view other users profiles
+ // Allow view other users profiles
'viewOthers' => true,
- 'route' => ['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'profile'],
],
'Key' => [
'Session' => [
- //session key to store the social auth data
+ // session key to store the social auth data
'social' => 'Users.social',
- //userId key used in reset password workflow
+ // userId key used in reset password workflow
'resetPasswordUserId' => 'Users.resetPasswordUserId',
],
- //form key to store the social auth data
+ // form key to store the social auth data
'Form' => [
- 'social' => 'social'
+ 'social' => 'social',
],
'Data' => [
- //data key to store the users email
+ // data key to store the users email
'email' => 'email',
- //data key to store email coming from social networks
+ // data key to store email coming from social networks
'socialEmail' => 'info.email',
- //data key to check if the remember me option is enabled
+ // data key to check if the remember me option is enabled
'rememberMe' => 'remember_me',
],
],
- //Avatar placeholder
+ // Avatar placeholder
'Avatar' => ['placeholder' => 'CakeDC/Users.avatar_placeholder.png'],
'RememberMe' => [
- //configure Remember Me component
+ // configure Remember Me component
'active' => true,
+ 'checked' => true,
'Cookie' => [
'name' => 'remember_me',
'Config' => [
- 'expires' => '1 month',
- 'httpOnly' => true,
- ]
- ]
+ 'expires' => new \DateTime('+1 month'),
+ 'httponly' => true,
+ ],
+ ],
],
+ 'Superuser' => ['allowedToChangePasswords' => false], // able to reset any users password
+ // list of valid hosts to allow redirects after valid login via the `redirect` query param
+ 'AllowedRedirectHosts' => $allowedRedirectHosts,
+ ],
+ 'OneTimePasswordAuthenticator' => [
+ 'checker' => \CakeDC\Auth\Authentication\DefaultOneTimePasswordAuthenticationChecker::class,
+ 'login' => false,
+ 'issuer' => null,
+ // The number of digits the resulting codes will be
+ 'digits' => 6,
+ // The number of seconds a code will be valid
+ 'period' => 30,
+ // The algorithm used
+ 'algorithm' => 'sha1',
+ // QR-code provider (more on this later)
+ 'qrcodeprovider' => null,
+ // Random Number Generator provider (more on this later)
+ 'rngprovider' => null,
+ ],
+ 'U2f' => [
+ 'enabled' => false,
+ 'checker' => \CakeDC\Auth\Authentication\DefaultU2fAuthenticationChecker::class,
+ ],
+ 'Webauthn2fa' => [
+ 'enabled' => false,
+ 'appName' => null,//App must set a valid name here
+ 'id' => null,//default value is the current domain
+ 'checker' => \CakeDC\Auth\Authentication\DefaultWebauthn2fAuthenticationChecker::class,
],
- //default configuration used to auto-load the Auth Component, override to change the way Auth works
+ // default configuration used to auto-load the Auth Component, override to change the way Auth works
'Auth' => [
- 'loginAction' => [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => 'login',
- 'prefix' => null
+ 'Authentication' => [
+ 'serviceLoader' => \CakeDC\Users\Loader\AuthenticationServiceLoader::class,
+ ],
+ 'AuthenticationComponent' => [
+ 'load' => true,
+ 'loginRedirect' => '/',
+ 'requireIdentity' => false,
+ ],
+ 'Authenticators' => [
+ 'Session' => [
+ 'className' => 'Authentication.Session',
+ 'skipTwoFactorVerify' => true,
+ 'sessionKey' => 'Auth',
+ ],
+ 'Form' => [
+ 'className' => 'CakeDC/Auth.Form',
+ 'urlChecker' => 'Authentication.CakeRouter',
+ ],
+ 'Token' => [
+ 'className' => 'Authentication.Token',
+ 'skipTwoFactorVerify' => true,
+ 'header' => null,
+ 'queryParam' => 'api_key',
+ 'tokenPrefix' => null,
+ ],
+ 'Cookie' => [
+ 'className' => 'CakeDC/Auth.Cookie',
+ 'skipTwoFactorVerify' => true,
+ 'rememberMeField' => 'remember_me',
+ 'cookie' => [
+ 'expires' => new \DateTime('+1 month'),
+ 'httponly' => true,
+ ],
+ 'urlChecker' => 'Authentication.CakeRouter',
+ ],
+ 'Social' => [
+ 'className' => 'CakeDC/Users.Social',
+ 'skipTwoFactorVerify' => true,
+ ],
+ 'SocialPendingEmail' => [
+ 'className' => 'CakeDC/Users.SocialPendingEmail',
+ 'skipTwoFactorVerify' => true,
+ ],
+ ],
+ 'Identifiers' => [
+ 'Password' => [
+ 'className' => 'Authentication.Password',
+ 'fields' => [
+ 'username' => ['username', 'email'],
+ 'password' => 'password',
+ ],
+ 'resolver' => [
+ 'className' => 'Authentication.Orm',
+ 'finder' => 'active',
+ ],
+ ],
+ 'Social' => [
+ 'className' => 'CakeDC/Users.Social',
+ 'authFinder' => 'active',
+ ],
+ 'Token' => [
+ 'className' => 'Authentication.Token',
+ 'tokenField' => 'api_token',
+ 'resolver' => [
+ 'className' => 'Authentication.Orm',
+ 'finder' => 'active',
+ ],
+ ],
+ ],
+ 'Authorization' => [
+ 'enable' => true,
+ 'serviceLoader' => \CakeDC\Users\Loader\AuthorizationServiceLoader::class,
],
- 'authenticate' => [
- 'all' => [
- 'finder' => 'auth',
+ 'AuthorizationMiddleware' => [
+ 'unauthorizedHandler' => [
+ 'className' => 'CakeDC/Users.DefaultRedirect',
],
- 'CakeDC/Users.ApiKey',
- 'CakeDC/Users.RememberMe',
- 'Form',
],
- 'authorize' => [
- 'CakeDC/Users.Superuser',
- 'CakeDC/Users.SimpleRbac',
+ 'AuthorizationComponent' => [
+ 'enabled' => true,
+ ],
+ 'RbacPolicy' => [],
+ 'PasswordRehash' => [
+ 'identifiers' => ['Password'],
],
],
'OAuth' => [
- 'path' => ['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'socialLogin', 'prefix' => null],
'providers' => [
'facebook' => [
+ 'service' => 'CakeDC\Auth\Social\Service\OAuth2Service',
'className' => 'League\OAuth2\Client\Provider\Facebook',
+ 'mapper' => 'CakeDC\Auth\Social\Mapper\Facebook',
+ 'authParams' => ['scope' => ['public_profile', 'email', 'user_birthday', 'user_gender', 'user_link']],
'options' => [
- 'graphApiVersion' => 'v2.5',
+ 'graphApiVersion' => 'v2.8', //bio field was deprecated on >= v2.8
'redirectUri' => Router::fullBaseUrl() . '/auth/facebook',
- ]
+ 'linkSocialUri' => Router::fullBaseUrl() . '/link-social/facebook',
+ 'callbackLinkSocialUri' => Router::fullBaseUrl() . '/callback-link-social/facebook',
+ ],
],
'twitter' => [
+ 'service' => 'CakeDC\Auth\Social\Service\OAuth1Service',
+ 'className' => 'League\OAuth1\Client\Server\Twitter',
+ 'mapper' => 'CakeDC\Auth\Social\Mapper\Twitter',
'options' => [
'redirectUri' => Router::fullBaseUrl() . '/auth/twitter',
- ]
+ 'linkSocialUri' => Router::fullBaseUrl() . '/link-social/twitter',
+ 'callbackLinkSocialUri' => Router::fullBaseUrl() . '/callback-link-social/twitter',
+ ],
],
'linkedIn' => [
+ 'service' => 'CakeDC\Auth\Social\Service\OAuth2Service',
'className' => 'League\OAuth2\Client\Provider\LinkedIn',
+ 'mapper' => 'CakeDC\Auth\Social\Mapper\LinkedIn',
'options' => [
'redirectUri' => Router::fullBaseUrl() . '/auth/linkedIn',
- ]
+ 'linkSocialUri' => Router::fullBaseUrl() . '/link-social/linkedIn',
+ 'callbackLinkSocialUri' => Router::fullBaseUrl() . '/callback-link-social/linkedIn',
+ ],
],
'instagram' => [
+ 'service' => 'CakeDC\Auth\Social\Service\OAuth2Service',
'className' => 'League\OAuth2\Client\Provider\Instagram',
+ 'mapper' => 'CakeDC\Auth\Social\Mapper\Instagram',
'options' => [
'redirectUri' => Router::fullBaseUrl() . '/auth/instagram',
- ]
+ 'linkSocialUri' => Router::fullBaseUrl() . '/link-social/instagram',
+ 'callbackLinkSocialUri' => Router::fullBaseUrl() . '/callback-link-social/instagram',
+ ],
],
'google' => [
+ 'service' => 'CakeDC\Auth\Social\Service\OAuth2Service',
'className' => 'League\OAuth2\Client\Provider\Google',
+ 'mapper' => 'CakeDC\Auth\Social\Mapper\Google',
'options' => [
'userFields' => ['url', 'aboutMe'],
'redirectUri' => Router::fullBaseUrl() . '/auth/google',
- ]
+ 'linkSocialUri' => Router::fullBaseUrl() . '/link-social/google',
+ 'callbackLinkSocialUri' => Router::fullBaseUrl() . '/callback-link-social/google',
+ ],
+ ],
+ 'amazon' => [
+ 'service' => 'CakeDC\Auth\Social\Service\OAuth2Service',
+ 'className' => 'Luchianenco\OAuth2\Client\Provider\Amazon',
+ 'mapper' => 'CakeDC\Auth\Social\Mapper\Amazon',
+ 'options' => [
+ 'redirectUri' => Router::fullBaseUrl() . '/auth/amazon',
+ 'linkSocialUri' => Router::fullBaseUrl() . '/link-social/amazon',
+ 'callbackLinkSocialUri' => Router::fullBaseUrl() . '/callback-link-social/amazon',
+ ],
+ ],
+ 'cognito' => [
+ 'service' => 'CakeDC\Auth\Social\Service\OAuth2Service',
+ 'className' => 'CakeDC\OAuth2\Client\Provider\Cognito',
+ 'mapper' => 'CakeDC\Auth\Social\Mapper\Cognito',
+ 'options' => [
+ 'redirectUri' => Router::fullBaseUrl() . '/auth/cognito',
+ 'linkSocialUri' => Router::fullBaseUrl() . '/link-social/cognito',
+ 'callbackLinkSocialUri' => Router::fullBaseUrl() . '/callback-link-social/cognito',
+ 'scope' => 'email openid',
+ ],
],
],
- ]
+ ],
];
return $config;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 000000000..52b966521
--- /dev/null
+++ b/phpstan-baseline.neon
@@ -0,0 +1,267 @@
+parameters:
+ ignoreErrors:
+ -
+ message: "#^Access to an undefined property Cake\\\\Controller\\\\Controller\\:\\:\\$Authentication\\.$#"
+ count: 1
+ path: src/Controller/Component/LoginComponent.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\Controller\\\\Controller\\:\\:getUsersTable\\(\\)\\.$#"
+ count: 2
+ path: src/Controller/Component/LoginComponent.php
+
+ -
+ message: "#^Access to an undefined property CakeDC\\\\Users\\\\Controller\\\\UsersController\\:\\:\\$Authentication\\.$#"
+ count: 2
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Access to an undefined property CakeDC\\\\Users\\\\Controller\\\\UsersController\\:\\:\\$OneTimePasswordAuthenticator\\.$#"
+ count: 3
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\Datasource\\\\EntityInterface\\:\\:\\$u2f_registration\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\Controller\\\\Component\\:\\:handleLogin\\(\\)\\.$#"
+ count: 3
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:changePassword\\(\\)\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:linkSocialAccount\\(\\)\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:register\\(\\)\\.$#"
+ count: 2
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:resetToken\\(\\)\\.$#"
+ count: 2
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:validate\\(\\)\\.$#"
+ count: 2
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:validationCurrentPassword\\(\\)\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:validationPasswordConfirm\\(\\)\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Parameter \\#1 \\$message of method Cake\\\\Controller\\\\Controller\\:\\:log\\(\\) expects string, Exception given\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Parameter \\#1 \\$object of method Cake\\\\Controller\\\\Controller\\:\\:paginate\\(\\) expects Cake\\\\ORM\\\\Query\\|Cake\\\\ORM\\\\Table\\|string\\|null, Cake\\\\Datasource\\\\RepositoryInterface given\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Parameter \\#2 \\$options of method Cake\\\\Controller\\\\Component\\\\FlashComponent\\:\\:error\\(\\) expects array, string given\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Parameter \\#2 \\$options of method Cake\\\\Controller\\\\Component\\\\FlashComponent\\:\\:success\\(\\) expects array, string given\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Parameter \\#2 \\$usersTable of class CakeDC\\\\Users\\\\Webauthn\\\\RegisterAdapter constructor expects CakeDC\\\\Users\\\\Model\\\\Table\\\\UsersTable\\|null, Cake\\\\ORM\\\\Table given\\.$#"
+ count: 1
+ path: src/Controller/UsersController.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:socialLogin\\(\\)\\.$#"
+ count: 1
+ path: src/Identifier/SocialIdentifier.php
+
+ -
+ message: "#^Parameter \\#1 \\$request of method CakeDC\\\\Users\\\\Middleware\\\\SocialAuthMiddleware\\:\\:goNext\\(\\) expects Cake\\\\Http\\\\ServerRequest, Psr\\\\Http\\\\Message\\\\ServerRequestInterface given\\.$#"
+ count: 1
+ path: src/Middleware/SocialAuthMiddleware.php
+
+ -
+ message: "#^Parameter \\#2 \\$request of method CakeDC\\\\Users\\\\Utility\\\\UsersUrl\\:\\:checkActionOnRequest\\(\\) expects Cake\\\\Http\\\\ServerRequest, Psr\\\\Http\\\\Message\\\\ServerRequestInterface given\\.$#"
+ count: 1
+ path: src/Middleware/SocialAuthMiddleware.php
+
+ -
+ message: "#^Parameter \\#1 \\$request of method CakeDC\\\\Users\\\\Middleware\\\\SocialAuthMiddleware\\:\\:goNext\\(\\) expects Cake\\\\Http\\\\ServerRequest, Psr\\\\Http\\\\Message\\\\ServerRequestInterface given\\.$#"
+ count: 1
+ path: src/Middleware/SocialEmailMiddleware.php
+
+ -
+ message: "#^Parameter \\#2 \\$request of method CakeDC\\\\Users\\\\Utility\\\\UsersUrl\\:\\:checkActionOnRequest\\(\\) expects Cake\\\\Http\\\\ServerRequest, Psr\\\\Http\\\\Message\\\\ServerRequestInterface given\\.$#"
+ count: 1
+ path: src/Middleware/SocialEmailMiddleware.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\Datasource\\\\EntityInterface\\:\\:updateToken\\(\\)\\.$#"
+ count: 1
+ path: src/Model/Behavior/BaseTokenBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\Datasource\\\\EntityInterface\\:\\:\\$social_accounts\\.$#"
+ count: 2
+ path: src/Model/Behavior/LinkSocialBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\ORM\\\\Table\\:\\:\\$SocialAccounts\\.$#"
+ count: 5
+ path: src/Model/Behavior/LinkSocialBehavior.php
+
+ -
+ message: "#^Negated boolean expression is always false\\.$#"
+ count: 1
+ path: src/Model/Behavior/LinkSocialBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\Datasource\\\\EntityInterface\\:\\:\\$password\\.$#"
+ count: 1
+ path: src/Model/Behavior/PasswordBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\Datasource\\\\EntityInterface\\:\\:\\$password_confirm\\.$#"
+ count: 1
+ path: src/Model/Behavior/PasswordBehavior.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\Datasource\\\\EntityInterface\\:\\:checkPassword\\(\\)\\.$#"
+ count: 1
+ path: src/Model/Behavior/PasswordBehavior.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:findByUsernameOrEmail\\(\\)\\.$#"
+ count: 1
+ path: src/Model/Behavior/PasswordBehavior.php
+
+ -
+ message: "#^Method CakeDC\\\\Users\\\\Model\\\\Behavior\\\\PasswordBehavior\\:\\:resetToken\\(\\) should return string but returns Cake\\\\Datasource\\\\EntityInterface\\|false\\.$#"
+ count: 1
+ path: src/Model/Behavior/PasswordBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\Datasource\\\\EntityInterface\\:\\:\\$activation_date\\.$#"
+ count: 1
+ path: src/Model/Behavior/RegisterBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\Datasource\\\\EntityInterface\\:\\:\\$active\\.$#"
+ count: 1
+ path: src/Model/Behavior/RegisterBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\Datasource\\\\EntityInterface\\:\\:\\$token_expires\\.$#"
+ count: 1
+ path: src/Model/Behavior/RegisterBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\Datasource\\\\EntityInterface\\:\\:\\$validated\\.$#"
+ count: 1
+ path: src/Model/Behavior/RegisterBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\ORM\\\\Table\\:\\:\\$isValidateEmail\\.$#"
+ count: 1
+ path: src/Model/Behavior/RegisterBehavior.php
+
+ -
+ message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:validationRegister\\(\\)\\.$#"
+ count: 1
+ path: src/Model/Behavior/RegisterBehavior.php
+
+ -
+ message: "#^Cannot call method tokenExpired\\(\\) on array\\|Cake\\\\Datasource\\\\EntityInterface\\.$#"
+ count: 1
+ path: src/Model/Behavior/RegisterBehavior.php
+
+ -
+ message: "#^Access to an undefined property CakeDC\\\\Users\\\\Model\\\\Entity\\\\SocialAccount\\:\\:\\$active\\.$#"
+ count: 1
+ path: src/Model/Behavior/SocialAccountBehavior.php
+
+ -
+ message: "#^Cannot access property \\$active on array\\|Cake\\\\Datasource\\\\EntityInterface\\.$#"
+ count: 2
+ path: src/Model/Behavior/SocialAccountBehavior.php
+
+ -
+ message: "#^Cannot access property \\$token on array\\|Cake\\\\Datasource\\\\EntityInterface\\.$#"
+ count: 1
+ path: src/Model/Behavior/SocialAccountBehavior.php
+
+ -
+ message: "#^Cannot access property \\$user on array\\|Cake\\\\Datasource\\\\EntityInterface\\.$#"
+ count: 1
+ path: src/Model/Behavior/SocialAccountBehavior.php
+
+ -
+ message: "#^Method CakeDC\\\\Users\\\\Model\\\\Behavior\\\\SocialAccountBehavior\\:\\:resendValidation\\(\\) should return CakeDC\\\\Users\\\\Model\\\\Entity\\\\User but returns array\\.$#"
+ count: 1
+ path: src/Model/Behavior/SocialAccountBehavior.php
+
+ -
+ message: "#^Method CakeDC\\\\Users\\\\Model\\\\Behavior\\\\SocialAccountBehavior\\:\\:validateAccount\\(\\) should return CakeDC\\\\Users\\\\Model\\\\Entity\\\\User but returns Cake\\\\Datasource\\\\EntityInterface\\.$#"
+ count: 1
+ path: src/Model/Behavior/SocialAccountBehavior.php
+
+ -
+ message: "#^Parameter \\#1 \\$socialAccount of method CakeDC\\\\Users\\\\Model\\\\Behavior\\\\SocialAccountBehavior\\:\\:_activateAccount\\(\\) expects CakeDC\\\\Users\\\\Model\\\\Entity\\\\SocialAccount, array\\|Cake\\\\Datasource\\\\EntityInterface given\\.$#"
+ count: 1
+ path: src/Model/Behavior/SocialAccountBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\ORM\\\\Table\\:\\:\\$SocialAccounts\\.$#"
+ count: 4
+ path: src/Model/Behavior/SocialBehavior.php
+
+ -
+ message: "#^Access to an undefined property Cake\\\\ORM\\\\Table\\:\\:\\$isValidateEmail\\.$#"
+ count: 1
+ path: src/Model/Behavior/SocialBehavior.php
+
+ -
+ message: "#^Parameter \\#3 \\$tokenExpiration of method CakeDC\\\\Users\\\\Model\\\\Behavior\\\\BaseTokenBehavior\\:\\:_updateActive\\(\\) expects int, string given\\.$#"
+ count: 1
+ path: src/Model/Behavior/SocialBehavior.php
+
+ -
+ message: "#^Method CakeDC\\\\Users\\\\Model\\\\Entity\\\\User\\:\\:_setTos\\(\\) should return bool but returns string\\.$#"
+ count: 1
+ path: src/Model/Entity/User.php
+
+ -
+ message: "#^Cannot access property \\$username on bool\\.$#"
+ count: 2
+ path: src/Shell/UsersShell.php
+
+ -
+ message: "#^Property CakeDC\\\\Users\\\\Shell\\\\UsersShell\\:\\:\\$Users \\(CakeDC\\\\Users\\\\Model\\\\Table\\\\UsersTable\\) does not accept Cake\\\\Datasource\\\\RepositoryInterface\\.$#"
+ count: 1
+ path: src/Shell/UsersShell.php
+
+ -
+ message: "#^Parameter \\#2 \\$usersTable of class CakeDC\\\\Users\\\\Webauthn\\\\Repository\\\\UserCredentialSourceRepository constructor expects CakeDC\\\\Users\\\\Model\\\\Table\\\\UsersTable\\|null, Cake\\\\ORM\\\\Table given\\.$#"
+ count: 1
+ path: src/Webauthn/BaseAdapter.php
+
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 000000000..f6dbf5f0b
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,16 @@
+includes:
+ - phpstan-baseline.neon
+
+parameters:
+ level: 6
+ checkMissingIterableValueType: false
+ checkGenericClassInNonGenericObjectType: false
+ bootstrapFiles:
+ - tests/bootstrap.php
+ excludes_analyse:
+ - src/Controller/SocialAccountsController.php
+ - src/Controller/UsersAccountsController.php
+ - src/Controller/AppAccountsController.php
+ ignoreErrors:
+
+services:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 500c19975..3a1684f67 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,36 +1,33 @@
-enable|disable reCaptcha
+ + To enable reCaptcha you need to register your site at google reCaptcha console + and add this to your config/users.php file to enable on login: + + ```php + 'Users.reCaptcha.login' => true, + 'Users.reCaptcha.key' => 'YOUR RECAPTCHA KEY', + 'Users.reCaptcha.secret' => 'YOUR RECAPTCHA SECRET', + ``` + To disable (default) add this to your config/users.php + ```php + 'Users.reCaptcha.login' => false, + ``` +BaseController
+ getConfig
+ $checker
+ $checker
+ getConfig
+ AppController
+ public function resetOneTimePasswordAuthenticator($id = null)
+ \ReCaptcha\ReCaptcha
+ AppController
+ SocialIdentifier
+ $exception->getPrevious()
+ $exp
+ function ($exp) use ($identifier, $where) {
+ $result
+ \Cake\Datasource\EntityInterface
+ updateToken
+ $user->id
+ $socialAccount->user_id
+ $user->id
+ $user->social_accounts
+ $socialAccount->id
+ $user->social_accounts
+ $socialAccount
+ $accountData['avatar']
+ $saveResult
+ string
+ $user->id
+ $user->current_password
+ $currentUser->password
+ $user->password_confirm
+ checkPassword
+ $user
+ $context
+ $user->validated
+ $user->active
+ $user->activation_date
+ $user->token_expires
+ $user->active
+ tokenExpired
+ $validateEmail
+ $tokenExpiration
+ tokenExpired
+ $this->_table->isValidateEmail
+ $this->validateEmail
+ $this->useTos
+ $this->validateEmail
+ $this->validateEmail
+ $result
+ $socialAccount
+ \Cake\Datasource\EntityInterface
+ $this->sendSocialValidationEmail($socialAccount, $socialAccount->user)
+ \CakeDC\Users\Model\Entity\User
+ $this->_activateAccount($socialAccount)
+ \CakeDC\Users\Model\Entity\User
+ $socialAccount->token
+ $socialAccount->active
+ $socialAccount->active
+ $socialAccount->user
+ $user
+ $socialAccount
+ $tokenExpiration
+ $existingAccount->user
+ $existingUser
+ $useEmail
+ $validateEmail
+ $tokenExpiration
+ $userData['username'] ?? null
+ $userData['username'] ?? null
+ $accountData['avatar']
+ $userData
+ $userData
+ SocialBehavior
+ $this->_table->isValidateEmail
+ $tos
+ bool
+ SocialAccountsTable
+ \CakeDC\Users\Model\Entity\User|bool
+ UsersTable
+ Plugin
+ Shell
+ parent::getOptionParser()
+ parent::initialize()
+ $user->username
+ $user->username
+ $this->_updateUser($username, $data)
+ bool
+ $error
+ $field
+ $value
+ $field
+ $value
+ $field
+ $user->id
+ $savedUser->role
+ UsersShell
+ $this->Users
+ $title
+ AuthLinkHelper
+ $options['options']
+ $options['options']
+ $this->name
+ \Cake\Mailer\Mailer
+ $indexed
+ -, -
-- Html->link(__d('CakeDC/Users', 'Reset your password here'), $activationUrl) ?> -
-- Url->build($activationUrl)) ?> -
-- , -
diff --git a/src/Template/Email/html/social_account_validation.ctp b/src/Template/Email/html/social_account_validation.ctp deleted file mode 100644 index f6dbd7567..000000000 --- a/src/Template/Email/html/social_account_validation.ctp +++ /dev/null @@ -1,36 +0,0 @@ - - --, -
-- true, - 'plugin' => 'CakeDC/Users', - 'controller' => 'SocialAccounts', - 'action' => 'validateAccount', - $socialAccount['provider'], - $socialAccount['reference'], - $socialAccount['token'], - ]; - echo $this->Html->link($text, $activationUrl); - ?> -
-- Url->build($activationUrl)) ?> -
-- , -
diff --git a/src/Template/Email/html/validation.ctp b/src/Template/Email/html/validation.ctp deleted file mode 100644 index 0e722b118..000000000 --- a/src/Template/Email/html/validation.ctp +++ /dev/null @@ -1,31 +0,0 @@ - true, - 'plugin' => 'CakeDC/Users', - 'controller' => 'Users', - 'action' => 'validateEmail', - isset($token) ? $token : '' -]; -?> --, -
-- Html->link(__d('CakeDC/Users', 'Activate your account here'), $activationUrl) ?> -
-- Url->build($activationUrl)) ?> -
-- , -
diff --git a/src/Template/Email/text/reset_password.ctp b/src/Template/Email/text/reset_password.ctp deleted file mode 100644 index 49018fb92..000000000 --- a/src/Template/Email/text/reset_password.ctp +++ /dev/null @@ -1,25 +0,0 @@ - true, - 'plugin' => 'CakeDC/Users', - 'controller' => 'Users', - 'action' => 'resetPassword', - isset($token) ? $token : '' -]; -?> -, - -Url->build($activationUrl)) ?> - -, - diff --git a/src/Template/Email/text/social_account_validation.ctp b/src/Template/Email/text/social_account_validation.ctp deleted file mode 100644 index 72b1f1279..000000000 --- a/src/Template/Email/text/social_account_validation.ctp +++ /dev/null @@ -1,27 +0,0 @@ - true, - 'plugin' => 'CakeDC/Users', - 'controller' => 'SocialAccounts', - 'action' => 'validateAccount', - $socialAccount['provider'], - $socialAccount['reference'], - $socialAccount['token'], - ]; -?> -, - -Url->build($activationUrl)) ?> - -, - diff --git a/src/Template/Email/text/validation.ctp b/src/Template/Email/text/validation.ctp deleted file mode 100644 index a423ee9ea..000000000 --- a/src/Template/Email/text/validation.ctp +++ /dev/null @@ -1,25 +0,0 @@ - true, - 'plugin' => 'CakeDC/Users', - 'controller' => 'Users', - 'action' => 'validateEmail', - isset($token) ? $token : '' -]; -?> -, - -Url->build($activationUrl)) ?> - -, - diff --git a/src/Template/Layout/Email/html/default.ctp b/src/Template/Layout/Email/html/default.ctp deleted file mode 100644 index 2b4397008..000000000 --- a/src/Template/Layout/Email/html/default.ctp +++ /dev/null @@ -1,24 +0,0 @@ - - - - -
-
-
--
-
- Html->link(__d('CakeDC/Users', 'List Users'), ['action' => 'index']) ?> -
- Html->link(__d('CakeDC/Users', 'List Accounts'), ['controller' => 'Accounts', 'action' => 'index']) ?> -
- Form->create(${$tableAlias}); ?>
-
- Form->button(__d('CakeDC/Users', 'Submit')) ?>
- Form->end() ?>
-
diff --git a/src/Template/Users/change_password.ctp b/src/Template/Users/change_password.ctp
deleted file mode 100644
index 3a7530451..000000000
--- a/src/Template/Users/change_password.ctp
+++ /dev/null
@@ -1,27 +0,0 @@
-
- Flash->render('auth') ?>
- Form->create($user) ?>
-
- Form->button(__d('CakeDC/Users', 'Submit')); ?>
- Form->end() ?>
-
\ No newline at end of file
diff --git a/src/Template/Users/edit.ctp b/src/Template/Users/edit.ctp
deleted file mode 100644
index a60ca1e8e..000000000
--- a/src/Template/Users/edit.ctp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
--
-
- - Form->postLink( - __d('CakeDC/Users', 'Delete'), - ['action' => 'delete', $Users->id], - ['confirm' => __d('CakeDC/Users', 'Are you sure you want to delete # {0}?', $Users->id)] - ); - ?> - -
- Html->link(__d('CakeDC/Users', 'List Users'), ['action' => 'index']) ?> -
- Html->link(__d('CakeDC/Users', 'List Accounts'), ['controller' => 'Accounts', 'action' => 'index']) ?> -
- Form->create($Users); ?>
-
- Form->button(__d('CakeDC/Users', 'Submit')) ?>
- Form->end() ?>
-
diff --git a/src/Template/Users/index.ctp b/src/Template/Users/index.ctp
deleted file mode 100644
index 2b224b85d..000000000
--- a/src/Template/Users/index.ctp
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
--
-
- Html->link(__d('CakeDC/Users', 'New {0}', $tableAlias), ['action' => 'add']) ?> -
-
-
-
-
diff --git a/src/Template/Users/login.ctp b/src/Template/Users/login.ctp
deleted file mode 100644
index 60b36c2af..000000000
--- a/src/Template/Users/login.ctp
+++ /dev/null
@@ -1,50 +0,0 @@
-
-| Paginator->sort('username', __d('CakeDC/Users', 'Username')) ?> | -Paginator->sort('email', __d('CakeDC/Users', 'Email')) ?> | -Paginator->sort('first_name', __d('CakeDC/Users', 'First name')) ?> | -Paginator->sort('last_name', __d('CakeDC/Users', 'Last name')) ?> | -- |
|---|---|---|---|---|
| username) ?> | -email) ?> | -first_name) ?> | -last_name) ?> | -- Html->link(__d('CakeDC/Users', 'View'), ['action' => 'view', $user->id]) ?> - Html->link(__d('CakeDC/Users', 'Change password'), ['action' => 'changePassword', $user->id]) ?> - Html->link(__d('CakeDC/Users', 'Edit'), ['action' => 'edit', $user->id]) ?> - Form->postLink(__d('CakeDC/Users', 'Delete'), ['action' => 'delete', $user->id], ['confirm' => __d('CakeDC/Users', 'Are you sure you want to delete # {0}?', $user->id)]) ?> - | -
-
--
- Paginator->prev('< ' . __d('CakeDC/Users', 'previous')) ?>
- Paginator->numbers() ?>
- Paginator->next(__d('CakeDC/Users', 'next') . ' >') ?>
-
Paginator->counter() ?>
-
- Flash->render('auth') ?>
- Form->create() ?>
-
- User->socialLoginList()); ?>
- Form->button(__d('CakeDC/Users', 'Login')); ?>
- Form->end() ?>
-
diff --git a/src/Template/Users/register.ctp b/src/Template/Users/register.ctp
deleted file mode 100644
index 4238cd603..000000000
--- a/src/Template/Users/register.ctp
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
- Form->create($user); ?>
-
- Form->button(__d('CakeDC/Users', 'Submit')) ?>
- Form->end() ?>
-
diff --git a/src/Template/Users/request_reset_password.ctp b/src/Template/Users/request_reset_password.ctp
deleted file mode 100644
index 462e29bc6..000000000
--- a/src/Template/Users/request_reset_password.ctp
+++ /dev/null
@@ -1,10 +0,0 @@
-
- Flash->render('auth') ?>
- Form->create('User') ?>
-
- Form->button(__d('CakeDC/Users', 'Submit')); ?>
- Form->end() ?>
-
diff --git a/src/Template/Users/resend_token_validation.ctp b/src/Template/Users/resend_token_validation.ctp
deleted file mode 100644
index 90b8aa9d7..000000000
--- a/src/Template/Users/resend_token_validation.ctp
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- Form->create($user); ?>
-
- Form->button(__d('CakeDC/Users', 'Submit')) ?>
- Form->end() ?>
-
diff --git a/src/Template/Users/social_email.ctp b/src/Template/Users/social_email.ctp
deleted file mode 100644
index 7fb86c250..000000000
--- a/src/Template/Users/social_email.ctp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- Flash->render() ?>
- Form->create('User') ?>
-
- Form->button(__d('CakeDC/Users', 'Submit')); ?>
- Form->end() ?>
-
diff --git a/src/Template/Users/view.ctp b/src/Template/Users/view.ctp
deleted file mode 100644
index e0fe84182..000000000
--- a/src/Template/Users/view.ctp
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
--
-
- Html->link(__d('CakeDC/Users', 'Edit User'), ['action' => 'edit', $Users->id]) ?> -
- Form->postLink(__d('CakeDC/Users', 'Delete User'), ['action' => 'delete', $Users->id], ['confirm' => __d('CakeDC/Users', 'Are you sure you want to delete # {0}?', $Users->id)]) ?> -
- Html->link(__d('CakeDC/Users', 'List Users'), ['action' => 'index']) ?> -
- Html->link(__d('CakeDC/Users', 'New User'), ['action' => 'add']) ?> -
- Html->link(__d('CakeDC/Users', 'List Accounts'), ['controller' => 'Accounts', 'action' => 'index']) ?> -
-
-
diff --git a/src/Traits/RandomStringTrait.php b/src/Traits/RandomStringTrait.php
index f1ca7c4d3..6caffad7b 100644
--- a/src/Traits/RandomStringTrait.php
+++ b/src/Traits/RandomStringTrait.php
@@ -1,11 +1,13 @@
$prefix, 'plugin' => $plugin, 'controller' => $controller, 'action' => $action];
+ }
+
+ /**
+ * Check if the action is the one from a request
+ *
+ * @param string $action users action
+ * @param \Cake\Http\ServerRequest $request the request
+ * @return bool
+ */
+ public static function checkActionOnRequest($action, ServerRequest $request)
+ {
+ $route = static::actionParams($action);
+ foreach ($route as $param => $value) {
+ if ($request->getParam($param, null) !== $value) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Setup needed config urls but without overwriting
+ *
+ * @return void
+ */
+ public static function setupConfigUrls()
+ {
+ $urls = self::getDefaultConfigUrls();
+ foreach ($urls as $configKey => $url) {
+ if (!Configure::check($configKey)) {
+ Configure::write($configKey, $url);
+ }
+ }
+ }
+
+ /**
+ * Get a list of default config urls using static::actionUrl method for users url.
+ *
+ * @return array
+ */
+ private static function getDefaultConfigUrls()
+ {
+ $loginAction = static::actionUrl('login');
+
+ return [
+ 'Users.Profile.route' => static::actionUrl('profile'),
+ 'OneTimePasswordAuthenticator.verifyAction' => static::actionUrl('verify'),
+ 'U2f.startAction' => static::actionUrl('u2f'),
+ 'Webauthn2fa.startAction' => static::actionUrl('webauthn2fa'),
+ 'Auth.AuthenticationComponent.loginAction' => $loginAction,
+ 'Auth.AuthenticationComponent.logoutRedirect' => $loginAction,
+ 'Auth.Authenticators.Form.loginUrl' => $loginAction,
+ 'Auth.Authenticators.Cookie.loginUrl' => $loginAction,
+ 'Auth.Authenticators.SocialPendingEmail.loginUrl' => $loginAction,
+ 'Auth.AuthorizationMiddleware.unauthorizedHandler.url' => $loginAction,
+ 'OAuth.path' => static::actionParams('socialLogin'),
+ ];
+ }
+}
diff --git a/src/View/Helper/AuthLinkHelper.php b/src/View/Helper/AuthLinkHelper.php
index 648e64423..06274ae37 100644
--- a/src/View/Helper/AuthLinkHelper.php
+++ b/src/View/Helper/AuthLinkHelper.php
@@ -1,49 +1,83 @@
isAuthorized($url)) {
- $linkOptions = $options;
- unset($linkOptions['before'], $linkOptions['after']);
+ $linkOptions = $options;
+ unset($linkOptions['before'], $linkOptions['after'], $linkOptions['allowed']);
+ $allowed = $options['allowed'] ?? null;
- return Hash::get($options, 'before') . parent::link($title, $url, $linkOptions) . Hash::get($options, 'after');
+ if ($allowed === false) {
+ return '';
+ }
+ if ($allowed === true || $this->isAuthorized($url)) {
+ return ($options['before'] ?? '') .
+ parent::link($title, $url, $linkOptions) .
+ ($options['after'] ?? '');
}
- return false;
+ return '';
}
/**
- * Returns true if the target url is authorized for the logged in user
+ * Wrapper for FormHelper.postLink.
+ * Write the link only if user is authorized.
*
- * @param string|array|null $url url that the user is making request.
- * @return bool
+ * @param string $title Link's title
+ * @param string|array $url Link's url
+ * @param array $options Link's options
+ * @return string Link as a string.
*/
- public function isAuthorized($url = null)
+ public function postLink($title, $url = null, array $options = []): string
{
- $event = new Event(UsersAuthComponent::EVENT_IS_AUTHORIZED, $this, ['url' => $url]);
- $result = $this->_View->eventManager()->dispatch($event);
+ return $this->isAuthorized($url)
+ ? $this->Form->postLink($title, $url, $options)
+ : '';
+ }
- return $result->result;
+ /**
+ * Get the current request
+ *
+ * @return \Cake\Http\ServerRequest
+ */
+ public function getRequest()
+ {
+ return $this->getView()->getRequest();
}
}
diff --git a/src/View/Helper/UserHelper.php b/src/View/Helper/UserHelper.php
index 82c37e8d7..00d32bd93 100644
--- a/src/View/Helper/UserHelper.php
+++ b/src/View/Helper/UserHelper.php
@@ -1,29 +1,33 @@
Html->tag('i', '', [
- 'class' => __d('CakeDC/Users', 'fa fa-{0}', strtolower($name)),
+ 'class' => 'fa fa-' . strtolower($name),
]);
- $providerTitle = __d('CakeDC/Users', '{0} {1}', Hash::get($options, 'label'), Inflector::camelize($name));
- $providerClass = __d('CakeDC/Users', 'btn btn-social btn-{0} ' . Hash::get($options, 'class') ?: '', strtolower($name));
+
+ if (isset($options['title'])) {
+ $providerTitle = $options['title'];
+ } else {
+ $providerTitle = ($options['label'] ?? '') . ' ' . Inflector::camelize($name);
+ }
+
+ $providerClass = 'btn btn-social btn-' . strtolower($name);
+ $optionClass = $options['class'] ?? null;
+ if ($optionClass) {
+ $providerClass .= " $optionClass";
+ }
return $this->Html->link($icon . $providerTitle, "/auth/$name", [
- 'escape' => false, 'class' => $providerClass
+ 'escape' => false, 'class' => $providerClass,
]);
}
/**
* All available Social Login Icons
*
+ * @param array $providerOptions Provider link options.
* @return array Links to Social Login Urls
*/
- public function socialLoginList()
+ public function socialLoginList(array $providerOptions = [])
{
if (!Configure::read('Users.Social.login')) {
return [];
@@ -69,10 +84,16 @@ public function socialLoginList()
$outProviders = [];
$providers = Configure::read('OAuth.providers');
foreach ($providers as $provider => $options) {
- if (!empty($options['options']['redirectUri']) &&
+ if (
+ !empty($options['options']['redirectUri']) &&
!empty($options['options']['clientId']) &&
- !empty($options['options']['clientSecret'])) {
- $outProviders[] = $this->socialLogin($provider);
+ !empty($options['options']['clientSecret'])
+ ) {
+ if (isset($providerOptions[$provider])) {
+ $options['options'] = Hash::merge($options['options'], $providerOptions[$provider]);
+ }
+
+ $outProviders[] = $this->socialLogin($provider, $options['options']);
}
}
@@ -88,30 +109,40 @@ public function socialLoginList()
*/
public function logout($message = null, $options = [])
{
- return $this->AuthLink->link(empty($message) ? __d('CakeDC/Users', 'Logout') : $message, [
- 'plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'logout'
- ], $options);
+ $url = UsersUrl::actionUrl('logout');
+ $title = empty($message) ? __d('cake_d_c/users', 'Logout') : $message;
+
+ return $this->AuthLink->link($title, $url, $options);
}
/**
* Welcome display
- * @return mixed
+ *
+ * @return string|null
*/
public function welcome()
{
- $userId = $this->request->session()->read('Auth.User.id');
- if (empty($userId)) {
- return;
+ $identity = $this->getView()->getRequest()->getAttribute('identity');
+ if (!$identity) {
+ return null;
}
$profileUrl = Configure::read('Users.Profile.route');
- $label = __d('CakeDC/Users', 'Welcome, {0}', $this->AuthLink->link($this->request->session()->read('Auth.User.first_name') ?: $this->request->session()->read('Auth.User.username'), $profileUrl));
+ $title = $identity['first_name'] ?? null;
+ $title = $title ?: ($identity['username'] ?? null);
+ $title = is_array($title) ? '-' : (string)$title;
+ $label = __d(
+ 'cake_d_c/users',
+ 'Welcome, {0}',
+ $this->AuthLink->link($title, $profileUrl)
+ );
return $this->Html->tag('span', $label, ['class' => 'welcome']);
}
/**
* Add reCaptcha script
+ *
* @return void
*/
public function addReCaptchaScript()
@@ -123,19 +154,32 @@ public function addReCaptchaScript()
/**
* Add reCaptcha to the form
+ *
* @return mixed
*/
public function addReCaptcha()
{
if (!Configure::read('Users.reCaptcha.key')) {
- return $this->Html->tag('p', __d('CakeDC/Users', 'reCaptcha is not configured! Please configure Users.reCaptcha.key'));
+ return $this->Html->tag(
+ 'p',
+ __d(
+ 'cake_d_c/users',
+ 'reCaptcha is not configured! Please configure Users.reCaptcha.key'
+ )
+ );
}
$this->addReCaptchaScript();
- $this->Form->unlockField('g-recaptcha-response');
+ try {
+ $this->Form->unlockField('g-recaptcha-response');
+ } catch (\Exception $e) {
+ }
return $this->Html->tag('div', '', [
'class' => 'g-recaptcha',
- 'data-sitekey' => Configure::read('Users.reCaptcha.key')
+ 'data-sitekey' => Configure::read('Users.reCaptcha.key'),
+ 'data-theme' => Configure::read('Users.reCaptcha.theme') ?: 'light',
+ 'data-size' => Configure::read('Users.reCaptcha.size') ?: 'normal',
+ 'data-tabindex' => Configure::read('Users.reCaptcha.tabindex') ?: '3',
]);
}
@@ -143,7 +187,6 @@ public function addReCaptcha()
* Generate a link if the target url is authorized for the logged in user
*
* @deprecated Since 3.2.1. Use AuthLinkHelper::link() instead
- *
* @param string $title link's title.
* @param string|array|null $url url that the user is making request.
* @param array $options Array with option data.
@@ -160,20 +203,66 @@ public function link($title, $url = null, array $options = [])
}
/**
- * Returns true if the target url is authorized for the logged in user
+ * Create links for all social providers enabled social link (connect)
*
- * @deprecated Since 3.2.1. Use AuthLinkHelper::link() instead
+ * @param string $name Provider name in lowercase
+ * @param array $provider Provider configuration
+ * @param bool $isConnected User is connected with this provider
+ * @return string
+ */
+ public function socialConnectLink($name, $provider, $isConnected = false)
+ {
+ $optionClass = $provider['options']['class'] ?? null;
+ $linkClass = 'btn btn-social btn-' . strtolower($name) . ($optionClass ? ' ' . $optionClass : '');
+ if ($isConnected) {
+ $title = __d('cake_d_c/users', 'Connected with {0}', Inflector::camelize($name));
+
+ return " $title";
+ }
+
+ $title = __d('cake_d_c/users', 'Connect with {0}', Inflector::camelize($name));
+
+ return $this->Html->link(
+ " $title",
+ "/link-social/$name",
+ [
+ 'escape' => false,
+ 'class' => $linkClass,
+ ]
+ );
+ }
+
+ /**
+ * Create links for all social providers enabled social link (connect)
*
- * @param string|array|null $url url that the user is making request.
- * @return bool
+ * @param array $socialAccounts All social accounts connected by a user.
+ * @return string
*/
- public function isAuthorized($url = null)
+ public function socialConnectLinkList($socialAccounts = [])
{
- trigger_error(
- 'UserHelper::isAuthorized() deprecated since 3.2.1. Use AuthLinkHelper::isAuthorized() instead',
- E_USER_DEPRECATED
+ if (!Configure::read('Users.Social.login')) {
+ return '';
+ }
+ $html = '';
+ $connectedProviders = array_map(
+ function ($item) {
+ return strtolower($item->provider);
+ },
+ (array)$socialAccounts
);
- return $this->AuthLink->isAuthorized($url);
+ $providers = Configure::read('OAuth.providers');
+ foreach ($providers as $name => $provider) {
+ if (
+ !empty($provider['options']['callbackLinkSocialUri']) &&
+ !empty($provider['options']['linkSocialUri']) &&
+ !empty($provider['options']['clientId']) &&
+ !empty($provider['options']['clientSecret'])
+ ) {
+ $html .= $this->socialConnectLink($name, $provider, in_array($name, $connectedProviders));
+ }
+ }
+
+ return $html;
}
}
diff --git a/src/Webauthn/AuthenticateAdapter.php b/src/Webauthn/AuthenticateAdapter.php
new file mode 100644
index 000000000..592c9590a
--- /dev/null
+++ b/src/Webauthn/AuthenticateAdapter.php
@@ -0,0 +1,68 @@
+getUserEntity();
+ $allowed = array_map(function (PublicKeyCredentialSource $credential) {
+ return $credential->getPublicKeyCredentialDescriptor();
+ }, $this->repository->findAllForUserEntity($userEntity));
+
+ $options = $this->server->generatePublicKeyCredentialRequestOptions(
+ PublicKeyCredentialRequestOptions::USER_VERIFICATION_REQUIREMENT_PREFERRED, // Default value
+ $allowed
+ );
+ $this->request->getSession()->write(
+ 'Webauthn2fa.authenticateOptions',
+ $options
+ );
+
+ return $options;
+ }
+
+ /**
+ * Verify the registration response
+ *
+ * @return \Webauthn\PublicKeyCredentialSource
+ */
+ public function verifyResponse(): \Webauthn\PublicKeyCredentialSource
+ {
+ $options = $this->request->getSession()->read('Webauthn2fa.authenticateOptions');
+
+ return $this->loadAndCheckAssertionResponse($options);
+ }
+
+ /**
+ * @param \Webauthn\PublicKeyCredentialRequestOptions $options request options
+ * @return \Webauthn\PublicKeyCredentialSource
+ */
+ protected function loadAndCheckAssertionResponse($options): PublicKeyCredentialSource
+ {
+ return $this->server->loadAndCheckAssertionResponse(
+ json_encode($this->request->getData()),
+ $options,
+ $this->getUserEntity(),
+ $this->request
+ );
+ }
+}
diff --git a/src/Webauthn/BaseAdapter.php b/src/Webauthn/BaseAdapter.php
new file mode 100644
index 000000000..4ee30b09c
--- /dev/null
+++ b/src/Webauthn/BaseAdapter.php
@@ -0,0 +1,94 @@
+request = $request;
+ $rpEntity = new PublicKeyCredentialRpEntity(
+ Configure::read('Webauthn2fa.appName'), // The application name
+ Configure::read('Webauthn2fa.id')
+ );
+ /**
+ * @var \Cake\ORM\Entity $userSession
+ */
+ $userSession = $request->getSession()->read('Webauthn2fa.User');
+ $usersTable = $usersTable ?? TableRegistry::getTableLocator()
+ ->get($userSession->getSource());
+ $this->user = $usersTable->get($userSession->id);
+ $this->repository = new UserCredentialSourceRepository(
+ $this->user,
+ $usersTable
+ );
+
+ $this->server = new Server(
+ $rpEntity,
+ $this->repository
+ );
+ }
+
+ /**
+ * @return \Webauthn\PublicKeyCredentialUserEntity
+ */
+ protected function getUserEntity(): PublicKeyCredentialUserEntity
+ {
+ $user = $this->getUser();
+
+ return new PublicKeyCredentialUserEntity(
+ $user->webauthn_username ?? $user->username,
+ (string)$user->id,
+ (string)$user->first_name
+ );
+ }
+
+ /**
+ * @return array|mixed|null
+ */
+ public function getUser()
+ {
+ return $this->user;
+ }
+
+ /**
+ * @return bool
+ */
+ public function hasCredential(): bool
+ {
+ return (bool)$this->repository->findAllForUserEntity(
+ $this->getUserEntity()
+ );
+ }
+}
diff --git a/src/Webauthn/RegisterAdapter.php b/src/Webauthn/RegisterAdapter.php
new file mode 100644
index 000000000..c28b0504a
--- /dev/null
+++ b/src/Webauthn/RegisterAdapter.php
@@ -0,0 +1,65 @@
+getUserEntity();
+ $options = $this->server->generatePublicKeyCredentialCreationOptions(
+ $userEntity,
+ PublicKeyCredentialCreationOptions::ATTESTATION_CONVEYANCE_PREFERENCE_NONE,
+ []
+ );
+ $this->request->getSession()->write('Webauthn2fa.registerOptions', $options);
+ $this->request->getSession()->write('Webauthn2fa.userEntity', $userEntity);
+
+ return $options;
+ }
+
+ /**
+ * Verify the registration response
+ *
+ * @return \Webauthn\PublicKeyCredentialSource
+ */
+ public function verifyResponse(): \Webauthn\PublicKeyCredentialSource
+ {
+ $options = $this->request->getSession()->read('Webauthn2fa.registerOptions');
+ $credential = $this->loadAndCheckAttestationResponse($options);
+ $this->repository->saveCredentialSource($credential);
+
+ return $credential;
+ }
+
+ /**
+ * @param \Webauthn\PublicKeyCredentialCreationOptions $options creation options
+ * @return \Webauthn\PublicKeyCredentialSource
+ */
+ protected function loadAndCheckAttestationResponse($options): \Webauthn\PublicKeyCredentialSource
+ {
+ $credential = $this->server->loadAndCheckAttestationResponse(
+ json_encode($this->request->getData()),
+ $options,
+ $this->request
+ );
+
+ return $credential;
+ }
+}
diff --git a/src/Webauthn/Repository/UserCredentialSourceRepository.php b/src/Webauthn/Repository/UserCredentialSourceRepository.php
new file mode 100644
index 000000000..ecda3cbb0
--- /dev/null
+++ b/src/Webauthn/Repository/UserCredentialSourceRepository.php
@@ -0,0 +1,77 @@
+user = $user;
+ $this->usersTable = $usersTable;
+ }
+
+ /**
+ * @param string $publicKeyCredentialId Public key credential id
+ * @return \Webauthn\PublicKeyCredentialSource|null
+ */
+ public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKeyCredentialSource
+ {
+ $encodedId = Base64Url::encode($publicKeyCredentialId);
+ $credential = $this->user['additional_data']['webauthn_credentials'][$encodedId] ?? null;
+
+ return $credential
+ ? PublicKeyCredentialSource::createFromArray($credential)
+ : null;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCredentialUserEntity): array
+ {
+ if ($publicKeyCredentialUserEntity->getId() != $this->user->id) {
+ return [];
+ }
+ $credentials = $this->user['additional_data']['webauthn_credentials'] ?? [];
+ $list = [];
+ foreach ($credentials as $credential) {
+ $list[] = PublicKeyCredentialSource::createFromArray($credential);
+ }
+
+ return $list;
+ }
+
+ /**
+ * @param \Webauthn\PublicKeyCredentialSource $publicKeyCredentialSource Public key credential source
+ */
+ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource): void
+ {
+ $credentials = $this->user['additional_data']['webauthn_credentials'] ?? [];
+ $id = Base64Url::encode($publicKeyCredentialSource->getPublicKeyCredentialId());
+ $credentials[$id] = json_decode(json_encode($publicKeyCredentialSource), true);
+ $this->user['additional_data'] = $this->user['additional_data'] ?? [];
+ $this->user['additional_data']['webauthn_credentials'] = $credentials;
+ $this->usersTable->saveOrFail($this->user);
+ }
+}
diff --git a/templates/Users/add.php b/templates/Users/add.php
new file mode 100644
index 000000000..2b795d20b
--- /dev/null
+++ b/templates/Users/add.php
@@ -0,0 +1,36 @@
+
+id) ?>
-
-
-
-
-
- id) ?>
- -username) ?>
- -email) ?>
- -first_name) ?>
- -last_name) ?>
- -token) ?>
- -api_token) ?>
-
-
-
- Number->format($Users->active) ?>
-
-
-
- token_expires) ?>
- -activation_date) ?>
- -tos_date) ?>
- -created) ?>
- -modified) ?>
-
+
+
+-
+
- Html->link(__d('cake_d_c/users', 'List Users'), ['action' => 'index']) ?> +
+ Form->create(${$tableAlias}); ?>
+
+ Form->button(__d('cake_d_c/users', 'Submit')) ?>
+ Form->end() ?>
+
diff --git a/templates/Users/change_password.php b/templates/Users/change_password.php
new file mode 100644
index 000000000..7efba8f10
--- /dev/null
+++ b/templates/Users/change_password.php
@@ -0,0 +1,27 @@
+
+ Flash->render('auth') ?>
+ Form->create($user) ?>
+
+ Form->button(__d('cake_d_c/users', 'Submit')); ?>
+ Form->end() ?>
+
\ No newline at end of file
diff --git a/templates/Users/edit.php b/templates/Users/edit.php
new file mode 100644
index 000000000..551076252
--- /dev/null
+++ b/templates/Users/edit.php
@@ -0,0 +1,78 @@
+
+
+
+
+-
+
- + Form->postLink( + __d('cake_d_c/users', 'Delete'), + ['action' => 'delete', $Users->id], + ['confirm' => __d('cake_d_c/users', 'Are you sure you want to delete # {0}?', $Users->id)] + ); + ?> + +
- Html->link(__d('cake_d_c/users', 'List Users'), ['action' => 'index']) ?> +
+ Form->create($Users); ?>
+
+ Form->button(__d('cake_d_c/users', 'Submit')) ?>
+ Form->end() ?>
+
+
+
+
diff --git a/templates/Users/index.php b/templates/Users/index.php
new file mode 100644
index 000000000..273c5211c
--- /dev/null
+++ b/templates/Users/index.php
@@ -0,0 +1,55 @@
+
+
+
+
+-
+
- Html->link(__d('cake_d_c/users', 'New {0}', $tableAlias), ['action' => 'add']) ?> +
+
+
+
+
diff --git a/templates/Users/login.php b/templates/Users/login.php
new file mode 100644
index 000000000..99aaf4edd
--- /dev/null
+++ b/templates/Users/login.php
@@ -0,0 +1,50 @@
+
+| Paginator->sort('username', __d('cake_d_c/users', 'Username')) ?> | +Paginator->sort('email', __d('cake_d_c/users', 'Email')) ?> | +Paginator->sort('first_name', __d('cake_d_c/users', 'First name')) ?> | +Paginator->sort('last_name', __d('cake_d_c/users', 'Last name')) ?> | ++ |
|---|---|---|---|---|
| username) ?> | +email) ?> | +first_name) ?> | +last_name) ?> | ++ Html->link(__d('cake_d_c/users', 'View'), ['action' => 'view', $user->id]) ?> + Html->link(__d('cake_d_c/users', 'Change password'), ['action' => 'changePassword', $user->id]) ?> + Html->link(__d('cake_d_c/users', 'Edit'), ['action' => 'edit', $user->id]) ?> + Form->postLink(__d('cake_d_c/users', 'Delete'), ['action' => 'delete', $user->id], ['confirm' => __d('cake_d_c/users', 'Are you sure you want to delete # {0}?', $user->id)]) ?> + | +
+
+-
+ Paginator->prev('< ' . __d('cake_d_c/users', 'previous')) ?>
+ Paginator->numbers() ?>
+ Paginator->next(__d('cake_d_c/users', 'next') . ' >') ?>
+
Paginator->counter() ?>
+
+ Flash->render('auth') ?>
+ Form->create() ?>
+
+ User->socialLoginList()); ?>
+ Form->button(__d('cake_d_c/users', 'Login')); ?>
+ Form->end() ?>
+
diff --git a/src/Template/Users/profile.ctp b/templates/Users/profile.php
similarity index 55%
rename from src/Template/Users/profile.ctp
rename to templates/Users/profile.php
index 65f09904a..bd786ffc1 100644
--- a/src/Template/Users/profile.ctp
+++ b/templates/Users/profile.php
@@ -1,50 +1,54 @@
-
<?= $this->fetch('title') ?>
+
+
+ fetch('content') ?>
+
+
diff --git a/templates/layout/email/text/default.php b/templates/layout/email/text/default.php
new file mode 100644
index 000000000..4d493b97c
--- /dev/null
+++ b/templates/layout/email/text/default.php
@@ -0,0 +1,13 @@
+
+fetch('content');
diff --git a/tests/App/Controller/AppController.php b/tests/App/Controller/AppController.php
deleted file mode 100644
index 5899a4e41..000000000
--- a/tests/App/Controller/AppController.php
+++ /dev/null
@@ -1,24 +0,0 @@
-loadComponent('Flash');
- // $this->loadComponent('CakeDC/Users.UsersAuth');
- $this->loadComponent('RequestHandler');
- }
-}
diff --git a/tests/Fixture/PostsFixture.php b/tests/Fixture/PostsFixture.php
index fadeb7179..4057cbbb8 100644
--- a/tests/Fixture/PostsFixture.php
+++ b/tests/Fixture/PostsFixture.php
@@ -1,11 +1,11 @@
['type' => 'uuid', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
- 'title' => ['type' => 'string', 'length' => 255, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'user_id' => ['type' => 'uuid', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- '_constraints' => [
- 'primary' => ['type' => 'primary', 'columns' => ['id'], 'length' => []],
- ],
- '_options' => [
- 'engine' => 'InnoDB',
- 'collation' => 'utf8_general_ci'
- ],
- ];
- // @codingStandardsIgnoreEnd
-
/**
* Records
*
diff --git a/tests/Fixture/PostsUsersFixture.php b/tests/Fixture/PostsUsersFixture.php
index f4cea2af2..5f5350e9e 100644
--- a/tests/Fixture/PostsUsersFixture.php
+++ b/tests/Fixture/PostsUsersFixture.php
@@ -1,11 +1,11 @@
['type' => 'uuid', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
- 'user_id' => ['type' => 'uuid', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'post_id' => ['type' => 'uuid', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- '_constraints' => [
- 'primary' => ['type' => 'primary', 'columns' => ['id'], 'length' => []],
- ],
- '_options' => [
- 'engine' => 'InnoDB',
- 'collation' => 'utf8_general_ci'
- ],
- ];
- // @codingStandardsIgnoreEnd
-
/**
* Records
*
diff --git a/tests/Fixture/SocialAccountsFixture.php b/tests/Fixture/SocialAccountsFixture.php
index 7e014fa58..9789d2c45 100644
--- a/tests/Fixture/SocialAccountsFixture.php
+++ b/tests/Fixture/SocialAccountsFixture.php
@@ -1,46 +1,23 @@
['type' => 'uuid', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
- 'user_id' => ['type' => 'uuid', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'provider' => ['type' => 'string', 'length' => 255, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
- 'username' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'reference' => ['type' => 'string', 'length' => 255, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'avatar' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'description' => ['type' => 'text', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
- 'token' => ['type' => 'string', 'length' => 500, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'token_secret' => ['type' => 'string', 'length' => 500, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'token_expires' => ['type' => 'datetime', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
- 'active' => ['type' => 'boolean', 'length' => null, 'null' => false, 'default' => true, 'comment' => '', 'precision' => null],
- 'data' => ['type' => 'text', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
- 'created' => ['type' => 'datetime', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
- 'modified' => ['type' => 'datetime', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
- '_constraints' => [
- 'primary' => ['type' => 'primary', 'columns' => ['id'], 'length' => []],
- ],
- '_options' => [
- 'engine' => 'InnoDB',
- 'collation' => 'utf8_general_ci'
- ],
- ];
- // @codingStandardsIgnoreEnd
-
/**
* Records
*
@@ -61,7 +38,7 @@ class SocialAccountsFixture extends TestFixture
'active' => false,
'data' => '',
'created' => '2015-05-22 21:52:44',
- 'modified' => '2015-05-22 21:52:44'
+ 'modified' => '2015-05-22 21:52:44',
],
[
'id' => '00000000-0000-0000-0000-000000000002',
@@ -77,7 +54,7 @@ class SocialAccountsFixture extends TestFixture
'active' => true,
'data' => '',
'created' => '2015-05-22 21:52:44',
- 'modified' => '2015-05-22 21:52:44'
+ 'modified' => '2015-05-22 21:52:44',
],
[
'id' => '00000000-0000-0000-0000-000000000003',
@@ -93,7 +70,7 @@ class SocialAccountsFixture extends TestFixture
'active' => true,
'data' => '',
'created' => '2015-05-22 21:52:44',
- 'modified' => '2015-05-22 21:52:44'
+ 'modified' => '2015-05-22 21:52:44',
],
[
'id' => '00000000-0000-0000-0000-000000000004',
@@ -109,7 +86,7 @@ class SocialAccountsFixture extends TestFixture
'active' => false,
'data' => '',
'created' => '2015-05-22 21:52:44',
- 'modified' => '2015-05-22 21:52:44'
+ 'modified' => '2015-05-22 21:52:44',
],
[
'id' => '00000000-0000-0000-0000-000000000005',
@@ -125,7 +102,7 @@ class SocialAccountsFixture extends TestFixture
'active' => false,
'data' => '',
'created' => '2015-05-22 21:52:44',
- 'modified' => '2015-05-22 21:52:44'
+ 'modified' => '2015-05-22 21:52:44',
],
];
}
diff --git a/tests/Fixture/UsersFixture.php b/tests/Fixture/UsersFixture.php
index 1577a0783..d48f6dc55 100644
--- a/tests/Fixture/UsersFixture.php
+++ b/tests/Fixture/UsersFixture.php
@@ -1,243 +1,262 @@
['type' => 'uuid', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
- 'username' => ['type' => 'string', 'length' => 255, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'email' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'password' => ['type' => 'string', 'length' => 255, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'first_name' => ['type' => 'string', 'length' => 50, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'last_name' => ['type' => 'string', 'length' => 50, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'token' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'token_expires' => ['type' => 'datetime', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
- 'api_token' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
- 'activation_date' => ['type' => 'datetime', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
- 'tos_date' => ['type' => 'datetime', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
- 'active' => ['type' => 'boolean', 'length' => null, 'null' => false, 'default' => true, 'comment' => '', 'precision' => null],
- 'is_superuser' => ['type' => 'boolean', 'length' => null, 'unsigned' => false, 'null' => false, 'default' => false, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
- 'role' => ['type' => 'string', 'length' => 255, 'null' => true, 'default' => 'user', 'comment' => '', 'precision' => null, 'fixed' => null],
- 'created' => ['type' => 'datetime', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
- 'modified' => ['type' => 'datetime', 'length' => null, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
- '_constraints' => [
- 'primary' => ['type' => 'primary', 'columns' => ['id'], 'length' => []],
- ],
- '_options' => [
- 'engine' => 'InnoDB',
- 'collation' => 'utf8_general_ci'
- ],
- ];
- // @codingStandardsIgnoreEnd
+ public function init(): void
+ {
+ $this->records = [
+ [
+ 'id' => '00000000-0000-0000-0000-000000000001',
+ 'username' => 'user-1',
+ 'email' => 'user-1@test.com',
+ 'password' => '12345',
+ 'first_name' => 'first1',
+ 'last_name' => 'last1',
+ 'token' => 'ae93ddbe32664ce7927cf0c5c5a5e59d',
+ 'token_expires' => '2035-06-24 17:33:54',
+ 'api_token' => 'yyy',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => 'yyy',
+ 'secret_verified' => false,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => false,
+ 'is_superuser' => true,
+ 'role' => 'admin',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ 'additional_data' => [
+ 'u2f_registration' => [
+ 'keyHandle' => 'fake key handle',
+ 'publicKey' => 'afdoaj0-23u423-ad ujsf-as8-0-afsd',
+ 'certificate' => '23jdsfoasdj0f9sa082304823423',
+ 'counter' => 1,
+ ],
+ 'webauthn_credentials' => [
+ 'MTJiMzc0ODYtOTI5OS00MzMxLWFjMzMtODViMmQ5ODViNmZl' => [
+ 'publicKeyCredentialId' => '12b37486-9299-4331-ac33-85b2d985b6fe',
+ 'type' => 'public-key',
+ 'transports' => [],
+ 'attestationType' => 'none',
+ 'trustPath' => [
+ 'type' => 'Webauthn\TrustPath\EmptyTrustPath',
+ ],
+ 'aaguid' => '00000000-0000-0000-0000-000000000000',
+ 'credentialPublicKey' => Base64Url::encode('000000000000000000000000000000000000-9999999999999999999999999999999999999999-XXXXXXXXXXXXX-ZZZZZZZZZZZ'),
+ 'userHandle' => Base64Url::encode('00000000-0000-0000-0000-000000000001'),
+ 'counter' => 190,
+ 'otherUI' => null,
+ ],
+ ],
+ ],
+ 'last_login' => '2015-06-24 17:33:54',
+ ],
+ [
+ 'id' => '00000000-0000-0000-0000-000000000002',
+ 'username' => 'user-2',
+ 'email' => 'user-2@test.com',
+ //The password real value is 12345
+ 'password' => '$2y$10$Nvu7ipP.z8tiIl75OdUvt.86vuG6iKMoHIOc7O7mboFI85hSyTEde',
+ 'first_name' => 'user',
+ 'last_name' => 'second',
+ 'token' => '6614f65816754310a5f0553436dd89e9',
+ 'token_expires' => '2015-06-24 17:33:54',
+ 'api_token' => 'xxx',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => 'xxx',
+ 'secret_verified' => false,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => true,
+ 'is_superuser' => true,
+ 'role' => 'admin',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ 'last_login' => '2015-06-24 17:33:54',
+ ],
+ [
+ 'id' => '00000000-0000-0000-0000-000000000003',
+ 'username' => 'user-3',
+ 'email' => 'user-3@test.com',
+ 'password' => '12345',
+ 'first_name' => 'user',
+ 'last_name' => 'third',
+ 'token' => 'token-3',
+ 'token_expires' => '2030-06-20 17:33:54',
+ 'api_token' => 'xxx',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => 'xxx',
+ 'secret_verified' => true,
+ 'is_superuser' => true,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => false,
+ 'role' => 'admin',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ ],
+ [
+ 'id' => '00000000-0000-0000-0000-000000000004',
+ 'username' => 'user-4',
+ 'email' => '4@example.com',
+ 'password' => '$2y$10$Nvu7ipP.z8tiIl75OdUvt.86vuG6iKMoHIOc7O7mboFI85hSyTEde',
+ 'first_name' => 'FirstName4',
+ 'last_name' => 'Lorem ipsum dolor sit amet',
+ 'token' => 'token-4',
+ 'token_expires' => '2030-06-24 17:33:54',
+ 'api_token' => 'Lorem ipsum dolor sit amet',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => 'Lorem ipsum dolor sit amet',
+ 'secret_verified' => true,
+ 'is_superuser' => false,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => true,
+ 'role' => 'Lorem ipsum dolor sit amet',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ ],
+ [
+ 'id' => '00000000-0000-0000-0000-000000000005',
+ 'username' => 'user-5',
+ 'email' => 'test@example.com',
+ 'password' => '12345',
+ 'first_name' => 'first-user-5',
+ 'last_name' => 'firts name 5',
+ 'token' => 'token-5',
+ 'token_expires' => '2015-06-24 17:33:54',
+ 'api_token' => '',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => '',
+ 'secret_verified' => false,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => true,
+ 'is_superuser' => false,
+ 'role' => 'user',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ ],
+ [
+ 'id' => '00000000-0000-0000-0000-000000000006',
+ 'username' => 'user-6',
+ 'email' => '6@example.com',
+ 'password' => '$2y$10$IPPgJNSfvATsMBLbv/2r8OtpyTBibyM1g5GDxD4PivW9qBRwRkRbC',
+ 'first_name' => 'first-user-6',
+ 'last_name' => 'firts name 6',
+ 'token' => 'token-6',
+ 'token_expires' => '2015-06-24 17:33:54',
+ 'api_token' => '',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => '',
+ 'secret_verified' => false,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => true,
+ 'is_superuser' => false,
+ 'role' => 'user',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ ],
+ [
+ 'id' => '00000000-0000-0000-0000-000000000007',
+ 'username' => 'Lorem ipsum dolor sit amet',
+ 'email' => 'Lorem ipsum dolor sit amet',
+ 'password' => 'Lorem ipsum dolor sit amet',
+ 'first_name' => 'Lorem ipsum dolor sit amet',
+ 'last_name' => 'Lorem ipsum dolor sit amet',
+ 'token' => 'Lorem ipsum dolor sit amet',
+ 'token_expires' => '2015-06-24 17:33:54',
+ 'api_token' => 'Lorem ipsum dolor sit amet',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => 'Lorem ipsum dolor sit amet',
+ 'secret_verified' => false,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => true,
+ 'is_superuser' => false,
+ 'role' => 'Lorem ipsum dolor sit amet',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ ],
+ [
+ 'id' => '00000000-0000-0000-0000-000000000008',
+ 'username' => 'Lorem ipsum dolor sit amet',
+ 'email' => 'Lorem ipsum dolor sit amet',
+ 'password' => 'Lorem ipsum dolor sit amet',
+ 'first_name' => 'Lorem ipsum dolor sit amet',
+ 'last_name' => 'Lorem ipsum dolor sit amet',
+ 'token' => 'Lorem ipsum dolor sit amet',
+ 'token_expires' => '2015-06-24 17:33:54',
+ 'api_token' => 'Lorem ipsum dolor sit amet',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => 'Lorem ipsum dolor sit amet',
+ 'secret_verified' => false,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => true,
+ 'is_superuser' => false,
+ 'role' => 'Lorem ipsum dolor sit amet',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ ],
+ [
+ 'id' => '00000000-0000-0000-0000-000000000009',
+ 'username' => 'Lorem ipsum dolor sit amet',
+ 'email' => 'Lorem ipsum dolor sit amet',
+ 'password' => 'Lorem ipsum dolor sit amet',
+ 'first_name' => 'Lorem ipsum dolor sit amet',
+ 'last_name' => 'Lorem ipsum dolor sit amet',
+ 'token' => 'Lorem ipsum dolor sit amet',
+ 'token_expires' => '2015-06-24 17:33:54',
+ 'api_token' => 'Lorem ipsum dolor sit amet',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => 'Lorem ipsum dolor sit amet',
+ 'secret_verified' => false,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => true,
+ 'is_superuser' => false,
+ 'role' => 'Lorem ipsum dolor sit amet',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ ],
+ [
+ 'id' => '00000000-0000-0000-0000-000000000010',
+ 'username' => 'Lorem ipsum dolor sit amet',
+ 'email' => 'Lorem ipsum dolor sit amet',
+ 'password' => 'Lorem ipsum dolor sit amet',
+ 'first_name' => 'Lorem ipsum dolor sit amet',
+ 'last_name' => 'Lorem ipsum dolor sit amet',
+ 'token' => 'Lorem ipsum dolor sit amet',
+ 'token_expires' => '2015-06-24 17:33:54',
+ 'api_token' => 'Lorem ipsum dolor sit amet',
+ 'activation_date' => '2015-06-24 17:33:54',
+ 'secret' => 'Lorem ipsum dolor sit amet',
+ 'secret_verified' => false,
+ 'tos_date' => '2015-06-24 17:33:54',
+ 'active' => true,
+ 'is_superuser' => false,
+ 'role' => 'Lorem ipsum dolor sit amet',
+ 'created' => '2015-06-24 17:33:54',
+ 'modified' => '2015-06-24 17:33:54',
+ ],
+ ];
- /**
- * Records
- *
- * @var array
- */
- public $records = [
- [
- 'id' => '00000000-0000-0000-0000-000000000001',
- 'username' => 'user-1',
- 'email' => 'user-1@test.com',
- 'password' => '12345',
- 'first_name' => 'first1',
- 'last_name' => 'last1',
- 'token' => 'ae93ddbe32664ce7927cf0c5c5a5e59d',
- 'token_expires' => '2035-06-24 17:33:54',
- 'api_token' => 'yyy',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => false,
- 'is_superuser' => true,
- 'role' => 'admin',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- [
- 'id' => '00000000-0000-0000-0000-000000000002',
- 'username' => 'user-2',
- 'email' => 'user-2@test.com',
- 'password' => '12345',
- 'first_name' => 'user',
- 'last_name' => 'second',
- 'token' => '6614f65816754310a5f0553436dd89e9',
- 'token_expires' => '2015-06-24 17:33:54',
- 'api_token' => 'xxx',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => true,
- 'is_superuser' => true,
- 'role' => 'admin',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- [
- 'id' => '00000000-0000-0000-0000-000000000003',
- 'username' => 'user-3',
- 'email' => 'user-3@test.com',
- 'password' => '12345',
- 'first_name' => 'user',
- 'last_name' => 'third',
- 'token' => 'token-3',
- 'token_expires' => '2030-06-20 17:33:54',
- 'api_token' => 'xxx',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => false,
- 'is_superuser' => true,
- 'role' => 'admin',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- [
- 'id' => '00000000-0000-0000-0000-000000000004',
- 'username' => 'user-4',
- 'email' => '4@example.com',
- 'password' => 'Lorem ipsum dolor sit amet',
- 'first_name' => 'FirstName4',
- 'last_name' => 'Lorem ipsum dolor sit amet',
- 'token' => 'token-4',
- 'token_expires' => '2030-06-24 17:33:54',
- 'api_token' => 'Lorem ipsum dolor sit amet',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => true,
- 'is_superuser' => false,
- 'role' => 'Lorem ipsum dolor sit amet',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- [
- 'id' => '00000000-0000-0000-0000-000000000005',
- 'username' => 'user-5',
- 'email' => 'test@example.com',
- 'password' => '12345',
- 'first_name' => 'first-user-5',
- 'last_name' => 'firts name 5',
- 'token' => 'token-5',
- 'token_expires' => '2015-06-24 17:33:54',
- 'api_token' => '',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => true,
- 'is_superuser' => false,
- 'role' => 'user',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- [
- 'id' => '00000000-0000-0000-0000-000000000006',
- 'username' => 'user-6',
- 'email' => '6@example.com',
- 'password' => '$2y$10$IPPgJNSfvATsMBLbv/2r8OtpyTBibyM1g5GDxD4PivW9qBRwRkRbC',
- 'first_name' => 'first-user-6',
- 'last_name' => 'firts name 6',
- 'token' => 'token-6',
- 'token_expires' => '2015-06-24 17:33:54',
- 'api_token' => '',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => true,
- 'is_superuser' => false,
- 'role' => 'user',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- [
- 'id' => '00000000-0000-0000-0000-000000000007',
- 'username' => 'Lorem ipsum dolor sit amet',
- 'email' => 'Lorem ipsum dolor sit amet',
- 'password' => 'Lorem ipsum dolor sit amet',
- 'first_name' => 'Lorem ipsum dolor sit amet',
- 'last_name' => 'Lorem ipsum dolor sit amet',
- 'token' => 'Lorem ipsum dolor sit amet',
- 'token_expires' => '2015-06-24 17:33:54',
- 'api_token' => 'Lorem ipsum dolor sit amet',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => true,
- 'is_superuser' => false,
- 'role' => 'Lorem ipsum dolor sit amet',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- [
- 'id' => '00000000-0000-0000-0000-000000000008',
- 'username' => 'Lorem ipsum dolor sit amet',
- 'email' => 'Lorem ipsum dolor sit amet',
- 'password' => 'Lorem ipsum dolor sit amet',
- 'first_name' => 'Lorem ipsum dolor sit amet',
- 'last_name' => 'Lorem ipsum dolor sit amet',
- 'token' => 'Lorem ipsum dolor sit amet',
- 'token_expires' => '2015-06-24 17:33:54',
- 'api_token' => 'Lorem ipsum dolor sit amet',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => true,
- 'is_superuser' => false,
- 'role' => 'Lorem ipsum dolor sit amet',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- [
- 'id' => '00000000-0000-0000-0000-000000000009',
- 'username' => 'Lorem ipsum dolor sit amet',
- 'email' => 'Lorem ipsum dolor sit amet',
- 'password' => 'Lorem ipsum dolor sit amet',
- 'first_name' => 'Lorem ipsum dolor sit amet',
- 'last_name' => 'Lorem ipsum dolor sit amet',
- 'token' => 'Lorem ipsum dolor sit amet',
- 'token_expires' => '2015-06-24 17:33:54',
- 'api_token' => 'Lorem ipsum dolor sit amet',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => true,
- 'is_superuser' => false,
- 'role' => 'Lorem ipsum dolor sit amet',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- [
- 'id' => '00000000-0000-0000-0000-000000000010',
- 'username' => 'Lorem ipsum dolor sit amet',
- 'email' => 'Lorem ipsum dolor sit amet',
- 'password' => 'Lorem ipsum dolor sit amet',
- 'first_name' => 'Lorem ipsum dolor sit amet',
- 'last_name' => 'Lorem ipsum dolor sit amet',
- 'token' => 'Lorem ipsum dolor sit amet',
- 'token_expires' => '2015-06-24 17:33:54',
- 'api_token' => 'Lorem ipsum dolor sit amet',
- 'activation_date' => '2015-06-24 17:33:54',
- 'tos_date' => '2015-06-24 17:33:54',
- 'active' => true,
- 'is_superuser' => false,
- 'role' => 'Lorem ipsum dolor sit amet',
- 'created' => '2015-06-24 17:33:54',
- 'modified' => '2015-06-24 17:33:54'
- ],
- ];
+ parent::init();
+ }
}
diff --git a/tests/TestCase/Auth/ApiKeyAuthenticateTest.php b/tests/TestCase/Auth/ApiKeyAuthenticateTest.php
deleted file mode 100644
index 90a95c28e..000000000
--- a/tests/TestCase/Auth/ApiKeyAuthenticateTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-getMockBuilder('Cake\Controller\Controller')
- ->setMethods(null)
- ->setConstructorArgs([$request, $response])
- ->getMock();
- $registry = new ComponentRegistry($controller);
- $this->apiKey = new ApiKeyAuthenticate($registry, ['require_ssl' => false]);
- }
-
- /**
- * Tears down the fixture, for example, closes a network connection.
- * This method is called after a test is executed.
- */
- public function tearDown()
- {
- unset($this->apiKey, $this->controller);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testAuthenticateHappy()
- {
- $request = new Request('/?api_key=yyy');
- $result = $this->apiKey->authenticate($request, new Response());
- $this->assertEquals('user-1', $result['username']);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testAuthenticateFail()
- {
- $request = new Request('/');
- $result = $this->apiKey->authenticate($request, new Response());
- $this->assertFalse($result);
-
- $request = new Request('/?api_key=none');
- $result = $this->apiKey->authenticate($request, new Response());
- $this->assertFalse($result);
-
- $request = new Request('/?api_key=');
- $result = $this->apiKey->authenticate($request, new Response());
- $this->assertFalse($result);
- }
-
- /**
- * test
- *
- * @expectedException \OutOfBoundsException
- * @expectedExceptionMessage Type wrong is not valid
- *
- */
- public function testAuthenticateWrongType()
- {
- $this->apiKey->config('type', 'wrong');
- $request = new Request('/');
- $this->apiKey->authenticate($request, new Response());
- }
-
- /**
- * test
- *
- * @expectedException \Cake\Network\Exception\ForbiddenException
- * @expectedExceptionMessage SSL is required for ApiKey Authentication
- *
- */
- public function testAuthenticateRequireSSL()
- {
- $this->apiKey->config('require_ssl', true);
- $request = new Request('/?api_key=test');
- $this->apiKey->authenticate($request, new Response());
- }
-
- /**
- * test
- *
- */
- public function testAuthenticateRequireSSLNoKey()
- {
- $this->apiKey->config('require_ssl', true);
- $request = new Request('/');
- $this->assertFalse($this->apiKey->authenticate($request, new Response()));
- }
-
-
- /**
- * test
- *
- * @return void
- */
- public function testHeaderHappy()
- {
- $request = $this->getMockBuilder('\Cake\Network\Request')
- ->setMethods(['header'])
- ->getMock();
- $request->expects($this->once())
- ->method('header')
- ->with('api_key')
- ->will($this->returnValue('yyy'));
- $this->apiKey->config('type', 'header');
- $result = $this->apiKey->authenticate($request, new Response());
- $this->assertEquals('user-1', $result['username']);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testAuthenticateHeaderFail()
- {
- $request = $this->getMockBuilder('\Cake\Network\Request')
- ->setMethods(['header'])
- ->getMock();
- $request->expects($this->once())
- ->method('header')
- ->with('api_key')
- ->will($this->returnValue('wrong'));
- $this->apiKey->config('type', 'header');
- $result = $this->apiKey->authenticate($request, new Response());
- $this->assertFalse($result);
- }
-}
diff --git a/tests/TestCase/Auth/RememberMeAuthenticateTest.php b/tests/TestCase/Auth/RememberMeAuthenticateTest.php
deleted file mode 100644
index 4a5eb09b7..000000000
--- a/tests/TestCase/Auth/RememberMeAuthenticateTest.php
+++ /dev/null
@@ -1,172 +0,0 @@
-controller = $this->getMockBuilder('Cake\Controller\Controller')
- ->setMethods(null)
- ->setConstructorArgs([$request, $response])
- ->getMock();
- $registry = new ComponentRegistry($this->controller);
- $this->rememberMe = new RememberMeAuthenticate($registry);
- }
-
- /**
- * Tears down the fixture, for example, closes a network connection.
- * This method is called after a test is executed.
- */
- public function tearDown()
- {
- unset($this->rememberMe, $this->controller);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testAuthenticateHappy()
- {
- $request = new Request('/');
- $request->env('HTTP_USER_AGENT', 'user-agent');
- $mockCookie = $this->getMockBuilder('Cake\Controller\Component\CookieComponent')
- ->disableOriginalConstructor()
- ->setMethods(['check', 'read'])
- ->getMock();
- $mockCookie
- ->expects($this->once())
- ->method('read')
- ->with('remember_me')
- ->will($this->returnValue([
- 'id' => '00000000-0000-0000-0000-000000000001',
- 'user_agent' => 'user-agent'
- ]));
- $registry = new ComponentRegistry($this->controller);
- $registry->set('Cookie', $mockCookie);
- $this->rememberMe = new RememberMeAuthenticate($registry);
- $result = $this->rememberMe->authenticate($request, new Response());
- $this->assertEquals('user-1', $result['username']);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testAuthenticateBadUser()
- {
- $request = new Request('/');
- $request->env('HTTP_USER_AGENT', 'user-agent');
- $mockCookie = $this->getMockBuilder('Cake\Controller\Component\CookieComponent')
- ->disableOriginalConstructor()
- ->setMethods(['check', 'read'])
- ->getMock();
- $mockCookie
- ->expects($this->once())
- ->method('read')
- ->with('remember_me')
- ->will($this->returnValue([
- //bad-user
- 'id' => '00000000-0000-0000-0000-000000000000',
- 'user_agent' => 'user-agent'
- ]));
- $registry = new ComponentRegistry($this->controller);
- $registry->set('Cookie', $mockCookie);
- $this->rememberMe = new RememberMeAuthenticate($registry);
- $result = $this->rememberMe->authenticate($request, new Response());
- $this->assertFalse($result);
- }
-
-
- /**
- * test
- *
- * @return void
- */
- public function testAuthenticateBadAgent()
- {
- $request = new Request('/');
- $request->env('HTTP_USER_AGENT', 'user-agent');
- $mockCookie = $this->getMockBuilder('Cake\Controller\Component\CookieComponent')
- ->disableOriginalConstructor()
- ->setMethods(['check', 'read'])
- ->getMock();
- $mockCookie
- ->expects($this->once())
- ->method('read')
- ->with('remember_me')
- ->will($this->returnValue([
- 'id' => '00000000-0000-0000-0000-000000000001',
- 'user_agent' => 'bad-agent'
- ]));
- $registry = new ComponentRegistry($this->controller);
- $registry->set('Cookie', $mockCookie);
- $this->rememberMe = new RememberMeAuthenticate($registry);
- $result = $this->rememberMe->authenticate($request, new Response());
- $this->assertFalse($result);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testAuthenticateNoCookie()
- {
- $request = new Request('/');
- $request->env('HTTP_USER_AGENT', 'user-agent');
- $mockCookie = $this->getMockBuilder('Cake\Controller\Component\CookieComponent')
- ->disableOriginalConstructor()
- ->setMethods(['check', 'read'])
- ->getMock();
- $mockCookie
- ->expects($this->once())
- ->method('read')
- ->with('remember_me')
- ->will($this->returnValue(null));
-
- $registry = new ComponentRegistry($this->controller);
- $registry->set('Cookie', $mockCookie);
- $this->rememberMe = new RememberMeAuthenticate($registry);
- $result = $this->rememberMe->authenticate($request, new Response());
- $this->assertFalse($result);
- }
-}
diff --git a/tests/TestCase/Auth/Rules/OwnerTest.php b/tests/TestCase/Auth/Rules/OwnerTest.php
deleted file mode 100644
index eac550ec8..000000000
--- a/tests/TestCase/Auth/Rules/OwnerTest.php
+++ /dev/null
@@ -1,263 +0,0 @@
-Owner = new Owner();
- $this->request = $this->getMockBuilder('\Cake\Network\Request')
- ->getMock();
- }
-
- /**
- * Tears down the fixture, for example, closes a network connection.
- * This method is called after a test is executed.
- */
- public function tearDown()
- {
- unset($this->Owner);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testAllowed()
- {
- $this->request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Posts',
- 'pass' => ['00000000-0000-0000-0000-000000000001']
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->assertTrue($this->Owner->allowed($user, 'user', $this->request));
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testAllowedUsingTableAlias()
- {
- $this->Owner = new Owner([
- 'table' => 'Posts'
- ]);
- $this->request->params = [
- 'pass' => ['00000000-0000-0000-0000-000000000001']
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->assertTrue($this->Owner->allowed($user, 'user', $this->request));
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testAllowedUsingTableInstance()
- {
- $this->Owner = new Owner([
- 'table' => TableRegistry::get('CakeDC/Users.Posts'),
- ]);
- $this->request->params = [
- 'pass' => ['00000000-0000-0000-0000-000000000001']
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->assertTrue($this->Owner->allowed($user, 'user', $this->request));
- }
-
- /**
- * test
- *
- * @return void
- * @expectedException \OutOfBoundsException
- * @expectedExceptionMessage Table alias is empty, please define a table alias, we could not extract a default table from the request
- */
- public function testAllowedShouldThrowExceptionBecauseEmptyAliasFromRequest()
- {
- $this->request->params = [
- 'pass' => ['00000000-0000-0000-0000-000000000001']
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->Owner->allowed($user, 'user', $this->request);
- }
-
- /**
- * test
- *
- * @return void
- * @expectedException \OutOfBoundsException
- * @expectedExceptionMessage Missing column column_not_found in table Posts while checking ownership permissions for user 00000000-0000-0000-0000-000000000001
- */
- public function testAllowedShouldThrowExceptionBecauseForeignKeyNotPresentInTable()
- {
- $this->Owner = new Owner([
- 'table' => TableRegistry::get('CakeDC/Users.Posts'),
- 'ownerForeignKey' => 'column_not_found',
- ]);
- $this->request->params = [
- 'pass' => ['00000000-0000-0000-0000-000000000001']
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->Owner->allowed($user, 'user', $this->request);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testNotAllowedBecauseNotOwner()
- {
- $this->request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Posts',
- 'pass' => ['00000000-0000-0000-0000-000000000002']
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->assertFalse($this->Owner->allowed($user, 'user', $this->request));
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testNotAllowedBecauseUserNotFound()
- {
- $this->request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Posts',
- 'pass' => ['00000000-0000-0000-0000-000000000002']
- ];
- $user = [
- 'id' => '99999999-0000-0000-0000-000000000000',
- ];
- $this->assertFalse($this->Owner->allowed($user, 'user', $this->request));
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testNotAllowedBecausePostNotFound()
- {
- $this->request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Posts',
- 'pass' => ['99999999-0000-0000-0000-000000000000'] //not found
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->assertFalse($this->Owner->allowed($user, 'user', $this->request));
- }
-
- /**
- * test
- *
- * @return void
- * @expectedException \OutOfBoundsException
- * @expectedExceptionMessage Missing column user_id in table NoDefaultTable while checking ownership permissions for user 00000000-0000-0000-0000-000000000001
- */
- public function testNotAllowedBecauseNoDefaultTable()
- {
- $this->request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'NoDefaultTable',
- 'pass' => ['00000000-0000-0000-0000-000000000001']
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->assertFalse($this->Owner->allowed($user, 'user', $this->request));
- }
-
- /**
- * Test using the Owner rule in a belongsToMany association
- * Posts belongsToMany Users
- * @return void
- */
- public function testAllowedBelongsToMany()
- {
- $this->Owner = new Owner([
- 'table' => 'PostsUsers',
- 'id' => 'post_id',
- ]);
- $this->request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'IsNotUsed',
- 'pass' => ['00000000-0000-0000-0000-000000000001']
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->assertTrue($this->Owner->allowed($user, 'user', $this->request));
- }
-
- /**
- * Test using the Owner rule in a belongsToMany association
- * Posts belongsToMany Users
- * @return void
- */
- public function testNotAllowedBelongsToMany()
- {
- $this->Owner = new Owner([
- 'table' => 'PostsUsers',
- 'id' => 'post_id',
- ]);
- $this->request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'IsNotUsed',
- 'pass' => ['00000000-0000-0000-0000-000000000002']
- ];
- $user = [
- 'id' => '00000000-0000-0000-0000-000000000001',
- ];
- $this->assertFalse($this->Owner->allowed($user, 'user', $this->request));
- }
-}
diff --git a/tests/TestCase/Auth/SimpleRbacAuthorizeTest.php b/tests/TestCase/Auth/SimpleRbacAuthorizeTest.php
deleted file mode 100644
index 205064230..000000000
--- a/tests/TestCase/Auth/SimpleRbacAuthorizeTest.php
+++ /dev/null
@@ -1,857 +0,0 @@
- 'admin',
- 'plugin' => '*',
- 'controller' => '*',
- 'action' => '*',
- ],
- //specific actions allowed for the user role in Users plugin
- [
- 'role' => 'user',
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => ['profile', 'logout'],
- ],
- //all roles allowed to Pages/display
- [
- 'role' => '*',
- 'plugin' => null,
- 'controller' => ['Pages'],
- 'action' => ['display'],
- ],
- ];
-
-
- /**
- * Sets up the fixture, for example, opens a network connection.
- * This method is called before a test is executed.
- */
- public function setUp()
- {
- $request = new Request();
- $response = new Response();
-
- $this->controller = $this->getMockBuilder('Cake\Controller\Controller')
- ->setMethods(null)
- ->setConstructorArgs([$request, $response])
- ->getMock();
- $this->registry = new ComponentRegistry($this->controller);
- }
-
- /**
- * Tears down the fixture, for example, closes a network connection.
- * This method is called after a test is executed.
- */
- public function tearDown()
- {
- unset($this->simpleRbacAuthorize, $this->controller);
- }
-
- /**
- * @covers CakeDC\Users\Auth\SimpleRbacAuthorize::__construct
- */
- public function testConstruct()
- {
- //don't autoload config
- $this->simpleRbacAuthorize = new SimpleRbacAuthorize($this->registry, ['autoload_config' => false]);
- $this->assertEmpty($this->simpleRbacAuthorize->config('permissions'));
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testLoadPermissions()
- {
- $this->simpleRbacAuthorize = $this->getMockBuilder('CakeDC\Users\Auth\SimpleRbacAuthorize')
- ->disableOriginalConstructor()
- ->getMock();
- $reflectedClass = new ReflectionClass($this->simpleRbacAuthorize);
- $loadPermissions = $reflectedClass->getMethod('_loadPermissions');
- $loadPermissions->setAccessible(true);
- $permissions = $loadPermissions->invoke($this->simpleRbacAuthorize, 'missing');
- $this->assertEquals($this->defaultPermissions, $permissions);
- }
-
- /**
- * @covers CakeDC\Users\Auth\SimpleRbacAuthorize::__construct
- */
- public function testConstructMissingPermissionsFile()
- {
- $this->simpleRbacAuthorize = $this->getMockBuilder('CakeDC\Users\Auth\SimpleRbacAuthorize')
- ->setMethods(null)
- ->setConstructorArgs([$this->registry, ['autoload_config' => 'does-not-exist']])
- ->getMock();
- //we should have the default permissions
- $this->assertEquals($this->defaultPermissions, $this->simpleRbacAuthorize->config('permissions'));
- }
-
- protected function assertConstructorPermissions($instance, $config, $permissions)
- {
- $reflectedClass = new ReflectionClass($instance);
- $constructor = $reflectedClass->getConstructor();
- $constructor->invoke($this->simpleRbacAuthorize, $this->registry, $config);
-
- //we should have the default permissions
- $resultPermissions = $this->simpleRbacAuthorize->config('permissions');
- $this->assertEquals($permissions, $resultPermissions);
- }
-
- /**
- * @covers CakeDC\Users\Auth\SimpleRbacAuthorize::__construct
- */
- public function testConstructPermissionsFileHappy()
- {
- $permissions = [[
- 'controller' => 'Test',
- 'action' => 'test'
- ]];
- $className = 'CakeDC\Users\Auth\SimpleRbacAuthorize';
- $this->simpleRbacAuthorize = $this->getMockBuilder($className)
- ->setMethods(['_loadPermissions'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->simpleRbacAuthorize
- ->expects($this->once())
- ->method('_loadPermissions')
- ->with('permissions-happy')
- ->will($this->returnValue($permissions));
- $this->assertConstructorPermissions($className, ['autoload_config' => 'permissions-happy'], $permissions);
- }
-
- protected function preparePermissions($permissions)
- {
- $className = 'CakeDC\Users\Auth\SimpleRbacAuthorize';
- $simpleRbacAuthorize = $this->getMockBuilder($className)
- ->setMethods(['_loadPermissions'])
- ->disableOriginalConstructor()
- ->getMock();
- $simpleRbacAuthorize->config('permissions', $permissions);
-
- return $simpleRbacAuthorize;
- }
-
- /**
- * @dataProvider providerAuthorize
- */
- public function testAuthorize($permissions, $user, $requestParams, $expected, $msg = null)
- {
- $this->simpleRbacAuthorize = $this->preparePermissions($permissions);
- $request = new Request();
- $request->plugin = Hash::get($requestParams, 'plugin');
- $request->controller = $requestParams['controller'];
- $request->action = $requestParams['action'];
- $prefix = Hash::get($requestParams, 'prefix');
- $request->params = [];
- if ($prefix) {
- $request->params['prefix'] = $prefix;
- }
- $extension = Hash::get($requestParams, '_ext');
- if ($extension) {
- $request->params['_ext'] = $extension;
- }
-
- $result = $this->simpleRbacAuthorize->authorize($user, $request);
- $this->assertSame($expected, $result, $msg);
- }
-
- public function providerAuthorize()
- {
- $trueRuleMock = $this->getMockBuilder(Rule::class)
- ->setMethods(['allowed'])
- ->getMock();
- $trueRuleMock->expects($this->any())
- ->method('allowed')
- ->willReturn(true);
-
- return [
- 'happy-strict-all' => [
- //permissions
- [[
- 'plugin' => 'Tests',
- 'role' => 'test',
- 'controller' => 'Tests',
- 'action' => 'test',
- 'allowed' => true,
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'test'
- ],
- //expected
- true
- ],
- 'happy-strict-all-deny' => [
- //permissions
- [[
- 'plugin' => 'Tests',
- 'role' => 'test',
- 'controller' => 'Tests',
- 'action' => 'test',
- 'allowed' => false,
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'test'
- ],
- //expected
- false
- ],
- 'happy-plugin-null-allowed-null' => [
- //permissions
- [[
- 'role' => 'test',
- 'controller' => 'Tests',
- 'action' => 'test',
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => null,
- 'controller' => 'Tests',
- 'action' => 'test'
- ],
- //expected
- true
- ],
- 'happy-plugin-asterisk' => [
- //permissions
- [[
- 'plugin' => '*',
- 'role' => 'test',
- 'controller' => 'Tests',
- 'action' => 'test',
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Any',
- 'controller' => 'Tests',
- 'action' => 'test'
- ],
- //expected
- true
- ],
- 'happy-plugin-asterisk-main-app' => [
- //permissions
- [[
- 'plugin' => '*',
- 'role' => 'test',
- 'controller' => 'Tests',
- 'action' => 'test',
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => null,
- 'controller' => 'Tests',
- 'action' => 'test'
- ],
- //expected
- true
- ],
- 'happy-role-asterisk' => [
- //permissions
- [[
- 'role' => '*',
- 'controller' => 'Tests',
- 'action' => 'test',
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'any-role',
- ],
- //request
- [
- 'plugin' => null,
- 'controller' => 'Tests',
- 'action' => 'test'
- ],
- //expected
- true
- ],
- 'happy-controller-asterisk' => [
- //permissions
- [[
- 'plugin' => 'Tests',
- 'role' => 'test',
- 'controller' => '*',
- 'action' => 'test',
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'test'
- ],
- //expected
- true
- ],
- 'happy-action-asterisk' => [
- //permissions
- [[
- 'plugin' => 'Tests',
- 'role' => 'test',
- 'controller' => 'Tests',
- 'action' => '*',
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'any'
- ],
- //expected
- true
- ],
- 'happy-some-asterisk-allowed' => [
- //permissions
- [[
- 'plugin' => '*',
- 'role' => 'test',
- 'controller' => '*',
- 'action' => '*',
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'any'
- ],
- //expected
- true
- ],
- 'happy-some-asterisk-deny' => [
- //permissions
- [[
- 'plugin' => '*',
- 'role' => 'test',
- 'controller' => '*',
- 'action' => '*',
- 'allowed' => false,
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'any'
- ],
- //expected
- false
- ],
- 'all-deny' => [
- //permissions
- [[
- 'plugin' => '*',
- 'role' => '*',
- 'controller' => '*',
- 'action' => '*',
- 'allowed' => false,
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Any',
- 'controller' => 'Any',
- 'action' => 'any'
- ],
- //expected
- false
- ],
- 'dasherized' => [
- //permissions
- [[
- 'plugin' => 'Tests',
- 'role' => 'test',
- 'controller' => 'TestTests',
- 'action' => 'TestAction',
- 'allowed' => true,
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'tests',
- 'controller' => 'test-tests',
- 'action' => 'test-action'
- ],
- //expected
- true
- ],
- 'happy-array' => [
- //permissions
- [[
- 'plugin' => ['Tests'],
- 'role' => ['test'],
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- true
- ],
- 'happy-array' => [
- //permissions
- [[
- 'plugin' => ['Tests'],
- 'role' => ['test'],
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'three'
- ],
- //expected
- false
- ],
- 'happy-callback-check-params' => [
- //permissions
- [[
- 'plugin' => ['Tests'],
- 'role' => ['test'],
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- 'allowed' => function ($user, $role, $request) {
- return $user['id'] === 1 && $role = 'test' && $request->plugin == 'Tests';
- }
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- true
- ],
- 'happy-callback-deny' => [
- //permissions
- [[
- 'plugin' => ['*'],
- 'role' => ['test'],
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- 'allowed' => function ($user, $role, $request) {
- return false;
- }
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'plugin' => 'Tests',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- false
- ],
- 'happy-prefix' => [
- //permissions
- [[
- 'role' => ['test'],
- 'prefix' => ['admin'],
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'prefix' => 'admin',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- true
- ],
- 'deny-prefix' => [
- //permissions
- [[
- 'role' => ['test'],
- 'prefix' => ['admin'],
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- false
- ],
- 'star-prefix' => [
- //permissions
- [[
- 'role' => ['test'],
- 'prefix' => '*',
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'prefix' => 'admin',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- true
- ],
- 'array-prefix' => [
- //permissions
- [[
- 'role' => ['test'],
- 'prefix' => ['one', 'admin'],
- 'controller' => '*',
- 'action' => '*',
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'prefix' => 'admin',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- true
- ],
- 'array-prefix' => [
- //permissions
- [
- [
- 'role' => ['test'],
- 'prefix' => ['one', 'admin'],
- 'controller' => '*',
- 'action' => 'one',
- 'allowed' => false,
- ],
- [
- 'role' => ['test'],
- 'prefix' => ['one', 'admin'],
- 'controller' => '*',
- 'action' => '*',
- ],
- ],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'prefix' => 'admin',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- false
- ],
- 'happy-ext' => [
- //permissions
- [[
- 'role' => ['test'],
- 'prefix' => ['admin'],
- 'extension' => ['csv'],
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'prefix' => 'admin',
- '_ext' => 'csv',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- true
- ],
- 'deny-ext' => [
- //permissions
- [[
- 'role' => ['test'],
- 'extension' => ['csv'],
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- 'allowed' => false,
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'controller' => 'Tests',
- '_ext' => 'csv',
- 'action' => 'one'
- ],
- //expected
- false
- ],
- 'star-ext' => [
- //permissions
- [[
- 'role' => ['test'],
- 'prefix' => '*',
- 'extension' => '*',
- 'controller' => ['Tests'],
- 'action' => ['one', 'two'],
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'prefix' => 'admin',
- '_ext' => 'other',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- true
- ],
- 'array-ext' => [
- //permissions
- [[
- 'role' => ['test'],
- 'extension' => ['csv', 'pdf'],
- 'controller' => '*',
- 'action' => '*',
- ]],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- '_ext' => 'csv',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- true
- ],
- 'array-ext' => [
- //permissions
- [
- [
- 'role' => ['test'],
- 'extension' => ['csv', 'docx'],
- 'controller' => '*',
- 'action' => 'one',
- 'allowed' => false,
- ],
- [
- 'role' => ['test'],
- 'extension' => ['csv', 'docx'],
- 'controller' => '*',
- 'action' => '*',
- ],
- ],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'prefix' => 'csv',
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- false
- ],
- 'rule-class' => [
- //permissions
- [
- [
- 'role' => ['test'],
- 'controller' => '*',
- 'action' => 'one',
- 'allowed' => $trueRuleMock,
- ],
- ],
- //user
- [
- 'id' => 1,
- 'username' => 'luke',
- 'role' => 'test',
- ],
- //request
- [
- 'controller' => 'Tests',
- 'action' => 'one'
- ],
- //expected
- true
- ],
- ];
- }
-}
diff --git a/tests/TestCase/Auth/SocialAuthenticateTest.php b/tests/TestCase/Auth/SocialAuthenticateTest.php
deleted file mode 100644
index 392bdcb40..000000000
--- a/tests/TestCase/Auth/SocialAuthenticateTest.php
+++ /dev/null
@@ -1,485 +0,0 @@
-Table = TableRegistry::get('CakeDC/Users.Users');
-
- $this->Token = $this->getMockBuilder('League\OAuth2\Client\Token\AccessToken')
- ->setMethods(['getToken', 'getExpires'])
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->controller = $this->getMockBuilder('Cake\Controller\Controller')
- ->setMethods(['failedSocialLogin', 'dispatchEvent'])
- ->setConstructorArgs([$request, $response])
- ->getMock();
-
- $this->controller->expects($this->any())
- ->method('dispatchEvent')
- ->will($this->returnValue(new Event('test')));
-
- $this->Request = $request;
- $this->SocialAuthenticate = $this->_getSocialAuthenticateMockMethods(['_authenticate', '_getProviderName',
- '_mapUser', '_socialLogin', 'dispatchEvent', '_validateConfig', '_getController']);
-
- $this->SocialAuthenticate->expects($this->any())
- ->method('_getController')
- ->will($this->returnValue($this->controller));
- }
-
- /**
- * Tears down the fixture, for example, closes a network connection.
- * This method is called after a test is executed.
- */
- public function tearDown()
- {
- unset($this->SocialAuthenticate, $this->controller);
- }
-
- protected function _getSocialAuthenticateMock()
- {
- return $this->getMockBuilder('CakeDC\Users\Auth\SocialAuthenticate')
- ->disableOriginalConstructor()
- ->getMock();
- }
-
- protected function _getSocialAuthenticateMockMethods($methods)
- {
- return $this->getMockBuilder('CakeDC\Users\Auth\SocialAuthenticate')
- ->disableOriginalConstructor()
- ->setMethods($methods)
- ->getMock();
- }
-
- /**
- * Test getUser
- *
- * @dataProvider providerGetUser
- */
- public function testGetUserAuth($rawData, $mapper)
- {
- $user = $this->Table->get('00000000-0000-0000-0000-000000000002', ['contain' => ['SocialAccounts']]);
-
- $this->controller->expects($this->once())
- ->method('dispatchEvent')
- ->with(UsersAuthComponent::EVENT_AFTER_REGISTER, compact('user'));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_authenticate')
- ->with($this->Request)
- ->will($this->returnValue($rawData));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_getProviderName')
- ->will($this->returnValue('facebook'));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_mapUser')
- ->will($this->returnValue($mapper));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_socialLogin')
- ->will($this->returnValue($user));
-
-
- $result = $this->SocialAuthenticate->getUser($this->Request);
- $this->assertTrue($result['active']);
- $this->assertEquals('00000000-0000-0000-0000-000000000002', $result['id']);
- }
-
- /**
- * Provider for getUser test method
- *
- */
- public function providerGetUser()
- {
- return [
- [
- 'rawData' => [
- 'token' => 'token',
- 'id' => 'reference-2-1',
- 'name' => 'User S',
- 'first_name' => 'user',
- 'last_name' => 'second',
- 'email' => 'userSecond@example.com',
- 'cover' => [
- 'id' => 'reference-2-1'
- ],
- 'gender' => 'female',
- 'locale' => 'en_US',
- 'link' => 'link',
- ],
- 'mappedData' => [
- 'id' => 'reference-2-1',
- 'username' => null,
- 'full_name' => 'User S',
- 'first_name' => 'user',
- 'last_name' => 'second',
- 'email' => 'userSecond@example.com',
- 'link' => 'link',
- 'bio' => null,
- 'locale' => 'en_US',
- 'validated' => true,
- 'credentials' => [
- 'token' => 'token',
- 'secret' => null,
- 'expires' => 1458423682
- ],
- 'raw' => [
-
- ],
- 'provider' => 'Facebook'
- ],
- ]
-
- ];
- }
-
- /**
- * Test getUser
- *
- */
- public function testGetUserSessionData()
- {
- $user = ['username' => 'username', 'email' => 'myemail@test.com'];
- $this->SocialAuthenticate = $this->_getSocialAuthenticateMockMethods(['_authenticate',
- '_getProviderName', '_mapUser', '_touch', '_validateConfig' ]);
-
- $session = $this->getMockBuilder('Cake\Network\Session')
- ->setMethods(['read', 'delete'])
- ->getMock();
- $session->expects($this->once())
- ->method('read')
- ->with('Users.social')
- ->will($this->returnValue($user));
-
- $session->expects($this->once())
- ->method('delete')
- ->with('Users.social');
-
- $this->Request = $this->getMockBuilder('Cake\Network\Request')
- ->setMethods(['session'])
- ->getMock();
- $this->Request->expects($this->any())
- ->method('session')
- ->will($this->returnValue($session));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_touch')
- ->will($this->returnValue($user));
-
- $this->SocialAuthenticate->getUser($this->Request);
- }
-
- /**
- * Test getUser
- *
- * @dataProvider providerGetUser
- */
- public function testGetUserNotEmailProvided($rawData, $mapper)
- {
- $this->SocialAuthenticate->expects($this->once())
- ->method('_authenticate')
- ->with($this->Request)
- ->will($this->returnValue($rawData));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_getProviderName')
- ->will($this->returnValue('facebook'));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_mapUser')
- ->will($this->returnValue($mapper));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_socialLogin')
- ->will($this->throwException(new MissingEmailException('missing email')));
-
- $this->controller->expects($this->once())
- ->method('dispatchEvent')
- ->with(UsersAuthComponent::EVENT_FAILED_SOCIAL_LOGIN);
-
- $this->controller->expects($this->once())
- ->method('failedSocialLogin');
-
- $this->SocialAuthenticate->getUser($this->Request);
- }
-
- /**
- * Test getUser
- *
- * @dataProvider providerGetUser
- */
- public function testGetUserNotActive($rawData, $mapper)
- {
- $this->SocialAuthenticate->expects($this->once())
- ->method('_authenticate')
- ->with($this->Request)
- ->will($this->returnValue($rawData));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_getProviderName')
- ->will($this->returnValue('facebook'));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_mapUser')
- ->will($this->returnValue($mapper));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_socialLogin')
- ->will($this->throwException(new UserNotActiveException('user not active')));
-
- $this->SocialAuthenticate->getUser($this->Request);
- }
-
- /**
- * Test getUser
- *
- * @dataProvider providerGetUser
- */
- public function testGetUserNotActiveAccount($rawData, $mapper)
- {
- $this->SocialAuthenticate->expects($this->once())
- ->method('_authenticate')
- ->with($this->Request)
- ->will($this->returnValue($rawData));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_getProviderName')
- ->will($this->returnValue('facebook'));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_mapUser')
- ->will($this->returnValue($mapper));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_socialLogin')
- ->will($this->throwException(new AccountNotActiveException('user not active')));
-
- $this->SocialAuthenticate->getUser($this->Request);
- }
-
- /**
- * Test getUser
- *
- * @dataProvider providerTwitter
- */
- public function testGetUserNotEmailProvidedTwitter($rawData, $mapper)
- {
- $this->SocialAuthenticate->expects($this->once())
- ->method('_authenticate')
- ->with($this->Request)
- ->will($this->returnValue($rawData));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_getProviderName')
- ->will($this->returnValue('twitter'));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_mapUser')
- ->will($this->returnValue($mapper));
-
- $this->SocialAuthenticate->expects($this->once())
- ->method('_socialLogin')
- ->will($this->throwException(new MissingEmailException('missing email')));
-
- $this->SocialAuthenticate->getUser($this->Request);
- }
-
- /**
- * Provider for getUser test method
- *
- */
- public function providerTwitter()
- {
- return [
- [
- 'rawData' => [
- 'token' => 'token',
- 'id' => 'reference-2-1',
- 'name' => 'User S',
- 'first_name' => 'user',
- 'last_name' => 'second',
- 'email' => 'userSecond@example.com',
- 'cover' => [
- 'id' => 'reference-2-1'
- ],
- 'gender' => 'female',
- 'locale' => 'en_US',
- 'link' => 'link',
- ],
- 'mappedData' => [
- 'id' => 'reference-2-1',
- 'username' => null,
- 'full_name' => 'User S',
- 'first_name' => 'user',
- 'last_name' => 'second',
- 'email' => 'userSecond@example.com',
- 'link' => 'link',
- 'bio' => null,
- 'locale' => 'en_US',
- 'validated' => true,
- 'credentials' => [
- 'token' => 'token',
- 'secret' => null,
- 'expires' => 1458423682
- ],
- 'raw' => [
-
- ],
- 'provider' => 'Twitter'
- ],
- ]
-
- ];
- }
-
- /**
- * Test _socialLogin
- *
- * @dataProvider providerMapper
- */
- public function testSocialLogin()
- {
- $this->SocialAuthenticate = $this->_getSocialAuthenticateMock();
-
- $reflectedClass = new ReflectionClass($this->SocialAuthenticate);
- $socialLogin = $reflectedClass->getMethod('_socialLogin');
- $socialLogin->setAccessible(true);
- $data = [
- 'id' => 'reference-2-1',
- 'provider' => 'Facebook'
- ];
- $result = $socialLogin->invoke($this->SocialAuthenticate, $data);
- $this->assertEquals($result->id, '00000000-0000-0000-0000-000000000002');
- $this->assertTrue($result->active);
- }
-
- /**
- * Test _mapUser
- *
- * @dataProvider providerMapper
- */
- public function testMapUser($data, $mappedData)
- {
- $data['token'] = $this->Token;
- $this->SocialAuthenticate = $this->_getSocialAuthenticateMock();
-
- $reflectedClass = new ReflectionClass($this->SocialAuthenticate);
- $mapUser = $reflectedClass->getMethod('_mapUser');
- $mapUser->setAccessible(true);
-
- $this->Token->expects($this->once())
- ->method('getToken')
- ->will($this->returnValue('token'));
-
- $this->Token->expects($this->once())
- ->method('getExpires')
- ->will($this->returnValue(1458510952));
-
- $result = $mapUser->invoke($this->SocialAuthenticate, 'Facebook', $data);
- unset($result['raw']);
- $this->assertEquals($mappedData, $result);
- }
-
- /**
- * Provider for _mapUser test method
- *
- */
- public function providerMapper()
- {
- return [
- [
- 'rawData' => [
- 'id' => 'my-facebook-id',
- 'name' => 'My name.',
- 'first_name' => 'My first name',
- 'last_name' => 'My lastname.',
- 'email' => 'myemail@example.com',
- 'gender' => 'female',
- 'locale' => 'en_US',
- 'link' => 'https://www.facebook.com/app_scoped_user_id/my-facebook-id/',
- ],
- 'mappedData' => [
- 'id' => 'my-facebook-id',
- 'username' => null,
- 'full_name' => 'My name.',
- 'first_name' => 'My first name',
- 'last_name' => 'My lastname.',
- 'email' => 'myemail@example.com',
- 'avatar' => 'https://graph.facebook.com/my-facebook-id/picture?type=large',
- 'gender' => 'female',
- 'link' => 'https://www.facebook.com/app_scoped_user_id/my-facebook-id/',
- 'bio' => null,
- 'locale' => 'en_US',
- 'validated' => true,
- 'credentials' => [
- 'token' => 'token',
- 'secret' => null,
- 'expires' => (int)1458510952
- ],
- 'provider' => 'Facebook'
- ],
- ]
-
- ];
- }
-
- /**
- * Test _mapUser
- *
- * @expectedException CakeDC\Users\Exception\MissingProviderException
- */
- public function testMapUserException()
- {
- $data = [];
- $this->SocialAuthenticate = $this->_getSocialAuthenticateMock();
-
- $reflectedClass = new ReflectionClass($this->SocialAuthenticate);
- $mapUser = $reflectedClass->getMethod('_mapUser');
- $mapUser->setAccessible(true);
- $mapUser->invoke($this->SocialAuthenticate, null, $data);
- }
-}
diff --git a/tests/TestCase/Auth/SuperuserAuthorizeTest.php b/tests/TestCase/Auth/SuperuserAuthorizeTest.php
deleted file mode 100644
index 29d12d1b9..000000000
--- a/tests/TestCase/Auth/SuperuserAuthorizeTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-controller = $this->getMockBuilder('Cake\Controller\Controller')
- ->setMethods(null)
- ->setConstructorArgs([$request, $response])
- ->getMock();
- $registry = new ComponentRegistry($this->controller);
- $this->superuserAuthorize = new SuperuserAuthorize($registry);
- }
-
- /**
- * Tears down the fixture, for example, closes a network connection.
- * This method is called after a test is executed.
- */
- public function tearDown()
- {
- unset($this->superuserAuthorize, $this->controller);
- }
-
- /**
- * @covers CakeDC\Users\Auth\SuperuserAuthorize::authorize
- */
- public function testAuthorizeIsSuperuser()
- {
- $user = [
- 'is_superuser' => true,
- ];
- $request = new Request();
- $result = $this->superuserAuthorize->authorize($user, $request);
- $this->assertTrue($result);
- }
-
- /**
- * @covers CakeDC\Users\Auth\SuperuserAuthorize::authorize
- */
- public function testAuthorizeIsNotSuperuser()
- {
- $user = [
- 'is_superuser' => false,
- ];
- $request = new Request();
- $result = $this->superuserAuthorize->authorize($user, $request);
- $this->assertFalse($result);
- }
-
- /**
- * @covers CakeDC\Users\Auth\SuperuserAuthorize::authorize
- */
- public function testAuthorizeWeirdUser()
- {
- $request = new Request();
- $user = 'non array';
- $result = $this->superuserAuthorize->authorize($user, $request);
- $this->assertFalse($result);
- }
-}
diff --git a/tests/TestCase/Authenticator/SocialAuthenticatorTest.php b/tests/TestCase/Authenticator/SocialAuthenticatorTest.php
new file mode 100644
index 000000000..981f63ea2
--- /dev/null
+++ b/tests/TestCase/Authenticator/SocialAuthenticatorTest.php
@@ -0,0 +1,610 @@
+Provider = $this->getMockBuilder('\League\OAuth2\Client\Provider\Facebook')->setConstructorArgs([
+ [
+ 'graphApiVersion' => 'v2.8',
+ 'redirectUri' => '/auth/facebook',
+ 'linkSocialUri' => '/link-social/facebook',
+ 'callbackLinkSocialUri' => '/callback-link-social/facebook',
+ 'clientId' => '10003030300303',
+ 'clientSecret' => 'secretpassword',
+ ],
+ [],
+ ])->setMethods([
+ 'getAccessToken', 'getState', 'getAuthorizationUrl', 'getResourceOwner',
+ ])->getMock();
+
+ $config = [
+ 'service' => 'CakeDC\Auth\Social\Service\OAuth2Service',
+ 'className' => $this->Provider,
+ 'mapper' => 'CakeDC\Auth\Social\Mapper\Facebook',
+ 'options' => [
+ 'state' => '__TEST_STATE__',
+ 'graphApiVersion' => 'v2.8',
+ 'redirectUri' => '/auth/facebook',
+ 'linkSocialUri' => '/link-social/facebook',
+ 'callbackLinkSocialUri' => '/callback-link-social/facebook',
+ 'clientId' => '10003030300303',
+ 'clientSecret' => 'secretpassword',
+ ],
+ 'collaborators' => [],
+ 'signature' => null,
+ 'mapFields' => [],
+ 'path' => [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => 'socialLogin',
+ 'prefix' => null,
+ ],
+ ];
+ Configure::write('OAuth.providers.facebook', $config);
+
+ $this->Request = ServerRequestFactory::fromGlobals();
+ }
+
+ /**
+ * Test authenticate method without social service
+ *
+ * @return void
+ */
+ public function testAuthenticateNoSocialService()
+ {
+ $uri = new Uri('/auth/facebook');
+ $this->Request = $this->Request->withUri($uri);
+ $this->Request = $this->Request->withQueryParams([
+ 'code' => 'ZPO9972j3092304230',
+ 'state' => '__TEST_STATE__',
+ ]);
+ $this->Request = $this->Request->withAttribute('params', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => 'socialLogin',
+ 'provider' => 'facebook',
+ ]);
+ $this->Request->getSession()->write('oauth2state', '__TEST_STATE__');
+
+ $identifiers = new IdentifierCollection([
+ 'CakeDC/Users.Social',
+ ]);
+ $Authenticator = new SocialAuthenticator($identifiers);
+ $Response = new Response();
+ $result = $Authenticator->authenticate($this->Request, $Response);
+ $this->assertInstanceOf(Result::class, $result);
+ $this->assertEquals(Result::FAILURE_CREDENTIALS_MISSING, $result->getStatus());
+ $actual = $result->getData();
+ $this->assertEmpty($actual);
+ }
+
+ /**
+ * Test authenticate method with successfull authentication
+ *
+ * @return void
+ */
+ public function testAuthenticateSuccessfullyAuthenticated()
+ {
+ $uri = new Uri('/auth/facebook');
+ $this->Request = $this->Request->withUri($uri);
+ $this->Request = $this->Request->withQueryParams([
+ 'code' => 'ZPO9972j3092304230',
+ 'state' => '__TEST_STATE__',
+ ]);
+ $this->Request = $this->Request->withAttribute('params', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => 'socialLogin',
+ 'provider' => 'facebook',
+ ]);
+ $this->Request->getSession()->write('oauth2state', '__TEST_STATE__');
+
+ $Token = new \League\OAuth2\Client\Token\AccessToken([
+ 'access_token' => 'test-token',
+ 'expires' => 1490988496,
+ ]);
+
+ $user = new FacebookUser([
+ 'id' => '1',
+ 'name' => 'Test User',
+ 'first_name' => 'Test',
+ 'last_name' => 'User',
+ 'email' => 'test@gmail.com',
+ 'hometown' => [
+ 'id' => '108226049197930',
+ 'name' => 'Madrid',
+ ],
+ 'picture' => [
+ 'data' => [
+ 'url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ ],
+ ],
+ 'cover' => [
+ 'source' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'id' => '1',
+ ],
+ 'gender' => 'male',
+ 'locale' => 'en_US',
+ 'link' => 'https://www.facebook.com/app_scoped_user_id/1/',
+ 'timezone' => -5,
+ 'age_range' => [
+ 'min' => 21,
+ ],
+ 'bio' => 'I am the best test user in the world.',
+ 'picture_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ 'cover_photo_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ ]);
+
+ $this->Provider->expects($this->never())
+ ->method('getAuthorizationUrl');
+
+ $this->Provider->expects($this->never())
+ ->method('getState');
+
+ $this->Provider->expects($this->any())
+ ->method('getAccessToken')
+ ->with(
+ $this->equalTo('authorization_code'),
+ $this->equalTo(['code' => 'ZPO9972j3092304230'])
+ )
+ ->will($this->returnValue($Token));
+
+ $this->Provider->expects($this->any())
+ ->method('getResourceOwner')
+ ->with(
+ $this->equalTo($Token)
+ )
+ ->will($this->returnValue($user));
+
+ $service = (new ServiceFactory())->createFromProvider('facebook');
+ $this->Request = $this->Request->withAttribute('socialService', $service);
+ $identifiers = new IdentifierCollection([
+ 'CakeDC/Users.Social',
+ ]);
+ $Authenticator = new SocialAuthenticator($identifiers);
+ $Response = new Response();
+ $result = $Authenticator->authenticate($this->Request, $Response);
+ $this->assertInstanceOf(Result::class, $result);
+ $this->assertEquals(Result::SUCCESS, $result->getStatus());
+ $actual = $result->getData();
+ $this->assertInstanceOf(User::class, $actual);
+ $this->assertEquals('test@gmail.com', $actual->email);
+ }
+
+ /**
+ * Test authenticate method with error, getRawData is null
+ *
+ * @return void
+ */
+ public function testAuthenticateGetRawDataNull()
+ {
+ $uri = new Uri('/auth/facebook');
+ $this->Request = $this->Request->withUri($uri);
+ $this->Request = $this->Request->withQueryParams([
+ 'code' => 'ZPO9972j3092304230',
+ 'state' => '__TEST_STATE__',
+ ]);
+ $this->Request = $this->Request->withAttribute('params', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => 'socialLogin',
+ 'provider' => 'facebook',
+ ]);
+ $this->Request->getSession()->write('oauth2state', '__TEST_STATE__');
+
+ $Token = new \League\OAuth2\Client\Token\AccessToken([
+ 'access_token' => 'test-token',
+ 'expires' => 1490988496,
+ ]);
+
+ $this->Provider->expects($this->never())
+ ->method('getAuthorizationUrl');
+
+ $this->Provider->expects($this->never())
+ ->method('getState');
+
+ $this->Provider->expects($this->any())
+ ->method('getAccessToken')
+ ->with(
+ $this->equalTo('authorization_code'),
+ $this->equalTo(['code' => 'ZPO9972j3092304230'])
+ )
+ ->will($this->returnValue($Token));
+
+ $this->Provider->expects($this->any())
+ ->method('getResourceOwner')
+ ->with(
+ $this->equalTo($Token)
+ )
+ ->will($this->throwException(new \UnexpectedValueException('User not found')));
+
+ $service = (new ServiceFactory())->createFromProvider('facebook');
+ $this->Request = $this->Request->withAttribute('socialService', $service);
+ $identifiers = new IdentifierCollection([
+ 'CakeDC/Users.Social',
+ ]);
+ $Authenticator = new SocialAuthenticator($identifiers);
+ $Response = new Response();
+ $result = $Authenticator->authenticate($this->Request, $Response);
+ $this->assertInstanceOf(Result::class, $result);
+ $this->assertEquals(Result::FAILURE_IDENTITY_NOT_FOUND, $result->getStatus());
+ $actual = $result->getData();
+ $this->assertEmpty($actual);
+ }
+
+ /**
+ * Test authenticate method when social users does not have email
+ *
+ * @return void
+ */
+ public function testAuthenticateErrorNoEmail()
+ {
+ $uri = new Uri('/auth/facebook');
+ $this->Request = $this->Request->withUri($uri);
+ $this->Request = $this->Request->withQueryParams([
+ 'code' => 'ZPO9972j3092304230',
+ 'state' => '__TEST_STATE__',
+ ]);
+ $this->Request = $this->Request->withAttribute('params', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => 'socialLogin',
+ 'provider' => 'facebook',
+ ]);
+ $this->Request->getSession()->write('oauth2state', '__TEST_STATE__');
+
+ $Token = new \League\OAuth2\Client\Token\AccessToken([
+ 'access_token' => 'test-token',
+ 'expires' => 1490988496,
+ ]);
+
+ $user = new FacebookUser([
+ 'id' => '1',
+ 'name' => 'Test User',
+ 'first_name' => 'Test',
+ 'last_name' => 'User',
+ 'hometown' => [
+ 'id' => '108226049197930',
+ 'name' => 'Madrid',
+ ],
+ 'picture' => [
+ 'data' => [
+ 'url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ ],
+ ],
+ 'cover' => [
+ 'source' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'id' => '1',
+ ],
+ 'gender' => 'male',
+ 'locale' => 'en_US',
+ 'link' => 'https://www.facebook.com/app_scoped_user_id/1/',
+ 'timezone' => -5,
+ 'age_range' => [
+ 'min' => 21,
+ ],
+ 'bio' => 'I am the best test user in the world.',
+ 'picture_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ 'cover_photo_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ ]);
+
+ $this->Provider->expects($this->never())
+ ->method('getAuthorizationUrl');
+
+ $this->Provider->expects($this->never())
+ ->method('getState');
+
+ $this->Provider->expects($this->any())
+ ->method('getAccessToken')
+ ->with(
+ $this->equalTo('authorization_code'),
+ $this->equalTo(['code' => 'ZPO9972j3092304230'])
+ )
+ ->will($this->returnValue($Token));
+
+ $this->Provider->expects($this->any())
+ ->method('getResourceOwner')
+ ->with(
+ $this->equalTo($Token)
+ )
+ ->will($this->returnValue($user));
+
+ $service = (new ServiceFactory())->createFromProvider('facebook');
+ $this->Request = $this->Request->withAttribute('socialService', $service);
+ $identifiers = new IdentifierCollection([
+ 'CakeDC/Users.Social',
+ ]);
+ $Authenticator = new SocialAuthenticator($identifiers);
+ $Response = new Response();
+ $result = false;
+ try {
+ $Authenticator->authenticate($this->Request, $Response);
+ } catch (SocialAuthenticationException $e) {
+ $rawData = ['token' => $Token] + $user->toArray();
+ $mapper = new MapUser();
+ $expected = [
+ 'rawData' => $mapper($service, $rawData),
+ ];
+ $actual = $e->getAttributes();
+ $this->assertEquals($expected, $actual);
+ $this->assertEquals(400, $e->getCode());
+
+ $this->assertInstanceOf(MissingEmailException::class, $e->getPrevious());
+ $result = true;
+ }
+ $this->assertTrue($result);
+ }
+
+ /**
+ * Test authenticate method when social identifier return null
+ *
+ * @return void
+ */
+ public function testAuthenticateIdentifierReturnedNull()
+ {
+ $uri = new Uri('/auth/facebook');
+ $this->Request = $this->Request->withUri($uri);
+ $this->Request = $this->Request->withQueryParams([
+ 'code' => 'ZPO9972j3092304230',
+ 'state' => '__TEST_STATE__',
+ ]);
+ $this->Request = $this->Request->withAttribute('params', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => 'socialLogin',
+ 'provider' => 'facebook',
+ ]);
+ $this->Request->getSession()->write('oauth2state', '__TEST_STATE__');
+
+ $Token = new \League\OAuth2\Client\Token\AccessToken([
+ 'access_token' => 'test-token',
+ 'expires' => 1490988496,
+ ]);
+
+ $user = new FacebookUser([
+ 'id' => '1',
+ 'name' => 'Test User',
+ 'first_name' => 'Test',
+ 'last_name' => 'User',
+ 'hometown' => [
+ 'id' => '108226049197930',
+ 'name' => 'Madrid',
+ ],
+ 'picture' => [
+ 'data' => [
+ 'url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ ],
+ ],
+ 'cover' => [
+ 'source' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'id' => '1',
+ ],
+ 'gender' => 'male',
+ 'locale' => 'en_US',
+ 'link' => 'https://www.facebook.com/app_scoped_user_id/1/',
+ 'timezone' => -5,
+ 'age_range' => [
+ 'min' => 21,
+ ],
+ 'bio' => 'I am the best test user in the world.',
+ 'picture_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ 'cover_photo_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ ]);
+
+ $this->Provider->expects($this->never())
+ ->method('getAuthorizationUrl');
+
+ $this->Provider->expects($this->never())
+ ->method('getState');
+
+ $this->Provider->expects($this->any())
+ ->method('getAccessToken')
+ ->with(
+ $this->equalTo('authorization_code'),
+ $this->equalTo(['code' => 'ZPO9972j3092304230'])
+ )
+ ->will($this->returnValue($Token));
+
+ $this->Provider->expects($this->any())
+ ->method('getResourceOwner')
+ ->with(
+ $this->equalTo($Token)
+ )
+ ->will($this->returnValue($user));
+
+ $service = (new ServiceFactory())->createFromProvider('facebook');
+ $this->Request = $this->Request->withAttribute('socialService', $service);
+ $identifiers = new IdentifierCollection([]);
+ $Authenticator = new SocialAuthenticator($identifiers);
+ $Response = new Response();
+ $Authenticator->authenticate($this->Request, $Response);
+ $result = $Authenticator->authenticate($this->Request, $Response);
+ $this->assertInstanceOf(Result::class, $result);
+ $this->assertEquals(Result::FAILURE_IDENTITY_NOT_FOUND, $result->getStatus());
+ $actual = $result->getData();
+ $this->assertEmpty($actual);
+ }
+
+ /**
+ * Data provider for testAuthenticateErrorException
+ *
+ * @return array
+ */
+ public function dataProviderAuthenticateErrorException()
+ {
+ return [
+ [
+ new AccountNotActiveException('Not Active'),
+ SocialAuthenticator::FAILURE_ACCOUNT_NOT_ACTIVE,
+ ],
+ [
+ new UserNotActiveException('Not Active'),
+ SocialAuthenticator::FAILURE_USER_NOT_ACTIVE,
+ ],
+ ];
+ }
+
+ /**
+ * Test authenticate method with successfull authentication
+ *
+ * @param \Exception $exception thrown exception
+ * @param string $status expected status from Result object
+ * @dataProvider dataProviderAuthenticateErrorException
+ * @return void
+ */
+ public function testAuthenticateErrorException($exception, $status)
+ {
+ $uri = new Uri('/auth/facebook');
+ $this->Request = $this->Request->withUri($uri);
+ $this->Request = $this->Request->withQueryParams([
+ 'code' => 'ZPO9972j3092304230',
+ 'state' => '__TEST_STATE__',
+ ]);
+ $this->Request = $this->Request->withAttribute('params', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => 'socialLogin',
+ 'provider' => 'facebook',
+ ]);
+ $this->Request->getSession()->write('oauth2state', '__TEST_STATE__');
+
+ $Token = new \League\OAuth2\Client\Token\AccessToken([
+ 'access_token' => 'test-token',
+ 'expires' => 1490988496,
+ ]);
+
+ $user = new FacebookUser([
+ 'id' => '1',
+ 'name' => 'Test User',
+ 'first_name' => 'Test',
+ 'last_name' => 'User',
+ 'email' => 'test@gmail.com',
+ 'hometown' => [
+ 'id' => '108226049197930',
+ 'name' => 'Madrid',
+ ],
+ 'picture' => [
+ 'data' => [
+ 'url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ ],
+ ],
+ 'cover' => [
+ 'source' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'id' => '1',
+ ],
+ 'gender' => 'male',
+ 'locale' => 'en_US',
+ 'link' => 'https://www.facebook.com/app_scoped_user_id/1/',
+ 'timezone' => -5,
+ 'age_range' => [
+ 'min' => 21,
+ ],
+ 'bio' => 'I am the best test user in the world.',
+ 'picture_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ 'cover_photo_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ ]);
+
+ $this->Provider->expects($this->never())
+ ->method('getAuthorizationUrl');
+
+ $this->Provider->expects($this->never())
+ ->method('getState');
+
+ $this->Provider->expects($this->any())
+ ->method('getAccessToken')
+ ->with(
+ $this->equalTo('authorization_code'),
+ $this->equalTo(['code' => 'ZPO9972j3092304230'])
+ )
+ ->will($this->returnValue($Token));
+
+ $this->Provider->expects($this->any())
+ ->method('getResourceOwner')
+ ->with(
+ $this->equalTo($Token)
+ )
+ ->will($this->returnValue($user));
+
+ $service = (new ServiceFactory())->createFromProvider('facebook');
+ $this->Request = $this->Request->withAttribute('socialService', $service);
+ $identifiers = $this->getMockBuilder(IdentifierCollection::class)->getMock();
+ $identifiers->expects($this->once())
+ ->method('identify')
+ ->will($this->throwException($exception));
+
+ $Authenticator = new SocialAuthenticator($identifiers);
+ $Response = new Response();
+ $result = $Authenticator->authenticate($this->Request, $Response);
+ $this->assertInstanceOf(Result::class, $result);
+ $this->assertEquals($status, $result->getStatus());
+ $actual = $result->getData();
+ $this->assertEmpty($actual);
+ }
+}
diff --git a/tests/TestCase/Authenticator/SocialPendingEmailAuthenticatorTest.php b/tests/TestCase/Authenticator/SocialPendingEmailAuthenticatorTest.php
new file mode 100644
index 000000000..949153707
--- /dev/null
+++ b/tests/TestCase/Authenticator/SocialPendingEmailAuthenticatorTest.php
@@ -0,0 +1,187 @@
+Request = ServerRequestFactory::fromGlobals();
+ }
+
+ /**
+ * testAuthenticate
+ *
+ * @return void
+ */
+ public function testAuthenticateInvalidUrl()
+ {
+ $builder = Router::createRouteBuilder('/');
+ $builder->connect('/users/validate-email/*', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => 'socialEmail',
+ ]);
+
+ $user = $this->getUserData();
+ $requestNoEmail = ServerRequestFactory::fromGlobals(
+ ['REQUEST_URI' => '/users/users/social-email-invalid'],
+ [],
+ []
+ );
+ $requestNoEmail->getSession()->write(Configure::read('Users.Key.Session.social'), $user);
+ $Response = new Response();
+ $identifiers = new IdentifierCollection([
+ 'CakeDC/Users.Social',
+ ]);
+ $Authenticator = new SocialPendingEmailAuthenticator($identifiers);
+ $result = $Authenticator->authenticate($requestNoEmail, $Response);
+ $this->assertInstanceOf(Result::class, $result);
+ $this->assertEquals(Result::FAILURE_OTHER, $result->getStatus());
+ }
+
+ /**
+ * testAuthenticate
+ *
+ * @return void
+ */
+ public function testAuthenticateBaseFailed()
+ {
+ $builder = Router::createRouteBuilder('/');
+ $builder->connect('/users/social-email/*', [
+ 'plugin' => 'CakeDC/Users',
+ 'controller' => 'Users',
+ 'action' => 'socialEmail',
+ ]);
+
+ $user = $this->getUserData();
+ $requestNoEmail = ServerRequestFactory::fromGlobals(
+ ['REQUEST_URI' => '/users/social-email', 'PHP_SELF' => ''],
+ [],
+ []
+ );
+ $request = ServerRequestFactory::fromGlobals(
+ ['REQUEST_URI' => '/users/social-email', 'PHP_SELF' => ''],
+ [],
+ ['email' => 'testAuthenticateBaseFailed@example.com']
+ );
+ Configure::write('Users.Email.validate', false);
+ $request->getSession()->write(Configure::read('Users.Key.Session.social'), $user);
+ $requestNoEmail->getSession()->write(Configure::read('Users.Key.Session.social'), $user);
+ $Response = new Response();
+ $identifiers = new IdentifierCollection([
+ 'CakeDC/Users.Social',
+ ]);
+ $Authenticator = new SocialPendingEmailAuthenticator($identifiers);
+ $result = $Authenticator->authenticate($requestNoEmail, $Response);
+ $this->assertInstanceOf(Result::class, $result);
+ $this->assertEquals(Result::FAILURE_CREDENTIALS_MISSING, $result->getStatus());
+
+ $Authenticator = new SocialPendingEmailAuthenticator($identifiers);
+ $result = $Authenticator->authenticate($request, $Response);
+
+ $this->assertInstanceOf(Result::class, $result);
+ $this->assertEquals(Result::SUCCESS, $result->getStatus());
+ $data = $result->getData();
+ $this->assertInstanceOf(User::class, $data);
+ $this->assertEquals('testAuthenticateBaseFailed@example.com', $data['email']);
+ }
+
+ /**
+ * Get social user data for test
+ *
+ * @return mixed
+ */
+ protected function getUserData()
+ {
+ $Token = new \League\OAuth2\Client\Token\AccessToken([
+ 'access_token' => 'test-token',
+ 'expires' => 1490988496,
+ ]);
+
+ $data = [
+ 'token' => $Token,
+ 'id' => '1',
+ 'name' => 'Test User',
+ 'first_name' => 'Test',
+ 'last_name' => 'User',
+ 'hometown' => [
+ 'id' => '108226049197930',
+ 'name' => 'Madrid',
+ ],
+ 'picture' => [
+ 'data' => [
+ 'url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ ],
+ ],
+ 'cover' => [
+ 'source' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'id' => '1',
+ ],
+ 'gender' => 'male',
+ 'locale' => 'en_US',
+ 'link' => 'https://www.facebook.com/app_scoped_user_id/1/',
+ 'timezone' => -5,
+ 'age_range' => [
+ 'min' => 21,
+ ],
+ 'bio' => 'I am the best test user in the world.',
+ 'picture_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ 'is_silhouette' => false,
+ 'cover_photo_url' => 'https://scontent.xx.fbcdn.net/v/test.jpg',
+ ];
+
+ $mapper = new Facebook();
+ $user = $mapper($data);
+ $user['provider'] = 'facebook';
+ $user['validated'] = true;
+
+ return $user;
+ }
+}
diff --git a/tests/TestCase/Controller/Component/RememberMeComponentTest.php b/tests/TestCase/Controller/Component/RememberMeComponentTest.php
deleted file mode 100644
index 701bdf587..000000000
--- a/tests/TestCase/Controller/Component/RememberMeComponentTest.php
+++ /dev/null
@@ -1,201 +0,0 @@
-request = new Request('controller_posts/index');
- $this->request->params['pass'] = [];
- $this->controller = $this->getMockBuilder('Cake\Controller\Controller')
- ->setMethods(['redirect'])
- ->setConstructorArgs([$this->request])
- ->getMock();
- $this->registry = new ComponentRegistry($this->controller);
- $this->rememberMeComponent = new RememberMeComponent($this->registry, []);
- }
-
- /**
- * tearDown method
- *
- * @return void
- */
- public function tearDown()
- {
- unset($this->rememberMeComponent);
-
- parent::tearDown();
- }
-
- /**
- * Test initialize method
- *
- * @return void
- */
- public function testInitialize()
- {
- $cookieOptions = [
- 'expires' => '1 month',
- 'httpOnly' => true,
- 'path' => '',
- 'domain' => '',
- 'secure' => false,
- 'key' => '2a20bac195a9eb2e28f05b7ac7090afe599365a8fe480b7d8a5ce0f79687346e',
- 'encryption' => 'aes',
- 'enabled' => false
- ];
- $this->assertEquals($cookieOptions, $this->rememberMeComponent->Cookie->configKey('remember_me'));
- }
-
- /**
- * Test initialize method
- *
- * @return void
- */
- public function testInitializeException()
- {
- $salt = Security::salt();
- Security::salt('too small');
- try {
- $this->rememberMeComponent = new RememberMeComponent($this->registry, []);
- } catch (InvalidArgumentException $ex) {
- $this->assertEquals('Invalid app salt, app salt must be at least 256 bits (32 bytes) long', $ex->getMessage());
- }
-
- Security::salt($salt);
- }
-
- /**
- * Test
- *
- * @return void
- */
- public function testSetLoginCookie()
- {
- $event = new Event('event');
- $this->rememberMeComponent->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->rememberMeComponent->Auth->expects($this->once())
- ->method('user')
- ->with('id')
- ->will($this->returnValue(1));
- $this->rememberMeComponent->Cookie = $this->getMockBuilder('Cake\Controller\Component\CookieComponent')
- ->setMethods(['write'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->rememberMeComponent->request = (new Request('/'))->env('HTTP_USER_AGENT', 'user-agent');
- $this->rememberMeComponent->Cookie->expects($this->once())
- ->method('write')
- ->with('remember_me', ['id' => 1, 'user_agent' => 'user-agent']);
- $this->rememberMeComponent->setLoginCookie($event);
- }
-
- /**
- * Test
- *
- * @return void
- */
- public function testBeforeFilter()
- {
- $event = new Event('event');
- $this->rememberMeComponent->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'identify', 'setUser', 'redirectUrl'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->rememberMeComponent->Auth->expects($this->once())
- ->method('user');
- $user = ['id' => 1];
- $this->rememberMeComponent->Auth->expects($this->once())
- ->method('identify')
- ->will($this->returnValue($user));
- $this->rememberMeComponent->Auth->expects($this->once())
- ->method('setUser')
- ->with($user);
- $this->rememberMeComponent->Auth->expects($this->once())
- ->method('redirectUrl')
- ->will($this->returnValue('/login'));
- $this->controller->expects($this->once())
- ->method('redirect')
- ->with('/login');
- $this->rememberMeComponent->beforeFilter($event);
- }
-
- /**
- * Test
- *
- * @return void
- */
- public function testBeforeFilterNotIdentified()
- {
- $event = new Event('event');
- $this->rememberMeComponent->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'identify', 'setUser', 'redirectUrl'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->rememberMeComponent->Auth->expects($this->at(0))
- ->method('user');
- $this->rememberMeComponent->Auth->expects($this->at(1))
- ->method('identify');
-
- $this->assertNull($this->rememberMeComponent->beforeFilter($event));
- }
-
- /**
- * Test
- *
- * @return void
- */
- public function testBeforeFilterUserLoggedIn()
- {
- $event = new Event('event');
- $this->rememberMeComponent->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'identify', 'setUser', 'redirectUrl'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->rememberMeComponent->Auth->expects($this->once())
- ->method('user')
- ->will($this->returnValue([
- 'id' => 1,
- ]));
- $this->assertNull($this->rememberMeComponent->beforeFilter($event));
- }
-}
diff --git a/tests/TestCase/Controller/Component/SetupComponentTest.php b/tests/TestCase/Controller/Component/SetupComponentTest.php
new file mode 100644
index 000000000..d685949a2
--- /dev/null
+++ b/tests/TestCase/Controller/Component/SetupComponentTest.php
@@ -0,0 +1,102 @@
+Controller = new Controller();
+ }
+
+ /**
+ * tearDown method
+ *
+ * @return void
+ */
+ public function tearDown(): void
+ {
+ unset($this->Controller, $this->Component);
+
+ parent::tearDown();
+ }
+
+ /**
+ * Data provider for testInitialization
+ *
+ * @return array
+ */
+ public function dataProviderInitialization()
+ {
+ return [
+ [true, true, true],
+ [false, true, true],
+ [true, false, true],
+ [true, true, false],
+ [false, false, false],
+ ];
+ }
+
+ /**
+ * Test initial setup
+ *
+ * @param bool $authentication Should use authentication component
+ * @param booll $authorization Should use authorization component
+ * @param booll $oneTimePass Should use OneTimePassword component
+ * @throws \Exception
+ * @dataProvider dataProviderInitialization
+ * @return void
+ */
+ public function testInitialization($authentication, $authorization, $oneTimePass)
+ {
+ Configure::write('Auth.AuthenticationComponent.load', $authentication);
+ Configure::write('Auth.AuthorizationComponent.enable', $authorization);
+ Configure::write('OneTimePasswordAuthenticator.login', $oneTimePass);
+ $registry = new ComponentRegistry($this->Controller);
+ $this->Component = new SetupComponent($registry);
+ $this->Component->initialize([]);
+ $this->assertSame($authentication, $this->Controller->components()->has('Authentication'));
+ $this->assertSame($authorization, $this->Controller->components()->has('Authorization'));
+ $this->assertSame($oneTimePass, $this->Controller->components()->has('OneTimePasswordAuthenticator'));
+ }
+}
diff --git a/tests/TestCase/Controller/Component/UsersAuthComponentTest.php b/tests/TestCase/Controller/Component/UsersAuthComponentTest.php
deleted file mode 100644
index e6db00b79..000000000
--- a/tests/TestCase/Controller/Component/UsersAuthComponentTest.php
+++ /dev/null
@@ -1,436 +0,0 @@
-backupUsersConfig = Configure::read('Users');
-
- Router::reload();
- Plugin::routes('CakeDC/Users');
- Router::connect('/route/*', [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => 'requestResetPassword'
- ]);
- Router::connect('/notAllowed/*', [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => 'edit'
- ]);
- Security::salt('YJfIxfs2guVoUubWDYhG93b0qyJfIxfs2guwvniR2G0FgaC9mi');
- Configure::write('App.namespace', 'Users');
- $this->request = $this->getMockBuilder('Cake\Network\Request')
- ->setMethods(['is', 'method'])
- ->getMock();
- $this->request->expects($this->any())->method('is')->will($this->returnValue(true));
- $this->response = $this->getMockBuilder('Cake\Network\Response')
- ->setMethods(['stop'])
- ->getMock();
- $this->Controller = new Controller($this->request, $this->response);
- $this->Registry = $this->Controller->components();
- $this->Controller->UsersAuth = new UsersAuthComponent($this->Registry);
- }
-
- /**
- * tearDown method
- *
- * @return void
- */
- public function tearDown()
- {
- parent::tearDown();
-
- $_SESSION = [];
- unset($this->Controller, $this->UsersAuth);
- Configure::write('Users', $this->backupUsersConfig);
- }
-
- /**
- * Test initialize
- *
- */
- public function testInitialize()
- {
- $this->Registry->unload('Auth');
- $this->Controller->UsersAuth = new UsersAuthComponent($this->Registry);
- $this->assertInstanceOf('CakeDC\Users\Controller\Component\UsersAuthComponent', $this->Controller->UsersAuth);
- }
-
- /**
- * Test initialize with not rememberMe component needed
- *
- */
- public function testInitializeNoRequiredRememberMe()
- {
- Configure::write('Users.RememberMe.active', false);
- $class = 'CakeDC\Users\Controller\Component\UsersAuthComponent';
- $this->Controller->UsersAuth = $this->getMockBuilder($class)
- ->setMethods(['_loadRememberMe', '_initAuth', '_loadSocialLogin', '_attachPermissionChecker'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->UsersAuth->expects($this->once())
- ->method('_initAuth');
- $this->Controller->UsersAuth->expects($this->never())
- ->method('_loadRememberMe');
- $this->Controller->UsersAuth->initialize([]);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testIsUrlAuthorizedUserNotLoggedIn()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => '/route',
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->expects($this->once())
- ->method('user')
- ->will($this->returnValue(false));
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertFalse($result);
- }
-
- /**
- * test The user is not logged in, but the controller action is public $this->Auth->allow()
- *
- * @return void
- */
- public function testIsUrlAuthorizedUserNotLoggedInActionAllowed()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => '/route',
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->allowedActions = ['requestResetPassword'];
- $this->Controller->Auth->expects($this->never())
- ->method('user');
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertTrue($result);
- }
-
- /**
- * test The user is logged in and not allowed by rules to access this action,
- * but the controller action is public $this->Auth->allow()
- *
- * @return void
- */
- public function testIsUrlAuthorizedUserLoggedInNotAllowedActionAllowed()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => '/notAllowed',
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->allowedActions = ['edit'];
- $this->Controller->Auth->expects($this->never())
- ->method('user');
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertTrue($result);
- }
-
- /**
- * test The user is logged in and allowed by rules to access this action,
- * and the controller action is public $this->Auth->allow()
- *
- * @return void
- */
- public function testIsUrlAuthorizedUserLoggedInAllowedActionAllowed()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => '/route',
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->allowedActions = ['requestResetPassword'];
- $this->Controller->Auth->expects($this->never())
- ->method('user');
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertTrue($result);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testIsUrlAuthorizedNoUrl()
- {
- $event = new Event('event');
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertFalse($result);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testIsUrlAuthorizedUrlRelativeString()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => '/route',
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->expects($this->once())
- ->method('user')
- ->will($this->returnValue(['id' => 1]));
- $request = new Request('/route');
- $request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => 'requestResetPassword',
- 'pass' => [],
- '_matchedRoute' => '/route/*',
- ];
- $this->Controller->Auth->expects($this->once())
- ->method('isAuthorized')
- ->with(null, $request)
- ->will($this->returnValue(true));
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertTrue($result);
- }
-
- /**
- * test
- *
- * @return void
- * @expectedException Cake\Routing\Exception\MissingRouteException
- */
- public function testIsUrlAuthorizedMissingRouteString()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => '/missingRoute',
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->expects($this->never())
- ->method('user');
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- }
-
- /**
- * test
- *
- * @return void
- * @expectedException Cake\Routing\Exception\MissingRouteException
- */
- public function testIsUrlAuthorizedMissingRouteArray()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => [
- 'controller' => 'missing',
- 'action' => 'missing',
- ],
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->expects($this->never())
- ->method('user');
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testIsUrlAuthorizedUrlAbsoluteForCurrentAppString()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => Router::fullBaseUrl() . '/route',
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->expects($this->once())
- ->method('user')
- ->will($this->returnValue(['id' => 1]));
- $request = new Request('/route');
- $request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => 'requestResetPassword',
- 'pass' => [],
- '_matchedRoute' => '/route/*',
- ];
- $this->Controller->Auth->expects($this->once())
- ->method('isAuthorized')
- ->with(null, $request)
- ->will($this->returnValue(true));
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertTrue($result);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testIsUrlAuthorizedUrlRelativeForCurrentAppString()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => 'route',
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->expects($this->once())
- ->method('user')
- ->will($this->returnValue(['id' => 1]));
- $request = new Request('/route');
- $request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => 'requestResetPassword',
- 'pass' => [],
- '_matchedRoute' => '/route/*',
- ];
- $this->Controller->Auth->expects($this->once())
- ->method('isAuthorized')
- ->with(null, $request)
- ->will($this->returnValue(true));
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertTrue($result);
- }
-
- /**
- *
- *
- * @return void
- */
- public function testIsUrlAuthorizedUrlAbsoluteForOtherAppString()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => 'http://example.com',
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->expects($this->never())
- ->method('user');
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertTrue($result);
- }
-
- /**
- * test
- *
- * @return void
- */
- public function testIsUrlAuthorizedUrlArray()
- {
- $event = new Event('event');
- $event->data = [
- 'url' => [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => 'requestResetPassword',
- 'pass-one'
- ],
- ];
- $this->Controller->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'isAuthorized'])
- ->disableOriginalConstructor()
- ->getMock();
- $this->Controller->Auth->expects($this->once())
- ->method('user')
- ->will($this->returnValue(['id' => 1]));
- $request = new Request('/route/pass-one');
- $request->params = [
- 'plugin' => 'CakeDC/Users',
- 'controller' => 'Users',
- 'action' => 'requestResetPassword',
- 'pass' => ['pass-one'],
- '_matchedRoute' => '/route/*',
- ];
- $this->Controller->Auth->expects($this->once())
- ->method('isAuthorized')
- ->with(null, $request)
- ->will($this->returnValue(true));
- $result = $this->Controller->UsersAuth->isUrlAuthorized($event);
- $this->assertTrue($result);
- }
-}
diff --git a/tests/TestCase/Controller/SocialAccountsControllerTest.php b/tests/TestCase/Controller/SocialAccountsControllerTest.php
index c85dc2e86..47a544d7e 100644
--- a/tests/TestCase/Controller/SocialAccountsControllerTest.php
+++ b/tests/TestCase/Controller/SocialAccountsControllerTest.php
@@ -1,23 +1,22 @@
'Debug'
- ]);
- $this->configEmail = Email::config('default');
- Email::config('default', [
+ TransportFactory::setConfig('test', ['className' => 'Debug']);
+ $this->configEmail = Email::getConfig('default');
+ Email::drop('default');
+ Email::setConfig('default', [
'transport' => 'test',
- 'from' => 'cakedc@example.com'
+ 'from' => 'cakedc@example.com',
]);
- $request = new Request('/users/users/index');
- $request->params['plugin'] = 'CakeDC/Users';
+ $request = new ServerRequest(['url' => '/users/users/index']);
+ $request = $request->withParam('plugin', 'CakeDC/Users');
$this->Controller = $this->getMockBuilder('CakeDC\Users\Controller\SocialAccountsController')
- ->setMethods(['redirect', 'render'])
+ ->onlyMethods(['redirect', 'render'])
->setConstructorArgs([$request, null, 'SocialAccounts'])
->getMock();
- $this->Controller->SocialAccounts = $this->getMockForModel('CakeDC\Users.SocialAccounts', ['sendSocialValidationEmail'], [
- 'className' => 'CakeDC\Users\Model\Table\SocialAccountsTable'
- ]);
}
/**
@@ -72,11 +67,11 @@ public function setUp()
*
* @return void
*/
- public function tearDown()
+ public function tearDown(): void
{
Email::drop('default');
- Email::dropTransport('test');
- Email::config('default', $this->configEmail);
+ TransportFactory::drop('test');
+ //Email::setConfig('default', $this->configEmail);
Configure::write('Opauth', $this->configOpauth);
Configure::write('Users.RememberMe.active', $this->configRememberMe);
@@ -93,9 +88,9 @@ public function testValidateAccountHappy()
{
$this->Controller->expects($this->once())
->method('redirect')
- ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login']);
+ ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login', 'prefix' => false]);
$this->Controller->validateAccount('Facebook', 'reference-1-1234', 'token-1234');
- $this->assertEquals('Account validated successfully', $this->Controller->request->session()->read('Flash.flash.0.message'));
+ $this->assertEquals('Account validated successfully', $this->Controller->getRequest()->getSession()->read('Flash.flash.0.message'));
}
/**
@@ -107,9 +102,9 @@ public function testValidateAccountInvalidToken()
{
$this->Controller->expects($this->once())
->method('redirect')
- ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login']);
+ ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login', 'prefix' => false]);
$this->Controller->validateAccount('Facebook', 'reference-1-1234', 'token-not-found');
- $this->assertEquals('Invalid token and/or social account', $this->Controller->request->session()->read('Flash.flash.0.message'));
+ $this->assertEquals('Invalid token and/or social account', $this->Controller->getRequest()->getSession()->read('Flash.flash.0.message'));
}
/**
@@ -121,9 +116,9 @@ public function testValidateAccountAlreadyActive()
{
$this->Controller->expects($this->once())
->method('redirect')
- ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login']);
+ ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login', 'prefix' => false]);
$this->Controller->validateAccount('Twitter', 'reference-1-1234', 'token-1234');
- $this->assertEquals('Social Account already active', $this->Controller->request->session()->read('Flash.flash.0.message'));
+ $this->assertEquals('Social Account already active', $this->Controller->getRequest()->getSession()->read('Flash.flash.0.message'));
}
/**
@@ -134,7 +129,7 @@ public function testValidateAccountAlreadyActive()
public function testResendValidationHappy()
{
$behaviorMock = $this->getMockBuilder('CakeDC\Users\Model\Behavior\SocialAccountBehavior')
- ->setMethods(['sendSocialValidationEmail'])
+ ->onlyMethods(['sendSocialValidationEmail'])
->setConstructorArgs([$this->Controller->SocialAccounts])
->getMock();
$this->Controller->SocialAccounts->behaviors()->set('SocialAccount', $behaviorMock);
@@ -143,10 +138,10 @@ public function testResendValidationHappy()
->will($this->returnValue(true));
$this->Controller->expects($this->once())
->method('redirect')
- ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login']);
+ ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login', 'prefix' => false]);
$this->Controller->resendValidation('Facebook', 'reference-1-1234');
- $this->assertEquals('Email sent successfully', $this->Controller->request->session()->read('Flash.flash.0.message'));
+ $this->assertEquals('Email sent successfully', $this->Controller->getRequest()->getSession()->read('Flash.flash.0.message'));
}
/**
@@ -157,7 +152,7 @@ public function testResendValidationHappy()
public function testResendValidationEmailError()
{
$behaviorMock = $this->getMockBuilder('CakeDC\Users\Model\Behavior\SocialAccountBehavior')
- ->setMethods(['sendSocialValidationEmail'])
+ ->onlyMethods(['sendSocialValidationEmail'])
->setConstructorArgs([$this->Controller->SocialAccounts])
->getMock();
$this->Controller->SocialAccounts->behaviors()->set('SocialAccount', $behaviorMock);
@@ -166,10 +161,10 @@ public function testResendValidationEmailError()
->will($this->returnValue(false));
$this->Controller->expects($this->once())
->method('redirect')
- ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login']);
+ ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login', 'prefix' => false]);
$this->Controller->resendValidation('Facebook', 'reference-1-1234');
- $this->assertEquals('Email could not be sent', $this->Controller->request->session()->read('Flash.flash.0.message'));
+ $this->assertEquals('Email could not be sent', $this->Controller->getRequest()->getSession()->read('Flash.flash.0.message'));
}
/**
@@ -181,9 +176,9 @@ public function testResendValidationInvalid()
{
$this->Controller->expects($this->once())
->method('redirect')
- ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login']);
+ ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login', 'prefix' => false]);
$this->Controller->resendValidation('Facebook', 'reference-invalid');
- $this->assertEquals('Invalid account', $this->Controller->request->session()->read('Flash.flash.0.message'));
+ $this->assertEquals('Invalid account', $this->Controller->getRequest()->getSession()->read('Flash.flash.0.message'));
}
/**
@@ -195,8 +190,8 @@ public function testResendValidationAlreadyActive()
{
$this->Controller->expects($this->once())
->method('redirect')
- ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login']);
+ ->with(['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'login', 'prefix' => false]);
$this->Controller->validateAccount('Twitter', 'reference-1-1234', 'token-1234');
- $this->assertEquals('Social Account already active', $this->Controller->request->session()->read('Flash.flash.0.message'));
+ $this->assertEquals('Social Account already active', $this->Controller->getRequest()->getSession()->read('Flash.flash.0.message'));
}
}
diff --git a/tests/TestCase/Controller/Traits/BaseTraitTest.php b/tests/TestCase/Controller/Traits/BaseTraitTest.php
index 299de8ba5..693940e8a 100644
--- a/tests/TestCase/Controller/Traits/BaseTraitTest.php
+++ b/tests/TestCase/Controller/Traits/BaseTraitTest.php
@@ -1,22 +1,40 @@
loadPlugins(['CakeDC/Users' => ['routes' => true]]);
$traitMockMethods = array_unique(array_merge(['getUsersTable'], $this->traitMockMethods));
- $this->table = TableRegistry::get('CakeDC/Users.Users');
+ $this->table = TableRegistry::getTableLocator()->get('CakeDC/Users.Users');
try {
$this->Trait = $this->getMockBuilder($this->traitClassName)
->setMethods($traitMockMethods)
- ->getMockForTrait();
+ ->getMock();
$this->Trait->expects($this->any())
->method('getUsersTable')
->will($this->returnValue($this->table));
} catch (PHPUnit_Framework_MockObject_RuntimeException $ex) {
debug($ex);
- $this->fail("Unit tests extending BaseTraitTest should declare the trait class name in the \$traitClassName variable before calling setUp()");
+ $this->fail('Unit tests extending BaseTraitTest should declare the trait class name in the $traitClassName variable before calling setUp()');
}
if ($this->mockDefaultEmail) {
- Email::configTransport('test', [
- 'className' => 'Debug'
+ TransportFactory::setConfig('test', [
+ 'className' => 'Debug',
]);
- $this->configEmail = Email::config('default');
- Email::config('default', [
+ $this->configEmail = Email::getConfig('default');
+ Email::drop('default');
+ Email::setConfig('default', [
'transport' => 'test',
- 'from' => 'cakedc@example.com'
+ 'from' => 'cakedc@example.com',
]);
}
}
@@ -76,13 +112,13 @@ public function setUp()
*
* @return void
*/
- public function tearDown()
+ public function tearDown(): void
{
unset($this->table, $this->Trait);
if ($this->mockDefaultEmail) {
Email::drop('default');
- Email::dropTransport('test');
- Email::config('default', $this->configEmail);
+ TransportFactory::drop('test');
+ //Email::setConfig('default', $this->setConfigEmail);
}
parent::tearDown();
}
@@ -90,20 +126,23 @@ public function tearDown()
/**
* Mock session and mock session attributes
*
- * @return void
+ * @return \Cake\Http\Session
*/
protected function _mockSession($attributes)
{
- $session = new \Cake\Network\Session();
+ $session = new \Cake\Http\Session();
foreach ($attributes as $field => $value) {
$session->write($field, $value);
}
- $this->Trait->request
+ $this->Trait
+ ->getRequest()
->expects($this->any())
- ->method('session')
+ ->method('getSession')
->willReturn($session);
+
+ return $session;
}
/**
@@ -113,19 +152,20 @@ protected function _mockSession($attributes)
*/
protected function _mockRequestGet($withSession = false)
{
- $methods = ['is', 'referer', 'data'];
+ $methods = ['is', 'referer', 'getData'];
if ($withSession) {
- $methods[] = 'session';
+ $methods[] = 'getSession';
}
- $this->Trait->request = $this->getMockBuilder('Cake\Network\Request')
+ $request = $this->getMockBuilder('Cake\Http\ServerRequest')
->setMethods($methods)
->getMock();
- $this->Trait->request->expects($this->any())
+ $request->expects($this->any())
->method('is')
->with('post')
->will($this->returnValue(false));
+ $this->Trait->setRequest($request);
}
/**
@@ -149,13 +189,14 @@ protected function _mockFlash()
*/
protected function _mockRequestPost($with = 'post')
{
- $this->Trait->request = $this->getMockBuilder('Cake\Network\Request')
- ->setMethods(['is', 'data', 'allow'])
+ $request = $this->getMockBuilder('Cake\Http\ServerRequest')
+ ->setMethods(['is', 'getData', 'allow'])
->getMock();
- $this->Trait->request->expects($this->any())
+ $request->expects($this->any())
->method('is')
->with($with)
->will($this->returnValue(true));
+ $this->Trait->setRequest($request);
}
/**
@@ -165,47 +206,152 @@ protected function _mockRequestPost($with = 'post')
*/
protected function _mockAuthLoggedIn($user = [])
{
- $this->Trait->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'identify', 'setUser', 'redirectUrl'])
- ->disableOriginalConstructor()
- ->getMock();
$user += [
'id' => '00000000-0000-0000-0000-000000000001',
'password' => '12345',
];
- $this->Trait->Auth->expects($this->any())
- ->method('identify')
- ->will($this->returnValue($user));
- $this->Trait->Auth->expects($this->any())
- ->method('user')
- ->with('id')
- ->will($this->returnValue($user['id']));
+
+ $this->_mockAuthentication($user);
}
/**
- * Mock the Auth component
+ * Mock the Authentication service
*
+ * @param array $user
+ * @param array $failures
+ * @param \Authentication\Identifier\IdentifierCollection $identifiers custom identifiers collection
* @return void
*/
- protected function _mockAuth()
+ protected function _mockAuthentication($user = null, $failures = [], $identifiers = null)
{
- $this->Trait->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
- ->setMethods(['user', 'identify', 'setUser', 'redirectUrl'])
- ->disableOriginalConstructor()
- ->getMock();
+ if ($identifiers === null) {
+ $passwordIdentifier = $this->getMockBuilder(PasswordIdentifier::class)
+ ->setMethods(['needsPasswordRehash'])
+ ->getMock();
+ $passwordIdentifier->expects($this->any())
+ ->method('needsPasswordRehash')
+ ->willReturn(false);
+ $identifiers = new IdentifierCollection([]);
+ $identifiers->set('Password', $passwordIdentifier);
+ }
+
+ $config = [
+ 'identifiers' => [
+ 'Authentication.Password',
+ ],
+ 'authenticators' => [
+ 'Authentication.Session',
+ 'Authentication.Form',
+ ],
+ ];
+ $authentication = $this->getMockBuilder(AuthenticationService::class)->setConstructorArgs([$config])->setMethods([
+ 'getResult',
+ 'getFailures',
+ 'identifiers',
+ ])->getMock();
+
+ if ($user) {
+ $user = new User($user);
+ $identity = new Identity($user);
+ $result = new Result($user, Result::SUCCESS);
+ $this->Trait->setRequest($this->Trait->getRequest()->withAttribute('identity', $identity));
+ } else {
+ $result = new Result($user, Result::FAILURE_CREDENTIALS_MISSING);
+ }
+
+ $authentication->expects($this->any())
+ ->method('getResult')
+ ->will($this->returnValue($result));
+
+ $authentication->expects($this->any())
+ ->method('getFailures')
+ ->will($this->returnValue($failures));
+
+ $authentication->expects($this->any())
+ ->method('identifiers')
+ ->will($this->returnValue($identifiers));
+
+ $this->Trait->setRequest($this->Trait->getRequest()->withAttribute('authentication', $authentication));
+
+ $controller = new Controller($this->Trait->getRequest());
+ $registry = new ComponentRegistry($controller);
+ $this->Trait->Authentication = new AuthenticationComponent($registry, [
+ 'loginRedirect' => $this->successLoginRedirect,
+ 'logoutRedirect' => $this->logoutRedirect,
+ 'loginAction' => $this->loginAction,
+ ]);
+ }
+
+ /**
+ * Mock the Authentication service with a Password Rehash being required.
+ *
+ * @param array $user
+ * @param array $failures
+ * @return void
+ */
+ protected function _mockAuthenticationWithPasswordRehash($user = null, $failures = [])
+ {
+ $config = [
+ 'identifiers' => [
+ 'Authentication.Password',
+ ],
+ 'authenticators' => [
+ 'Authentication.Session',
+ 'Authentication.Form',
+ ],
+ ];
+ $authentication = $this->getMockBuilder(AuthenticationService::class)->setConstructorArgs([$config])->setMethods([
+ 'getResult',
+ 'getFailures',
+ 'identifiers',
+ ])->getMock();
+ $authentication->expects($this->any())
+ ->method('identifiers')
+ ->willReturn($identifiers);
+ if ($user) {
+ $user = is_object($user) ? $user : new User($user);
+ $identity = new Identity($user);
+ $result = new Result($user, Result::SUCCESS);
+ $this->Trait->setRequest($this->Trait->getRequest()->withAttribute('identity', $identity));
+ } else {
+ $result = new Result($user, Result::FAILURE_CREDENTIALS_MISSING);
+ }
+
+ $authentication->expects($this->any())
+ ->method('getResult')
+ ->will($this->returnValue($result));
+
+ $authentication->expects($this->any())
+ ->method('getFailures')
+ ->will($this->returnValue($failures));
+
+ $this->Trait->setRequest($this->Trait->getRequest()->withAttribute('authentication', $authentication));
+
+ //$controller = new Controller($this->Trait->getRequest());
+ $registry = new ComponentRegistry($this->Trait);
+ $this->Trait->Authentication = new AuthenticationComponent($registry, [
+ 'loginRedirect' => $this->successLoginRedirect,
+ 'logoutRedirect' => $this->logoutRedirect,
+ 'loginAction' => $this->loginAction,
+ ]);
}
/**
* mock utility
*
* @param Event $event event
+ * @param array $result array of data
* @return void
*/
- protected function _mockDispatchEvent(Event $event = null)
+ protected function _mockDispatchEvent(?Event $event = null, $result = [])
{
if (is_null($event)) {
$event = new Event('cool-name-here');
}
+
+ if (!empty($result)) {
+ $event->setResult(new Entity($result));
+ }
$this->Trait->expects($this->any())
->method('dispatchEvent')
->will($this->returnValue($event));
diff --git a/tests/TestCase/Controller/Traits/CustomUsersTableTraitTest.php b/tests/TestCase/Controller/Traits/CustomUsersTableTraitTest.php
index 89c000651..8bad2e04b 100644
--- a/tests/TestCase/Controller/Traits/CustomUsersTableTraitTest.php
+++ b/tests/TestCase/Controller/Traits/CustomUsersTableTraitTest.php
@@ -1,11 +1,13 @@
controller = $this->getMockBuilder('Cake\Controller\Controller')
@@ -25,7 +27,7 @@ public function setUp()
$this->controller->Trait = $this->getMockForTrait('CakeDC\Users\Controller\Traits\CustomUsersTableTrait');
}
- public function tearDown()
+ public function tearDown(): void
{
parent::tearDown();
}
@@ -33,7 +35,7 @@ public function tearDown()
public function testGetUsersTable()
{
$table = $this->controller->Trait->getUsersTable();
- $this->assertEquals('CakeDC/Users.Users', $table->registryAlias());
+ $this->assertEquals('CakeDC/Users.Users', $table->getRegistryAlias());
$newTable = new Table();
$this->controller->Trait->setUsersTable($newTable);
$this->assertSame($newTable, $this->controller->Trait->getUsersTable());
diff --git a/tests/TestCase/Controller/Traits/Integration/LoginTraitIntegrationTest.php b/tests/TestCase/Controller/Traits/Integration/LoginTraitIntegrationTest.php
new file mode 100644
index 000000000..9bf8d74d4
--- /dev/null
+++ b/tests/TestCase/Controller/Traits/Integration/LoginTraitIntegrationTest.php
@@ -0,0 +1,297 @@
+get('CakeDC/Users.Users')
+ ->get($id);
+
+ $this->session(['Auth' => $user]);
+ }
+
+ /**
+ * Test login action with get request
+ *
+ * @return void
+ */
+ public function testRedirectToLogin()
+ {
+ $this->enableRetainFlashMessages();
+ $this->get('/pages/home');
+ $this->assertRedirectContains('/login?redirect=http%3A%2F%2Flocalhost%2Fpages%2Fhome');
+ $this->assertFlashMessage('You are not authorized to access that location.');
+ }
+
+ /**
+ * Test login action with get request
+ *
+ * @return void
+ */
+ public function testLoginGetRequestNoSocialLogin()
+ {
+ EventManager::instance()->on('TestApp.afterPluginBootstrap', function () {
+ Configure::write(['Users.Social.login' => false]);
+ });
+
+ $this->get('/login');
+ $this->assertResponseOk();
+ $this->assertResponseNotContains('Username or password is incorrect');
+ $this->assertResponseContains('
Html->image(empty($user->avatar) ? $avatarPlaceholder : $user->avatar, ['width' => '180', 'height' => '180']); ?>
+Html->image( + empty($user->avatar) ? $avatarPlaceholder : $user->avatar, + ['width' => '180', 'height' => '180'] + ); ?>
Html->tag( 'span', - __d('CakeDC/Users', '{0} {1}', $user->first_name, $user->last_name), + __d('cake_d_c/users', '{0} {1}', $user->first_name, $user->last_name), ['class' => 'full_name'] ) ?>
- Html->link(__d('CakeDC/Users', 'Change Password'), ['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'changePassword']); ?> + Html->link(__d('cake_d_c/users', 'Change Password'), ['plugin' => 'CakeDC/Users', 'controller' => 'Users', 'action' => 'changePassword']); ?>
-
+
-
-
diff --git a/templates/Users/register.php b/templates/Users/register.php
new file mode 100644
index 000000000..e82673b67
--- /dev/null
+++ b/templates/Users/register.php
@@ -0,0 +1,40 @@
+
+username) ?>
- +email) ?>
+ User->socialConnectLinkList($user->social_accounts) ?> social_accounts)): ?> - +| - | - | - |
|---|---|---|
| + | + | + |
| provider) ?> | Html->link( + $socialAccount->link && $socialAccount->link != '#' ? $this->Html->link( $linkText, $socialAccount->link, ['target' => '_blank'] - ) ?> | + ) : '-' ?>
+ Form->create($user); ?>
+
+ Form->button(__d('cake_d_c/users', 'Submit')) ?>
+ Form->end() ?>
+
diff --git a/templates/Users/request_reset_password.php b/templates/Users/request_reset_password.php
new file mode 100644
index 000000000..cde49a009
--- /dev/null
+++ b/templates/Users/request_reset_password.php
@@ -0,0 +1,25 @@
+
+
+ Flash->render('auth') ?>
+ Form->create($user) ?>
+
+ Form->button(__d('cake_d_c/users', 'Submit')); ?>
+ Form->end() ?>
+
diff --git a/templates/Users/resend_token_validation.php b/templates/Users/resend_token_validation.php
new file mode 100644
index 000000000..2023e3c18
--- /dev/null
+++ b/templates/Users/resend_token_validation.php
@@ -0,0 +1,22 @@
+
+
+ Form->create($user); ?>
+
+ Form->button(__d('cake_d_c/users', 'Submit')) ?>
+ Form->end() ?>
+
diff --git a/templates/Users/social_email.php b/templates/Users/social_email.php
new file mode 100644
index 000000000..55c1208e9
--- /dev/null
+++ b/templates/Users/social_email.php
@@ -0,0 +1,21 @@
+
+
+ Flash->render() ?>
+ Form->create() ?>
+
+ Form->button(__d('cake_d_c/users', 'Submit')); ?>
+ Form->end() ?>
+
diff --git a/templates/Users/u2f_authenticate.php b/templates/Users/u2f_authenticate.php
new file mode 100644
index 000000000..16ce1bf01
--- /dev/null
+++ b/templates/Users/u2f_authenticate.php
@@ -0,0 +1,59 @@
+Html->script('CakeDC/Users.u2f-api.js', ['block' => true]);
+?>
+
+
+Html->scriptStart(['block' => true]);
+?>
+ setTimeout(function() {
+ var req = ;
+ var appId = req[0].appId;
+ var challenge = req[0].challenge;
+
+ u2f.sign(appId, challenge, req, function(data) {
+ var targetForm = document.getElementById('u2fAuthenticateFrm');
+ var targetInput = document.getElementById('authenticateResponse');
+ if(data.errorCode && data.errorCode != 0) {
+ alert("");
+
+ return;
+ }
+ targetInput.value = JSON.stringify(data);
+ targetForm.submit();
+ });
+ }, 1000);
+Html->scriptEnd();?>
diff --git a/templates/Users/u2f_register.php b/templates/Users/u2f_register.php
new file mode 100644
index 000000000..0ea8da5af
--- /dev/null
+++ b/templates/Users/u2f_register.php
@@ -0,0 +1,64 @@
+Html->script('CakeDC/Users.u2f-api.js', ['block' => true]);
+?>
+
+
+
+
+
+ Form->create(null, [
+ 'url' => [
+ 'action' => 'u2fAuthenticateFinish',
+ '?' => $this->request->getQueryParams()
+ ],
+ 'id' => 'u2fAuthenticateFrm'
+ ]) ?>
+
+ Flash->render('auth') ?>
+ Flash->render() ?>
+
+ Form->hidden('authenticateResponse', ['secure' => false, 'id' => 'authenticateResponse'])?>
+ Form->end() ?>
+
+
+
+ $registerRequest->appId,
+ 'version' => $registerRequest->version,
+ 'challenge' => $registerRequest->challenge,
+ 'attestation' => 'direct'
+]);
+$this->Html->scriptStart(['block' => true]);
+?>
+setTimeout(function() {
+ var req = ;
+ var appId = req.appId;
+ var registerRequests = [req];
+ u2f.register(appId, registerRequests, [], function(data) {
+ var targetForm = document.getElementById('u2fRegisterFrm');
+ var targetInput = document.getElementById('registerResponse');
+
+ if(data.errorCode && data.errorCode != 0) {
+ alert("");
+
+ return;
+ }
+ targetInput.value = JSON.stringify(data);
+ targetForm.submit();
+ });
+}, 1000);
+Html->scriptEnd();?>
diff --git a/templates/Users/verify.php b/templates/Users/verify.php
new file mode 100644
index 000000000..92648a029
--- /dev/null
+++ b/templates/Users/verify.php
@@ -0,0 +1,20 @@
+
+
+
+
+
+ Form->create(null, [
+ 'url' => [
+ 'action' => 'u2fRegisterFinish',
+ '?' => $this->request->getQueryParams()
+ ],
+ 'id' => 'u2fRegisterFrm'
+ ]) ?>
+
+ Flash->render('auth') ?>
+ Flash->render() ?>
+
+ Form->hidden('registerResponse', ['secure' => false, 'id' => 'registerResponse'])?>
+ Form->end() ?>
+
+
+
diff --git a/templates/Users/view.php b/templates/Users/view.php
new file mode 100644
index 000000000..9e0d28106
--- /dev/null
+++ b/templates/Users/view.php
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+ Form->create() ?>
+
+ Flash->render('auth') ?>
+ Flash->render() ?>
+
+ Form->button(__d('cake_d_c/users', ' Verify'), ['class' => 'btn btn-primary', 'escapeTitle' => false]); ?>
+ Form->end() ?>
+
+
+
+
+-
+
- Html->link(__d('cake_d_c/users', 'Edit User'), ['action' => 'edit', $Users->id]) ?> +
- Form->postLink( + __d('cake_d_c/users', 'Delete User'), + ['action' => 'delete', $Users->id], + ['confirm' => __d('cake_d_c/users', 'Are you sure you want to delete # {0}?', $Users->id)] + ) ?> +
- Html->link(__d('cake_d_c/users', 'List Users'), ['action' => 'index']) ?> +
- Html->link(__d('cake_d_c/users', 'New User'), ['action' => 'add']) ?> +
+
+
diff --git a/templates/Users/webauthn2fa.php b/templates/Users/webauthn2fa.php
new file mode 100644
index 000000000..3c2b7c898
--- /dev/null
+++ b/templates/Users/webauthn2fa.php
@@ -0,0 +1,56 @@
+Html->script('CakeDC/Users.webauthn.js', ['block' => true]);
+$this->assign('title', __d('cake_d_c/users','Two-factor authentication'));
+?>
+id) ?>
+
+
+
+
+
+ id) ?>
+ +username) ?>
+ +email) ?>
+ +first_name) ?>
+ +last_name) ?>
+ +role) ?>
+ +token) ?>
+ +api_token) ?>
+
+
+
+ Number->format($Users->active) ?>
+
+
+
+ token_expires) ?>
+ +activation_date) ?>
+ +tos_date) ?>
+ +created) ?>
+ +modified) ?>
+
+
+ $this->Url->build(['action' => 'webauthn2faAuthenticate']),
+ 'authenticateOptionsUrl' => $this->Url->build(['action' => 'webauthn2faAuthenticateOptions']),
+ 'registerActionUrl' => $this->Url->build(['action' => 'webauthn2faRegister']),
+ 'registerOptionsUrl' => $this->Url->build(['action' => 'webauthn2faRegisterOptions']),
+ 'isRegister' => $isRegister,
+ 'username' => h($username),
+ 'registerElemId' => 'webauthn2faRegisterInfo',
+ 'authenticateElemId' => 'webauthn2faAuthenticateInfo',
+];
+$this->Html->scriptStart(['block' => true]);
+?>
+setTimeout(function() {
+ Webauthn2faHelper.run();
+}, 1000);
+Html->scriptEnd();?>
diff --git a/templates/email/html/reset_password.php b/templates/email/html/reset_password.php
new file mode 100644
index 000000000..4009e9134
--- /dev/null
+++ b/templates/email/html/reset_password.php
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+ Flash->render('auth') ?>
+ Flash->render() ?>
+
+
+ + , +
++ Html->link(__d('cake_d_c/users', 'Reset your password here'), $activationUrl) ?> +
++Url->build($activationUrl) +) ?> +
++ , +
diff --git a/templates/email/html/social_account_validation.php b/templates/email/html/social_account_validation.php new file mode 100644 index 000000000..01d2fab85 --- /dev/null +++ b/templates/email/html/social_account_validation.php @@ -0,0 +1,31 @@ + + ++ , +
++ Html->link($text, $activationUrl); + ?> +
++Url->build($activationUrl) +) ?> +
++ , +
diff --git a/templates/email/html/validation.php b/templates/email/html/validation.php new file mode 100644 index 000000000..ad92d2f3e --- /dev/null +++ b/templates/email/html/validation.php @@ -0,0 +1,27 @@ + ++ , +
++ Html->link(__d('cake_d_c/users', 'Activate your account here'), $activationUrl) ?> +
++Url->build($activationUrl) +) ?> +
++ , +
diff --git a/templates/email/text/reset_password.php b/templates/email/text/reset_password.php new file mode 100644 index 000000000..312ac428d --- /dev/null +++ b/templates/email/text/reset_password.php @@ -0,0 +1,21 @@ + +, + +Url->build($activationUrl) +) ?> + +, + diff --git a/templates/email/text/social_account_validation.php b/templates/email/text/social_account_validation.php new file mode 100644 index 000000000..79dc496de --- /dev/null +++ b/templates/email/text/social_account_validation.php @@ -0,0 +1,21 @@ + +, + +Url->build($activationUrl) +) ?> + +, + diff --git a/templates/email/text/validation.php b/templates/email/text/validation.php new file mode 100644 index 000000000..312ac428d --- /dev/null +++ b/templates/email/text/validation.php @@ -0,0 +1,21 @@ + +, + +Url->build($activationUrl) +) ?> + +, + diff --git a/templates/layout/email/html/default.php b/templates/layout/email/html/default.php new file mode 100644 index 000000000..98d045608 --- /dev/null +++ b/templates/layout/email/html/default.php @@ -0,0 +1,20 @@ + + + + +