Merge branch 'release/3.4.4'

getgrav · Jun 16, 2021 · 8c591fd · 8c591fd
2 parents fbb181d + 31ab1cc
commit 8c591fd
Show file tree

Hide file tree

Showing 51 changed files with 1,430 additions and 1,481 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v3.4.4
+## 06/16/2021
+
+1. [](#new)
+   * Updated 2FA library
+1. [](#bugfix)
+   * Fixed missing email conflict check when calling `Login::register()`
+
 # v3.4.3
 ## 05/19/2021
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Login
 slug: login
 type: plugin
-version: 3.4.3
+version: 3.4.4
 testing: false
 description: Enables user authentication and login screen.
 icon: sign-in

diff --git a/classes/Login.php b/classes/Login.php
@@ -239,40 +239,55 @@ public function authenticate($credentials, $options = ['remember_me' => true])
      */
     public function register(array $data, array $files = [])
     {
+        // Add defaults and mandatory fields.
+        $data += [
+            'username' => null,
+            'email' => null
+        ];
+
         if (!isset($data['groups'])) {
             //Add new user ACL settings
             $groups = (array) $this->config->get('plugins.login.user_registration.groups', []);
-
             if (\count($groups) > 0) {
                 $data['groups'] = $groups;
             }
         }
 
         if (!isset($data['access'])) {
             $access = (array) $this->config->get('plugins.login.user_registration.access.site', []);
-
             if (\count($access) > 0) {
                 $data['access']['site'] = $access;
             }
         }
 
         // Validate fields from the form.
-        $username = $this->validateField('username', $data['username']);
         $password = $this->validateField('password1', $data['password'] ?? $data['password1'] ?? null);
         foreach ($data as $key => &$value) {
             $value = $this->validateField($key, $value, $key === 'password2' ? $password : '');
         }
         unset($value);
 
-        /** @var UserCollectionInterface $users */
-        $users = $this->grav['accounts'];
+        /** @var UserCollectionInterface $accounts */
+        $accounts = $this->grav['accounts'];
+
+        // Check whether username already exists.
+        $username = $data['username'];
+        if (!$username || $accounts->find($username, ['username'])->exists()) {
+            /** @var Language $language */
+            $language = $this->grav['language'];
+
+            throw new \RuntimeException($language->translate(['PLUGIN_LOGIN.USERNAME_NOT_AVAILABLE', $username]));
+        }
+        // Check whether email already exists.
+        $email = $data['email'];
+        if (!$email || $accounts->find($email, ['email'])->exists()) {
+            /** @var Language $language */
+            $language = $this->grav['language'];
 
-        // Create user object and save it
-        $user = $users->load($username);
-        if ($user->exists()) {
-            throw new \RuntimeException('User ' . $username . ' cannot be registered: user already exists!');
+            throw new \RuntimeException($language->translate(['PLUGIN_LOGIN.EMAIL_NOT_AVAILABLE', $email]));
         }
 
+        $user = $accounts->load($username);
         $user->update($data, $files);
         if (isset($data['groups'])) {
             $user->groups = $data['groups'];

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
@@ -29,7 +29,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => '5670bd44d33b738ccf1baaf1615b42f7dbab78cb',
+    'reference' => 'b7996fda7a3b56432ef9e249584616d86d977517',
     'name' => 'getgrav/grav-plugin-login',
   ),
   'versions' => 
@@ -59,7 +59,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => '5670bd44d33b738ccf1baaf1615b42f7dbab78cb',
+      'reference' => 'b7996fda7a3b56432ef9e249584616d86d977517',
     ),
     'paragonie/random_compat' => 
     array (
@@ -72,12 +72,12 @@ class InstalledVersions
     ),
     'robthree/twofactorauth' => 
     array (
-      'pretty_version' => '1.7.0',
-      'version' => '1.7.0.0',
+      'pretty_version' => '1.8.0',
+      'version' => '1.8.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => '37983bf675c5baca09d19d6705170489d0df0002',
+      'reference' => '30a38627ae1e7c9399dae67e265063cd6ec5276c',
     ),
   ),
 );

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -150,26 +150,31 @@
         },
         {
             "name": "robthree/twofactorauth",
-            "version": "1.7.0",
-            "version_normalized": "1.7.0.0",
+            "version": "1.8.0",
+            "version_normalized": "1.8.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/RobThree/TwoFactorAuth.git",
-                "reference": "37983bf675c5baca09d19d6705170489d0df0002"
+                "reference": "30a38627ae1e7c9399dae67e265063cd6ec5276c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/RobThree/TwoFactorAuth/zipball/37983bf675c5baca09d19d6705170489d0df0002",
-                "reference": "37983bf675c5baca09d19d6705170489d0df0002",
+                "url": "https://api.github.com/repos/RobThree/TwoFactorAuth/zipball/30a38627ae1e7c9399dae67e265063cd6ec5276c",
+                "reference": "30a38627ae1e7c9399dae67e265063cd6ec5276c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.6.0"
             },
             "require-dev": {
+                "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpunit/phpunit": "@stable"
             },
