Merge pull request #8 from bluzphp/develop

 Updated codestyle

Author: Anton

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012-2017 by Bluz PHP Team
+Copyright (c) 2012-2019 by Bluz PHP Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,27 +1,33 @@
 # Module auth for Bluz Skeleton
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bluzphp/main)
-
 ### Achievements
 
-[![Build Status](https://travis-ci.org/bluzphp/module-auth.svg?branch=master)](https://travis-ci.org/bluzphp/module-auth)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bluzphp/module-auth/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/bluzphp/module-auth/?branch=master)
+[![PHP >= 7.1+](https://img.shields.io/packagist/php-v/bluzphp/module-auth.svg?style=flat)](https://php.net/)
+
+[![Latest Stable Version](https://img.shields.io/packagist/v/bluzphp/module-auth.svg?label=version&style=flat)](https://packagist.org/packages/bluzphp/module-auth)
+
+[![Build Status](https://img.shields.io/travis/bluzphp/module-auth/master.svg?style=flat)](https://travis-ci.org/bluzphp/module-auth)
+
+[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/bluzphp/module-auth.svg?style=flat)](https://scrutinizer-ci.com/g/bluzphp/module-auth/)
+
+[![Coverage Status](https://img.shields.io/coveralls/bluzphp/module-auth/master.svg?style=flat)](https://coveralls.io/r/bluzphp/module-auth?branch=master)
 
-[![Latest Stable Version](https://poser.pugx.org/bluzphp/module-auth/v/stable)](https://packagist.org/packages/bluzphp/module-auth)
-[![Total Downloads](https://poser.pugx.org/bluzphp/module-auth/downloads)](https://packagist.org/packages/bluzphp/module-auth)
+[![Total Downloads](https://img.shields.io/packagist/dt/bluzphp/module-auth.svg?style=flat)](https://packagist.org/packages/bluzphp/module-auth)
 
-[![License](https://poser.pugx.org/bluzphp/module-auth/license)](https://packagist.org/packages/bluzphp/module-auth)
+[![License](https://img.shields.io/packagist/l/bluzphp/module-auth.svg?style=flat)](https://packagist.org/packages/bluzphp/module-auth)
 
 Usage
 -------------------------
 ### Install module
 To install the module run the command:
-  
 
-    $ composer require bluzphp/module-auth
+```bash
+php /vendor/bin/bluzman module:install auth
+```
 
 ### Remove module
 To remove the module, run the command:
-    
 
-    $ composer remove bluzphp/module-auth
+```bash
+php /vendor/bin/bluzman module:remove auth
+```

application/modules/auth/controllers/auth.php

@@ -14,7 +14,6 @@
  * @param string $provider
  *
  * @return void
- * @throws Exception
  */
 return function ($provider = '') {
     /**
@@ -67,18 +66,15 @@
                 $authRow->token = $accessToken['access_token'];
                 $authRow->save();
                 Response::redirectTo('users', 'profile');
+            } else if ($authRow) {
+                // Try to login
+                $user = Users\Table::findRow($authRow->userId);
+                Auth\Table::tryLogin($user);
+                Messages::addNotice('You are signed');
             } else {
-                // Authenticate in the application
-                if ($authRow) {
-                    // Try to login
-                    $user = Users\Table::findRow($authRow->userId);
-                    Auth\Table::tryLogin($user);
-                    Messages::addNotice('You are signed');
-                } else {
-                    // User not found
-                    Messages::addError('Not found linked profile');
-                    Response::redirectTo('users', 'signin');
-                }
+                // User not found
+                Messages::addError('Not found linked profile');
+                Response::redirectTo('users', 'signin');
             }
 
             // Disconnect the adapter
@@ -87,5 +83,5 @@
     } catch (\Hybridauth\Exception\Exception $e) {
         Messages::addError($e->getMessage());
     }
-    Response::redirectTo('index', 'index');
+    Response::redirectTo('index');
 };

composer.json

@@ -4,7 +4,8 @@
   "license": "MIT",
   "description": "bluz auth module",
   "require": {
-    "bluzphp/composer-plugin": "~2.1",
+    "bluzphp/framework": "~7.11",
+    "bluzphp/composer-plugin": "~2.3",
     "hybridauth/hybridauth": "~3.0"
   }
 }