From 38799fcd96ee07092e0ed46a5b941e602a6fa48e Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Fri, 3 Jun 2022 01:27:36 +0200 Subject: [PATCH 1/5] INA-7 | Add Vendor guard --- config/auth.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/config/auth.php b/config/auth.php index 64eda056b1c2..935bdbb1b52e 100644 --- a/config/auth.php +++ b/config/auth.php @@ -56,6 +56,10 @@ return [ 'driver' => 'session', 'provider' => 'contacts', ], + 'vendor' => [ + 'driver' => 'session', + 'provider' => 'vendors', + ], ], /* @@ -85,6 +89,11 @@ return [ 'driver' => 'eloquent', 'model' => App\Models\ClientContact::class, ], + 'vendors' => [ + 'driver' => 'eloquent', + 'model' => App\Models\VendorContact::class, + ], + // 'users' => [ // 'driver' => 'database', @@ -120,6 +129,11 @@ return [ 'table' => 'password_resets', 'expire' => 60, ], + 'vendors' => [ + 'provider' => 'vendors', + 'table' => 'password_resets', + 'expire' => 60, + ], ], /* From 1daed11b7c5dc2170d50fbb2b3742af6bdbba0d0 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Sun, 5 Jun 2022 01:44:12 +0200 Subject: [PATCH 2/5] INA-7 | Map vendors api routes --- app/Providers/RouteServiceProvider.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 3c859fa4b3b5..5642c77487d1 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -121,4 +121,12 @@ class RouteServiceProvider extends ServiceProvider ->namespace($this->namespace) ->group(base_path('routes/shop.php')); } + + protected function mapVendorsApiRoutes() + { + Route::prefix('') + ->middleware('vendor') + ->namespace($this->namespace) + ->group(base_path('routes/contact.php')); + } } From 44352b48f728f9bb68aa823e578a0c02d04b3a20 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Sun, 5 Jun 2022 01:47:33 +0200 Subject: [PATCH 3/5] INA-7 | Vendor route file --- routes/vendor.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 routes/vendor.php diff --git a/routes/vendor.php b/routes/vendor.php new file mode 100644 index 000000000000..a9c2cc723e4d --- /dev/null +++ b/routes/vendor.php @@ -0,0 +1,15 @@ + Date: Sun, 5 Jun 2022 01:49:34 +0200 Subject: [PATCH 4/5] INA-7 | Handle case when vendor is authenticated (just scaff, since we don't have routes built) --- .../Middleware/RedirectIfAuthenticated.php | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index eb0e5ef0e184..c3d20c7c7af2 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -20,32 +20,38 @@ class RedirectIfAuthenticated /** * Handle an incoming request. * - * @param Request $request + * @param Request $request * @param Closure $next - * @param string|null $guard + * @param string|null $guard * @return mixed */ public function handle($request, Closure $next, $guard = null) { switch ($guard) { - case 'contact': - if (Auth::guard($guard)->check()) { - return redirect()->route('client.dashboard'); - } - break; - case 'user': - Auth::logout(); - // if (Auth::guard($guard)->check()) { - // return redirect()->route('dashboard.index'); - // } - break; - default: - Auth::logout(); - // if (Auth::guard($guard)->check()) { - // return redirect('/'); - // } - break; - } + case 'contact': + if (Auth::guard($guard)->check()) { + return redirect()->route('client.dashboard'); + } + break; + case 'user': + Auth::logout(); + // if (Auth::guard($guard)->check()) { + // return redirect()->route('dashboard.index'); + // } + break; + case 'vendor': + if (Auth::guard($guard)->check()) { + //TODO create routes for vendor + // return redirect()->route('vendor.dashboard'); + } + break; + default: + Auth::logout(); + // if (Auth::guard($guard)->check()) { + // return redirect('/'); + // } + break; + } return $next($request); } From e62689673262bb6ba6fb7178c4cb78bc709cde90 Mon Sep 17 00:00:00 2001 From: Nikola Cirkovic Date: Sun, 12 Jun 2022 02:16:14 +0200 Subject: [PATCH 5/5] INA-7 | fix routes file --- app/Providers/RouteServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 5642c77487d1..b7a060640f57 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -127,6 +127,6 @@ class RouteServiceProvider extends ServiceProvider Route::prefix('') ->middleware('vendor') ->namespace($this->namespace) - ->group(base_path('routes/contact.php')); + ->group(base_path('routes/vendor.php')); } }