Route improvements

stanfortonski · Jan 30, 2021 · 737aa51 · 737aa51
1 parent a56356f
commit 737aa51
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/config/twofactor.php b/config/twofactor.php
@@ -7,14 +7,12 @@
  //Duration to expired verification code.
  'expire_duration' => 15,
 
- //Middleware for twofactor auth.
- 'middleware' => ['auth', 'twofactor'],
+ //Middleware group options
+ 'middleware' => ['web', 'auth', 'twofactor'],
+ 'domain' => null,
 
  //Middleware allow for preferences.
  'allow_preferences' => true,
-
- //Middleware for routes preferences.
- 'middleware_preferences' => ['auth', 'twofactor'],
 
  'routes' => [
  //Name of route. This is route after expired code.

diff --git a/routes/web.php b/routes/web.php
@@ -6,15 +6,10 @@
 use Stanfortonski\Laraveltwofactor\Controllers\TwoFactorController;
 use Stanfortonski\Laraveltwofactor\Controllers\TwoFactorPreferencesController;
 
-Route::group([
- 'name' => 'twofactor.',
- 'middleware' => config('twofactor.middleware')
-], function(){
- Route::get('verify/resend', [TwoFactorController::class, 'resend'])->name('verify.resend');
- Route::resource('verify', TwoFactorController::class)->only(['index', 'store']);
+Route::get('verify/resend', [TwoFactorController::class, 'resend'])->name('verify.resend');
+Route::resource('verify', TwoFactorController::class)->only(['index', 'store']);
 
- if (config('twofactor.allow_preferences')){
- Route::put('verify/set', [TwoFactorPreferencesController::class, 'set'])->name('verify.preferences.set');
- Route::delete('verify/unset', [TwoFactorPreferencesController::class, 'unset'])->name('verify.preferences.unset');
- }
-});
+if (config('twofactor.allow_preferences')){
+ Route::put('verify/set', [TwoFactorPreferencesController::class, 'set'])->name('verify.preferences.set');
+ Route::delete('verify/unset', [TwoFactorPreferencesController::class, 'unset'])->name('verify.preferences.unset');
+}
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -2,6 +2,8 @@
 
 namespace Stanfortonski\Laraveltwofactor;
 
+use Illuminate\Support\Facades\Route;
+
 class ServiceProvider extends \Illuminate\Support\ServiceProvider
 {
  public function register()
@@ -14,12 +16,23 @@ public function boot()
  $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
  $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'twofactor');
  $this->loadViewsFrom(__DIR__.'/../resources/views', 'twofactor');
- $this->loadRoutesFrom(__DIR__.'/../routes/web.php');
+
+ Route::group($this->routeConfig(), function () {
+ $this->loadRoutesFrom(__DIR__.'/../routes/web.php');
+ });
 
  $this->publishes([
  __DIR__ . '/../config/twofactor.php' => config_path('twofactor.php'),
  __DIR__.'/../resources/lang' => resource_path('lang/vendor/twofactor'),
  __DIR__.'/../resources/views' => resource_path('views/vendor/twofactor')
  ]);
  }
+
+ protected function routeConfig(){
+ return [
+ 'as' => 'twofactor.',
+ 'middleware' => config('twofactor.middleware'),
+ 'domain' => config('twofactor.domain')
+ ];
+ }
 }