Merge branch 'release/3.0.6'

getgrav · Feb 11, 2020 · 60f926e · 60f926e
2 parents 6b36d91 + a9183f8
commit 60f926e
Show file tree

Hide file tree

Showing 25 changed files with 249 additions and 101 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 3.0.6
+## 02/11/2020
+
+1. [](#new)
+    * Pass phpstan level 1 tests
+    * Updated 2FA library to v1.7.0
+* [](#improved)
+    * Added some debugging messages (turned off by default)
+
 # 3.0.5
 ## 01/02/2020
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Login
-version: 3.0.5
+version: 3.0.6
 testing: false
 description: Enables user authentication and login screen.
 icon: sign-in

diff --git a/classes/Controller.php b/classes/Controller.php
@@ -56,12 +56,6 @@ class Controller
      */
     protected $prefix = 'task';
 
-    /**
-     * @var RememberMe\RememberMe
-     * @deprecated 2.0 Use $grav['login']->rememberMe() instead
-     */
-    protected $rememberMe;
-
     /**
      * @var Login
      */
@@ -78,8 +72,6 @@ public function __construct(Grav $grav, $action, $post = null)
         $this->action = $action;
         $this->login = $this->grav['login'];
         $this->post = $post ? $this->getPost($post) : [];
-
-        $this->rememberMe();
     }
 
     /**
@@ -554,9 +546,7 @@ protected function jsonDecode(array $data)
      */
     public function rememberMe($var = null)
     {
-        $this->rememberMe = $this->login->rememberMe($var);
-
-        return $this->rememberMe;
+        return $this->login->rememberMe($var);
     }
 
     /**

diff --git a/classes/Events/UserLoginEvent.php b/classes/Events/UserLoginEvent.php
@@ -13,6 +13,7 @@
 use Grav\Common\Session;
 use Grav\Common\User\Interfaces\UserCollectionInterface;
 use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Plugin\Login\Login;
 use RocketTheme\Toolbox\Event\Event;
 
 /**
@@ -92,7 +93,17 @@ public function __construct(array $items = [])
         if (!$this->offsetExists('user')) {
             /** @var UserCollectionInterface $users */
             $users = Grav::instance()['accounts'];
-            $this->offsetSet('user', $users->load($this['credentials']['username']));
+            $user = $users->load($this['credentials']['username']);
+            $this->offsetSet('user', $user);
+
+            if (Login::DEBUG) {
+                if ($user->exists()) {
+                    Login::addDebugMessage('Login user:', $user);
+                } else {
+                    Login::addDebugMessage("Login: user '{$this['credentials']['username']}' not found");
+                }
+            }
+
         }
     }
 
@@ -349,4 +360,12 @@ public function __unset($offset)
     {
         $this->offsetUnset($offset);
     }
+
+    /**
+     * @return array
+     */
+    public function __debugInfo(): array
+    {
+        return get_object_vars($this);
+    }
 }
diff --git a/classes/Login.php b/classes/Login.php
@@ -12,6 +12,7 @@
 use Birke\Rememberme\Cookie;
 use Grav\Common\Config\Config;
 use Grav\Common\Data\Data;
+use Grav\Common\Debugger;
 use Grav\Common\Grav;
 use Grav\Common\Language\Language;
 use Grav\Common\Page\Interfaces\PageInterface;
@@ -32,6 +33,8 @@
  */
 class Login
 {
+    public const DEBUG = 1;
+
     /** @var Grav */
     protected $grav;
 
@@ -73,6 +76,17 @@ public function __construct(Grav $grav)
         $this->uri = $this->grav['uri'];
     }
 
+    /**
+     * @param string $message
+     * @param array $data
+     */
+    public static function addDebugMessage(string $message, $data = [])
+    {
+        /** @var Debugger $debugger */
+        $debugger = Grav::instance()['debugger'];
+        $debugger->addMessage($message, 'debug', $data);
+    }
+
     /**
      * Login user.
      *
@@ -95,6 +109,7 @@ public function login(array $credentials, array $options = [], array $extra = []
         $grav->fireEvent('onUserLoginAuthenticate', $event);
 
         if ($event->isSuccess()) {
+            static::DEBUG && static::addDebugMessage('Login onUserLoginAuthenticate: success', $event);
 
             // Make sure that event didn't mess up with the user authorization.
             $user = $event->getUser();
@@ -107,6 +122,8 @@ public function login(array $credentials, array $options = [], array $extra = []
         }
 
         if ($event->isSuccess()) {
+            static::DEBUG && static::addDebugMessage('Login onUserLoginAuthorize: success', $event);
+
             // User has been logged in, let plugins know.
             $event = new UserLoginEvent($event->toArray());
             $grav->fireEvent('onUserLogin', $event);
@@ -117,6 +134,8 @@ public function login(array $credentials, array $options = [], array $extra = []
             $user->authorized = !$event->isDelayed();
 
         } else {
+            static::DEBUG && static::addDebugMessage('Login failed', $event);
+
             // Allow plugins to log errors or do other tasks on failure.
             $event = new UserLoginEvent($event->toArray());
             $grav->fireEvent('onUserLoginFailure', $event);
@@ -650,5 +669,4 @@ public function getProviderLoginTemplates()
     {
         return $this->provider_login_templates;
     }
-
 }
diff --git a/composer.json b/composer.json
@@ -34,8 +34,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Grav\\Plugin\\Login\\": "classes/"
-        }
+            "Grav\\Plugin\\Login\\": "classes/",
+            "Grav\\Plugin\\Console\\": "cli/"
+        },
+        "classmap": [
+            "login.php"
+        ]
     },
     "config": {
         "platform": {

diff --git a/composer.lock b/composer.lock
diff --git a/login.php b/login.php
@@ -206,7 +206,7 @@ public function pageVisibility(Event $e)
 
             foreach ($pages->instances() as $page) {
                 $header = $page->header();
-                if (isset($header) && isset($header->access) && isset($header->login['visibility_requires_access']) && $header->login['visibility_requires_access'] === true) {
+                if ($header && isset($header->access) && isset($header->login['visibility_requires_access']) && $header->login['visibility_requires_access'] === true) {
                     $config = $this->mergeConfig($page);
                     $access = $this->login->isUserAuthorizedForPage($user, $page, $config);
                     if ($access === false) {
@@ -671,7 +671,6 @@ private function processUserRegistration($form, Event $event)
         }
 
         $form->validate();
-        $form->filter();
 
         /** @var Data $form_data */
         $form_data = $form->getData();
