Merge branch 'release/1.3.1' into master

Author: Bubka

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 
 php:
-  - 7.2
   - 7.3
+  - 7.4
 
 before_script:
   - cp .env.travis .env

README.md

@@ -6,7 +6,7 @@
 # 2FAuth
 A web app to manage your Two-Factor Authentication (2FA) accounts and generate their security codes
 
-![screens](https://user-images.githubusercontent.com/858858/74479269-267a1600-4eaf-11ea-9281-415e5a54bd9f.png)
+![screens](https://user-images.githubusercontent.com/858858/95789691-47b13180-0cde-11eb-9d06-7c6d2ede5f3c.png)
 
 #### [2FAuth Demo](https://demo.2fauth.app/)
 
@@ -37,9 +37,9 @@ I created it because :
 2FAuth generates OTP according to RFC 4226 (HOTP Algorithm) and RFC 6238 (TOTP Algorithm) thanks to [Spomky-Labs/OTPHP](https://github.com/Spomky-Labs/otphp) php library.
 
 ## Requirements
-[![Requires PHP7](https://img.shields.io/badge/php-7.2.*-red.svg?style=flat-square)](https://secure.php.net/downloads.php) 
-* See [Laravel server requirements](https://laravel.com/docs/5.8/installation#server-requirements)
-* Any database [supported by Laravel](https://laravel.com/docs/5.8/database)
+[![Requires PHP7](https://img.shields.io/badge/php-7.3.*-red.svg?style=flat-square)](https://secure.php.net/downloads.php) 
+* See [Laravel server requirements](https://laravel.com/docs/7.x/installation#server-requirements)
+* Any database [supported by Laravel](https://laravel.com/docs/7.x/database)
 
 ## Installation (using command line)
 

app/Console/Kernel.php

@@ -21,11 +21,12 @@ class Kernel extends ConsoleKernel
      *
      * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
      * @return void
+     *
+     * @codeCoverageIgnore Because no code will always remains Not Executed code
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        //
     }
 
     /**

app/Exceptions/Handler.php

@@ -2,7 +2,7 @@
 
 namespace App\Exceptions;
 
-use Exception;
+use Throwable;
 use Illuminate\Http\Response;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
@@ -33,10 +33,10 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -45,10 +45,10 @@ public function report(Exception $exception)
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {        
         if ( $request->wantsJson() ) {
 
@@ -65,10 +65,10 @@ public function render($request, Exception $exception)
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return \Illuminate\Http\JsonResponse
      */
-    private function handleApiException($request, Exception $exception)
+    private function handleApiException($request, Throwable $exception)
     {
         $debug = [
             'exception' => get_class($exception),
@@ -96,7 +96,7 @@ private function handleApiException($request, Exception $exception)
     /**
      * Set a specific response payload for commons http error codes
      *
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return \Illuminate\Http\JsonResponse
      */
     private function customApiResponse($exception, $debug)

app/Http/Controllers/QrCodeController.php

@@ -11,7 +11,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
-class QrCodecontroller extends Controller
+class QrCodeController extends Controller
 {
     /**
      * Handle uploaded qr code image

app/Http/Kernel.php

@@ -63,6 +63,7 @@ class Kernel extends HttpKernel
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'AvoidResetPassword' => \App\Http\Middleware\AvoidPasswordResetInDemo::class,
     ];
 
     /**

app/Http/Middleware/AvoidPasswordResetInDemo.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Response;
+
+class AvoidPasswordResetInDemo
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+
+        if( config('app.options.isDemoApp') ) {
+            return response()->json(['requestFailed' => __('auth.forms.no_reset_password_in_demo')], Response::HTTP_UNAUTHORIZED);
+        }
+
+        return $next($request);
+    }
+}

app/Providers/AppServiceProvider.php

@@ -2,8 +2,10 @@
 
 namespace App\Providers;
 
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 
+
 class AppServiceProvider extends ServiceProvider
 {
     /**
@@ -23,6 +25,6 @@ public function register()
      */
     public function boot()
     {
-        //
+        Blade::withoutComponentTags();
     }
 }

changelog.md

@@ -1,5 +1,15 @@
 # Change log
 
+## [1.3.1] - 2020-10-12
+
+### Changed
+- Upgrade to Laravel 7.0
+- Drop PHP 7.2 support
+- Enable the Request reset password form in Demo mode but inactivated
+
+### Fixed
+- Fix missing notifications in Auth views
+
 ## [1.3.0] - 2020-10-09
 
 ### Added

composer.json

@@ -1,31 +1,31 @@
 {
-    "name": "laravel/laravel",
+    "name": "bubka/2fauth",
     "type": "project",
-    "description": "The Laravel Framework.",
+    "description": "Two-Factor authentication generator",
     "keywords": [
-        "framework",
-        "laravel"
+        "2fauth",
+        "two-actor authentication"
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.1.3",
-        "appstract/laravel-options": "^3.0",
+        "php": "^7.3",
+        "appstract/laravel-options": "^4.1.1",
         "doctrine/dbal": "^2.10",
-        "fideloper/proxy": "^4.0",
+        "fideloper/proxy": "^4.2",
         "khanamiryan/qrcode-detector-decoder": "^1.0",
-        "laravel/framework": "5.8.*",
-        "laravel/passport": "^7.2",
-        "laravel/tinker": "^1.0",
-        "spatie/eloquent-sortable": "^3.8",
+        "laravel/framework": "^7.0",
+        "laravel/passport": "^9.3.2",
+        "laravel/tinker": "^2.0",
+        "laravel/ui": "^2.0",
+        "spatie/eloquent-sortable": "^3.9",
         "spomky-labs/otphp": "^10.0"
     },
     "require-dev": {
-        "beyondcode/laravel-dump-server": "^1.0",
-        "filp/whoops": "^2.0",
-        "fzaninotto/faker": "^1.4",
-        "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^3.0",
-        "phpunit/phpunit": "^7.5"
+        "facade/ignition": "^2.3",
+        "fzaninotto/faker": "^1.9",
+        "mockery/mockery": "^1.3",
+        "nunomaduro/collision": "^4.1",
+        "phpunit/phpunit": "^9.3"
     },
     "config": {
         "optimize-autoloader": true,