From deb4d49969c33226efb0787be32cfeb57e8f764a Mon Sep 17 00:00:00 2001 From: Daniel Neykov Date: Fri, 8 Sep 2017 23:15:11 +0300 Subject: [PATCH 01/11] Compatibility for Laravel 5.5 --- src/Commands/AuthViewsInstallCommand.php | 2 +- src/Commands/MultiAuthInstallCommand.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Commands/AuthViewsInstallCommand.php b/src/Commands/AuthViewsInstallCommand.php index 0991061..7b893c2 100644 --- a/src/Commands/AuthViewsInstallCommand.php +++ b/src/Commands/AuthViewsInstallCommand.php @@ -33,7 +33,7 @@ class AuthViewsInstallCommand extends InstallAndReplaceCommand * * @return bool|null */ - public function fire() + public function handle() { $this->installViews(); } diff --git a/src/Commands/MultiAuthInstallCommand.php b/src/Commands/MultiAuthInstallCommand.php index 4dde5c3..ab35bd8 100644 --- a/src/Commands/MultiAuthInstallCommand.php +++ b/src/Commands/MultiAuthInstallCommand.php @@ -34,7 +34,7 @@ class MultiAuthInstallCommand extends InstallAndReplaceCommand * * @return bool|null */ - public function fire() + public function handle() { if ($this->option('lucid') && ! $this->getParsedServiceInput()) { $this->error('You must pass a Service name with the `--lucid` option.'); From da62d40008fc3aafbd22d993da4fa982f0278a52 Mon Sep 17 00:00:00 2001 From: Daniel Neykov Date: Fri, 8 Sep 2017 23:47:28 +0300 Subject: [PATCH 02/11] Using updated hesto/core package --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fccfd16..bca4c4d 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": ">=5.5.0", - "hesto/core": ">=1.0.3" + "hesto/core": ">=2.0.*" }, "autoload": { "psr-4": { From 3bd481af54eaec8e673d195511aa9b4d7cc8b72b Mon Sep 17 00:00:00 2001 From: Daniel Neykov Date: Sat, 9 Sep 2017 00:02:18 +0300 Subject: [PATCH 03/11] composer.json fix --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bca4c4d..8af4680 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": ">=5.5.0", - "hesto/core": ">=2.0.*" + "hesto/core": "2.0.*" }, "autoload": { "psr-4": { From 4d82af86137bbad2c0d04df78681be4e82b6e315 Mon Sep 17 00:00:00 2001 From: Daniel Neykov Date: Sat, 9 Sep 2017 00:19:20 +0300 Subject: [PATCH 04/11] Support Package Auto-Discovery --- composer.json | 9 ++++++++- readme.md | 15 +++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 8af4680..1abe2c4 100644 --- a/composer.json +++ b/composer.json @@ -17,5 +17,12 @@ "psr-4": { "Hesto\\MultiAuth\\": "src/" } - } + }, + "extra": { + "laravel": { + "providers": [ + "Hesto\\MultiAuth\\MultiAuthServiceProvider" + ] + } + }, } diff --git a/readme.md b/readme.md index 1511cdf..f711324 100644 --- a/readme.md +++ b/readme.md @@ -29,22 +29,13 @@ With one simple command you can setup multi auth for your Laravel 5.3 project. T ### Step 1: Install Through Composer -``` -composer require hesto/multi-auth +```shell +composer require hesto/multi-auth --dev ``` ### Step 2: Add the Service Provider -You'll only want to use these package for local development, so you don't want to update the production `providers` array in `config/app.php`. Instead, add the provider in `app/Providers/AppServiceProvider.php`, like so: - -```php -public function register() -{ - if ($this->app->environment() == 'local') { - $this->app->register('Hesto\MultiAuth\MultiAuthServiceProvider'); - } -} -``` +Laravel 5.5 uses Package Auto-Discovery, so doesn't require you to manually add the ServiceProvider. You'll only want to use these package for local development, so this package will be included in require-dev section. When your site is deployed to production you will remove dev packages. ### Step 3: Install Multi-Auth files in your project From 7e688c603eb6220c818493b66deb5bc9d336d8a1 Mon Sep 17 00:00:00 2001 From: Daniel Neykov Date: Sat, 9 Sep 2017 00:23:26 +0300 Subject: [PATCH 05/11] composer.json fix --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1abe2c4..98a305a 100644 --- a/composer.json +++ b/composer.json @@ -24,5 +24,5 @@ "Hesto\\MultiAuth\\MultiAuthServiceProvider" ] } - }, + } } From c91228ab6e364e02050b662602d56dd5c28691cd Mon Sep 17 00:00:00 2001 From: Daniel Neykov Date: Sat, 9 Sep 2017 00:30:30 +0300 Subject: [PATCH 06/11] README.md update --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index f711324..7f7d706 100644 --- a/readme.md +++ b/readme.md @@ -1,11 +1,11 @@ -# Hesto MultiAuth for Laravel 5.3 or higher +# Hesto MultiAuth for Laravel 5.5 or higher - `php artisan multi-auth:install {guard} -f` - `php artisan multi-auth:install {guard} -f --domain` - `php artisan multi-auth:install {guard} {service} -f --lucid` ## What it does? -With one simple command you can setup multi auth for your Laravel 5.3 project. The package installs: +With one simple command you can setup multi auth for your Laravel 5.5 project. The package installs: - Model - Migration - Controllers From 9aa7e49b4b9209c53eb9f9c96f8743a8e956a039 Mon Sep 17 00:00:00 2001 From: Hesto Date: Fri, 15 Sep 2017 10:17:09 +0200 Subject: [PATCH 07/11] update readme --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index ad6f634..146d69b 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Hesto MultiAuth for Laravel 5.3 and 5.4 +# Hesto MultiAuth for Laravel 5.5 and higher - `php artisan multi-auth:install {guard} -f` - `php artisan multi-auth:install {guard} -f --domain` From 81809641c04af82de3af227d5e3718aa9d8f9cbe Mon Sep 17 00:00:00 2001 From: Hesto Date: Mon, 18 Sep 2017 12:04:15 +0200 Subject: [PATCH 08/11] update readme --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 7f7d706..03c31cc 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Hesto MultiAuth for Laravel 5.5 or higher +# Hesto MultiAuth for Laravel - `php artisan multi-auth:install {guard} -f` - `php artisan multi-auth:install {guard} -f --domain` From fa21c4d26d4a3f1851862874cba2490ac7068204 Mon Sep 17 00:00:00 2001 From: Hesto Date: Mon, 18 Sep 2017 21:31:15 +0200 Subject: [PATCH 09/11] update readme and composer.json --- composer.json | 2 +- readme.md | 56 --------------------------------------------------- 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/composer.json b/composer.json index 98a305a..18dd02d 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "hesto/multi-auth", - "description": "Multi Auth for Laravel 5.3", + "description": "Multi Auth for Laravel", "keywords": ["auth", "multi", "laravel"], "license": "MIT", "authors": [ diff --git a/readme.md b/readme.md index 03c31cc..be5042b 100644 --- a/readme.md +++ b/readme.md @@ -146,62 +146,6 @@ public function logoutToPath() { - resources/views/{guard}/ - views for given guard - -## Changelog - -### Note: Never install configurations with same guard again after installed new version of package. So if you already installed your `admin` guard, don't install it again after you update package to latest version. - -### v1.0.7 -- changed {guard}/logout route method from `get` to `post` -- added `{guard}.guest` middleware to redirect from login page if user is already logged in -- added home view after login - -### v1.0.6 -- added `auth:{guard}` middleware to `app\Providers\RouteServiceProvider.php`. If you have installed multi-auth guard with old version add middleware manually: -```php -Route::group([ - 'middleware' => ['web', 'admin', 'auth:admin'], //you need to add the last middleware to array to fix it (version < v.1.0.6) - 'prefix' => 'admin', - 'as' => 'admin.', - 'namespace' => $this->namespace, -], function ($router) { - require base_path('routes/admin.php'); -}); -``` - -### v1.0.5 -- composer.json fix - -### v1.0.4 -- added name and prefix to route group configuration in `RouteServiceProvider` - -```php -Route::group([ - 'prefix' => 'admin', //if you have older version of package ( < v1.0.4) add this line manually, - 'as' => 'admin.', //if you have older version of package ( < v1.0.4) add this line manually (the DOT at the end is important), - 'middleware' => ['web', 'admin'], - 'namespace' => $this->namespace, -], function ($router) { - require base_path('routes/admin.php'); -}); -``` - -- Now you will be able to name your routes without adding guard's name to route name in your `routes/{guard}.php` and your routes will be named (its important) - -```php -//New way -Route::get('/home', function () { // <- no {guard} prefix and it has proper name (admin.home) - //content -})->name('home'); // http://your-project/admin/home - -//Old way -Route::get('/admin/home', function () { // <- with {guard} prefix - //content -})->name('admin.home'); // http://your-project/admin/home -``` - -### v1.0.3 -- changed deafult auth's layout name from `app.blade.php` to `auth.blade.php` ## Support on Beerpay Hey dude! Help me out for a couple of :beers:! From a8c49031cfcc92630b2732780502f0430c8fbdab Mon Sep 17 00:00:00 2001 From: Sid Date: Sun, 1 Oct 2017 18:04:17 +0530 Subject: [PATCH 10/11] Route map method syntax updated --- src/stubs/routes/map-method.stub | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/stubs/routes/map-method.stub b/src/stubs/routes/map-method.stub index 5aba008..a600984 100644 --- a/src/stubs/routes/map-method.stub +++ b/src/stubs/routes/map-method.stub @@ -7,13 +7,10 @@ */ protected function map{{singularClass}}Routes() { - Route::group([ - 'middleware' => ['web', '{{singularSnake}}', 'auth:{{singularSnake}}'], - 'prefix' => '{{singularSlug}}', - 'as' => '{{singularSlug}}.', - 'namespace' => $this->namespace, - ], function ($router) { - require base_path('routes/{{singularSlug}}.php'); - }); + Route::prefix('{{singularSlug}}') + ->middleware(['web', '{{singularSnake}}', 'auth:{{singularSnake}}']) + ->namespace($this->namespace) + ->name('{{singularSlug}}.') + ->group(base_path('routes/{{singularSlug}}.php')); } From c0f01ddbbc561c401d1e373aeca7233ff2cd049e Mon Sep 17 00:00:00 2001 From: Sid Date: Sun, 1 Oct 2017 18:17:32 +0530 Subject: [PATCH 11/11] Renamed layouts following laravel best practices --- src/stubs/routes/web.stub | 18 +++++++++--------- src/stubs/views/auth/login.blade.stub | 2 +- .../views/auth/passwords/email.blade.stub | 2 +- .../views/auth/passwords/reset.blade.stub | 2 +- src/stubs/views/auth/register.blade.stub | 2 +- src/stubs/views/home.blade.stub | 2 +- .../views/{layout => layouts}/auth.blade.stub | 0 7 files changed, 14 insertions(+), 14 deletions(-) rename src/stubs/views/{layout => layouts}/auth.blade.stub (100%) diff --git a/src/stubs/routes/web.stub b/src/stubs/routes/web.stub index 2a840d2..269685c 100644 --- a/src/stubs/routes/web.stub +++ b/src/stubs/routes/web.stub @@ -1,14 +1,14 @@ Route::group(['prefix' => '{{singularSlug}}'], function () { - Route::get('/login', '{{singularClass}}Auth\LoginController@showLoginForm')->name('login'); - Route::post('/login', '{{singularClass}}Auth\LoginController@login'); - Route::post('/logout', '{{singularClass}}Auth\LoginController@logout')->name('logout'); + Route::get('/login', '{{singularClass}}Auth\LoginController@showLoginForm')->name('login'); + Route::post('/login', '{{singularClass}}Auth\LoginController@login'); + Route::post('/logout', '{{singularClass}}Auth\LoginController@logout')->name('logout'); - Route::get('/register', '{{singularClass}}Auth\RegisterController@showRegistrationForm')->name('register'); - Route::post('/register', '{{singularClass}}Auth\RegisterController@register'); + Route::get('/register', '{{singularClass}}Auth\RegisterController@showRegistrationForm')->name('register'); + Route::post('/register', '{{singularClass}}Auth\RegisterController@register'); - Route::post('/password/email', '{{singularClass}}Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.request'); - Route::post('/password/reset', '{{singularClass}}Auth\ResetPasswordController@reset')->name('password.email'); - Route::get('/password/reset', '{{singularClass}}Auth\ForgotPasswordController@showLinkRequestForm')->name('password.reset'); - Route::get('/password/reset/{token}', '{{singularClass}}Auth\ResetPasswordController@showResetForm'); + Route::post('/password/email', '{{singularClass}}Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.request'); + Route::post('/password/reset', '{{singularClass}}Auth\ResetPasswordController@reset')->name('password.email'); + Route::get('/password/reset', '{{singularClass}}Auth\ForgotPasswordController@showLinkRequestForm')->name('password.reset'); + Route::get('/password/reset/{token}', '{{singularClass}}Auth\ResetPasswordController@showResetForm'); }); diff --git a/src/stubs/views/auth/login.blade.stub b/src/stubs/views/auth/login.blade.stub index 5197a56..c97b981 100644 --- a/src/stubs/views/auth/login.blade.stub +++ b/src/stubs/views/auth/login.blade.stub @@ -1,4 +1,4 @@ -@extends('{{singularSlug}}.layout.auth') +@extends('{{singularSlug}}.layouts.auth') @section('content')
diff --git a/src/stubs/views/auth/passwords/email.blade.stub b/src/stubs/views/auth/passwords/email.blade.stub index 56e2140..82aa205 100644 --- a/src/stubs/views/auth/passwords/email.blade.stub +++ b/src/stubs/views/auth/passwords/email.blade.stub @@ -1,4 +1,4 @@ -@extends('{{singularSlug}}.layout.auth') +@extends('{{singularSlug}}.layouts.auth') @section('content') diff --git a/src/stubs/views/auth/passwords/reset.blade.stub b/src/stubs/views/auth/passwords/reset.blade.stub index 39758e5..5909e89 100644 --- a/src/stubs/views/auth/passwords/reset.blade.stub +++ b/src/stubs/views/auth/passwords/reset.blade.stub @@ -1,4 +1,4 @@ -@extends('{{singularSlug}}.layout.auth') +@extends('{{singularSlug}}.layouts.auth') @section('content')
diff --git a/src/stubs/views/auth/register.blade.stub b/src/stubs/views/auth/register.blade.stub index 59d9276..03f6107 100644 --- a/src/stubs/views/auth/register.blade.stub +++ b/src/stubs/views/auth/register.blade.stub @@ -1,4 +1,4 @@ -@extends('{{singularSlug}}.layout.auth') +@extends('{{singularSlug}}.layouts.auth') @section('content')
diff --git a/src/stubs/views/home.blade.stub b/src/stubs/views/home.blade.stub index 2b25e47..caab91a 100644 --- a/src/stubs/views/home.blade.stub +++ b/src/stubs/views/home.blade.stub @@ -1,4 +1,4 @@ -@extends('{{singularSlug}}.layout.auth') +@extends('{{singularSlug}}.layouts.auth') @section('content')
diff --git a/src/stubs/views/layout/auth.blade.stub b/src/stubs/views/layouts/auth.blade.stub similarity index 100% rename from src/stubs/views/layout/auth.blade.stub rename to src/stubs/views/layouts/auth.blade.stub