-            "time": "2020-01-02T19:56:46+00:00",
+            "suggest": {
+                "bacon/bacon-qr-code": "Needed for BaconQrCodeProvider provider",
+                "endroid/qr-code": "Needed for EndroidQrCodeProvider"
+            },
+            "time": "2021-03-09T18:24:05+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -200,9 +205,23 @@
                 "php",
                 "tfa"
             ],
+            "support": {
+                "issues": "https://github.com/RobThree/TwoFactorAuth/issues",
+                "source": "https://github.com/RobThree/TwoFactorAuth"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/robiii",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/RobThree",
+                    "type": "github"
+                }
+            ],
             "install-path": "../robthree/twofactorauth"
         }
     ],
-    "dev": true,
+    "dev": false,
     "dev-package-names": []
 }
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => '5670bd44d33b738ccf1baaf1615b42f7dbab78cb',
+    'reference' => 'b7996fda7a3b56432ef9e249584616d86d977517',
     'name' => 'getgrav/grav-plugin-login',
   ),
   'versions' => 
@@ -36,7 +36,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => '5670bd44d33b738ccf1baaf1615b42f7dbab78cb',
+      'reference' => 'b7996fda7a3b56432ef9e249584616d86d977517',
     ),
     'paragonie/random_compat' => 
     array (
@@ -49,12 +49,12 @@
     ),
     'robthree/twofactorauth' => 
     array (
-      'pretty_version' => '1.7.0',
-      'version' => '1.7.0.0',
+      'pretty_version' => '1.8.0',
+      'version' => '1.8.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => '37983bf675c5baca09d19d6705170489d0df0002',
+      'reference' => '30a38627ae1e7c9399dae67e265063cd6ec5276c',
     ),
   ),
 );
diff --git a/vendor/robthree/twofactorauth/.github/FUNDING.yml b/vendor/robthree/twofactorauth/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: [RobThree]
+custom: ["https://paypal.me/robiii"]
diff --git a/vendor/robthree/twofactorauth/.github/workflows/test.yml b/vendor/robthree/twofactorauth/.github/workflows/test.yml
@@ -0,0 +1,27 @@
+name: Test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php-version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        tools: composer
+        coverage: xdebug
+
+    - uses: ramsey/composer-install@v1
+
+    - run: composer lint
+    - run: composer test
diff --git a/vendor/robthree/twofactorauth/.gitignore b/vendor/robthree/twofactorauth/.gitignore
@@ -125,7 +125,7 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
+# TODO: Comment the next line if you want to checkin your web deploy settings
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
@@ -184,6 +184,9 @@ FakesAssemblies/
 
 # Composer
 /vendor
+composer.lock
 
 # .vs
-.vs/
+.vs/
+
+.phpunit.result.cache
diff --git a/vendor/robthree/twofactorauth/.travis.yml b/vendor/robthree/twofactorauth/.travis.yml