@@ -827,7 +826,6 @@ private function processUserProfile($form, Event $event)
         $language = $this->grav['language'];
 
         $form->validate();
-        $form->filter();
 
         /** @var Data $form_data */
         $form_data = $form->getData();

diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
@@ -6,4 +6,5 @@
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Grav\\Plugin\\LoginPlugin' => $baseDir . '/login.php',
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
@@ -8,5 +8,6 @@
 return array(
     'RobThree\\Auth\\' => array($vendorDir . '/robthree/twofactorauth/lib'),
     'Grav\\Plugin\\Login\\' => array($baseDir . '/classes'),
+    'Grav\\Plugin\\Console\\' => array($baseDir . '/cli'),
     'Birke\\' => array($vendorDir . '/birke/rememberme/src'),
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -18,6 +18,7 @@ class ComposerStaticIniteed5e5cf0aa1e2139f2db7445511e366
         'G' => 
         array (
             'Grav\\Plugin\\Login\\' => 18,
+            'Grav\\Plugin\\Console\\' => 20,
         ),
         'B' => 
         array (
@@ -34,6 +35,10 @@ class ComposerStaticIniteed5e5cf0aa1e2139f2db7445511e366
         array (
             0 => __DIR__ . '/../..' . '/classes',
         ),
+        'Grav\\Plugin\\Console\\' => 
+        array (
+            0 => __DIR__ . '/../..' . '/cli',
+        ),
         'Birke\\' => 
         array (
             0 => __DIR__ . '/..' . '/birke/rememberme/src',
@@ -50,12 +55,17 @@ class ComposerStaticIniteed5e5cf0aa1e2139f2db7445511e366
         ),
     );
 
+    public static $classMap = array (
+        'Grav\\Plugin\\LoginPlugin' => __DIR__ . '/../..' . '/login.php',
+    );
+
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticIniteed5e5cf0aa1e2139f2db7445511e366::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticIniteed5e5cf0aa1e2139f2db7445511e366::$prefixDirsPsr4;
             $loader->prefixesPsr0 = ComposerStaticIniteed5e5cf0aa1e2139f2db7445511e366::$prefixesPsr0;
+            $loader->classMap = ComposerStaticIniteed5e5cf0aa1e2139f2db7445511e366::$classMap;
 
         }, null, ClassLoader::class);
     }

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -146,26 +146,26 @@
     },
     {
         "name": "robthree/twofactorauth",
-        "version": "1.6.1",
-        "version_normalized": "1.6.1.0",
+        "version": "1.7.0",
+        "version_normalized": "1.7.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/RobThree/TwoFactorAuth.git",
-            "reference": "a77e7d822343bb88112baef808839cfae7bc5abb"
+            "reference": "37983bf675c5baca09d19d6705170489d0df0002"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/RobThree/TwoFactorAuth/zipball/a77e7d822343bb88112baef808839cfae7bc5abb",
-            "reference": "a77e7d822343bb88112baef808839cfae7bc5abb",
+            "url": "https://api.github.com/repos/RobThree/TwoFactorAuth/zipball/37983bf675c5baca09d19d6705170489d0df0002",
+            "reference": "37983bf675c5baca09d19d6705170489d0df0002",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.0"
+            "php": ">=5.6.0"
         },
         "require-dev": {
             "phpunit/phpunit": "@stable"
         },
-        "time": "2017-11-06T17:55:56+00:00",
+        "time": "2020-01-02T19:56:46+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

diff --git a/vendor/robthree/twofactorauth/.travis.yml b/vendor/robthree/twofactorauth/.travis.yml
@@ -1,18 +1,15 @@
 language: php
 
-dist: trusty
-matrix:
-  include:
-    - php: 5.3
-      dist: precise
-
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  - 7.2
+  - 7.3
+  - 7.4
+
+before_script:
+  - composer install
 
 script:
-  - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then phpunit --coverage-text tests ; fi
+  - vendor/bin/phpunit --coverage-text tests