Merge branch 'release/1.4.0'

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.4.0
+## 12/06/2017
+
+1. [](#bugfix)
+    * Compatibility fixes with Login plugin v2.5.0 - Messages system
+1. [](#improved)
+    * Updated OAuth library to v0.8.10 [#14](https://github.com/getgrav/grav-plugin-login-oauth/issues/14)
+
 # v1.3.1
 ## 09/12/2017
 
@@ -11,7 +19,7 @@
     * Added Blacklist and Whitelist support to Google
 
 # v1.2.0
-## 12/18/2017
+## 1/18/2017
 
 1. [](#new)
     * Added LinkedIn provider [#11](https://github.com/getgrav/grav-plugin-login-oauth/pull/11)

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Login Plugin OAuth Addon
-version: 1.3.1
+version: 1.4.0
 description: Enables login with OAuth accounts. Currently provides Facebook, Google, Twitter, Github, Linkedin
 icon: sign-in
 author:
@@ -12,7 +12,7 @@ bugs: https://github.com/getgrav/grav-plugin-login-oauth/issues
 license: MIT
 
 dependencies:
-  - { name: login, version: '>=2.4.1' }
+  - { name: login, version: '>=2.5.0' }
 
 form:
   validation: loose

classes/Controller.php

@@ -83,6 +83,7 @@ public function execute()
     {
         /** @var \Grav\Common\Language\Language */
         $t = $this->grav['language'];
+        $messages = $this->grav['messages'];
         $provider = strtolower($this->action);
         $config = $this->grav['config']->get('plugins.login-oauth.providers.' . $this->action, []);
 
@@ -95,7 +96,7 @@ public function execute()
             $this->service = $this->factory->createService($this->action, $credentials, $this->storage, $scope);
         }
         if (!$this->service || empty($config)) {
-            $this->login->setMessage($t->translate(['PLUGIN_LOGIN_OAUTH.OAUTH_PROVIDER_NOT_SUPPORTED', $this->action]));
+            $messages->add($t->translate(['PLUGIN_LOGIN_OAUTH.OAUTH_PROVIDER_NOT_SUPPORTED', $this->action]));
 
             return true;
         }
@@ -106,9 +107,9 @@ public function execute()
         if (is_bool($authenticated)) {
             $this->reset();
             if ($authenticated) {
-                $this->login->setMessage($t->translate('PLUGIN_LOGIN.LOGIN_SUCCESSFUL'));
+                $messages->add($t->translate('PLUGIN_LOGIN.LOGIN_SUCCESSFUL'));
             } else {
-                $this->login->setMessage($t->translate('PLUGIN_LOGIN.ACCESS_DENIED'));
+                $messages->add($t->translate('PLUGIN_LOGIN.ACCESS_DENIED'));
             }
 
             // Redirect to current URI
@@ -118,7 +119,7 @@ public function execute()
             }
             $this->setRedirect($redirect);
         } elseif (!$this->grav['session']->oauth) {
-            $this->login->setMessage($t->translate(['PLUGIN_LOGIN_OAUTH.OAUTH_PROVIDER_NOT_SUPPORTED', $this->action]));
+            $messages->add($t->translate(['PLUGIN_LOGIN_OAUTH.OAUTH_PROVIDER_NOT_SUPPORTED', $this->action]));
         }
 
         return true;
@@ -241,6 +242,7 @@ public function oauthGoogle()
         return $this->genericOAuthProvider(function () {
             /** @var \Grav\Common\Language\Language */
             $t = $this->grav['language'];
+            $messages = $this->grav['messages'];
 
             // Get fullname, email and language
             $data = json_decode($this->service->request('userinfo'), true);
@@ -251,7 +253,7 @@ public function oauthGoogle()
                 $domain = isset($data['hd'])?$data['hd']:'gmail.com';
 
                 if ( !in_array($domain, $whitelist) ) {
-                    $this->login->setMessage($t->translate(['PLUGIN_LOGIN_OAUTH.EMAIL_DOMAIN_NOT_PERMITTED', $domain]));
+                    $messages->add($t->translate(['PLUGIN_LOGIN_OAUTH.EMAIL_DOMAIN_NOT_PERMITTED', $domain]));
                     return null;
                 }
             }
@@ -261,7 +263,7 @@ public function oauthGoogle()
                 $domain = isset($data['hd'])?$data['hd']:'gmail.com';
 
                 if( in_array($domain, $blacklist)) {
-                    $this->login->setMessage($t->translate(['PLUGIN_LOGIN_OAUTH.EMAIL_DOMAIN_NOT_PERMITTED', $domain]));
+                    $messages->add($t->translate(['PLUGIN_LOGIN_OAUTH.EMAIL_DOMAIN_NOT_PERMITTED', $domain]));
                     return null;
                 }
             }

vendor/composer/ClassLoader.php

@@ -374,9 +374,13 @@ private function findFileWithExtension($class, $ext)
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath.'\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        $length = $this->prefixLengthsPsr4[$first][$search];
                         if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }

vendor/composer/LICENSE

@@ -1,5 +1,5 @@
 
-Copyright (c) 2016 Nils Adermann, Jordi Boggiano
+Copyright (c) Nils Adermann, Jordi Boggiano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

vendor/composer/installed.json

@@ -1,17 +1,17 @@
 [
     {
         "name": "lusitanian/oauth",
-        "version": "v0.8.9",
-        "version_normalized": "0.8.9.0",
+        "version": "v0.8.10",
+        "version_normalized": "0.8.10.0",
         "source": {
             "type": "git",
             "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
-            "reference": "29bda6e176df6c292a9b1c43ae8a44d56a87c30b"
+            "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/29bda6e176df6c292a9b1c43ae8a44d56a87c30b",
-            "reference": "29bda6e176df6c292a9b1c43ae8a44d56a87c30b",
+            "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/09f4af38f17db6938253f4d1b171d537913ac1ed",
+            "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed",
             "shasum": ""
         },
         "require": {
@@ -28,7 +28,7 @@
             "predis/predis": "Allows using the Redis storage backend.",
             "symfony/http-foundation": "Allows using the Symfony Session storage backend."
         },
-        "time": "2016-02-24T00:20:18+00:00",
+        "time": "2016-07-12T22:15:40+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {

vendor/lusitanian/oauth/README.md

@@ -82,6 +82,7 @@ Included service implementations
     - LinkedIn
     - Mailchimp
     - Microsoft
+    - Mondo
     - Nest
     - Netatmo
     - Parrot Flower Power
@@ -113,6 +114,7 @@ Framework Integration
 ---------------------
 * Lithium: Sébastien Charrier has written [an adapter](https://github.com/scharrier/li3_socialauth) for the library.
 * Laravel 4: Dariusz Prząda has written [a service provider](https://github.com/artdarek/oauth-4-laravel) for the library.
+* Laravel 5: Valentin Ivaşcu ported Dariusz Prząda's Laravel 4 library to [Laravel 5](https://github.com/oriceon/oauth-5-laravel).
 * Symfony: Alexander Pinnecke has written [a Symfony Bundle](https://github.com/apinnecke/OAuthBundle) for the library.
 
 Extensions