Remove EventServiceProvider (#2834)

orchidsoftware · May 13, 2024 · 47803b6 · 47803b6
1 parent 44772b1
commit 47803b6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 90 deletions.
diff --git a/src/Platform/Http/Controllers/LoginController.php b/src/Platform/Http/Controllers/LoginController.php
@@ -57,7 +57,7 @@ public function __construct(Auth $auth)
      *
      * @return JsonResponse|RedirectResponse
      */
-    public function login(Request $request)
+    public function login(Request $request, CookieJar $cookieJar)
     {
         $request->validate([
             'email'    => 'required|string',
@@ -66,16 +66,21 @@ public function login(Request $request)
 
         $auth = $this->guard->attempt(
             $request->only(['email', 'password']),
-            $request->filled('remember')
+            $request->boolean('remember')
         );
 
-        if ($auth) {
-            return $this->sendLoginResponse($request);
+        if (! $auth) {
+            throw ValidationException::withMessages([
+                'email' => __('The details you entered did not match our records. Please double-check and try again.'),
+            ]);
         }
 
-        throw ValidationException::withMessages([
-            'email' => __('The details you entered did not match our records. Please double-check and try again.'),
-        ]);
+        if ($request->boolean('remember')) {
+            $user = $cookieJar->forever($this->nameForLock(), $this->guard->id());
+            $cookieJar->queue($user);
+        }
+
+        return $this->sendLoginResponse($request);
     }
 
     /**
@@ -100,7 +105,7 @@ protected function sendLoginResponse(Request $request)
      */
     public function showLoginForm(Request $request)
     {
-        $user = $request->cookie('lockUser');
+        $user = $request->cookie($this->nameForLock());
 
         /** @var EloquentUserProvider $provider */
         $provider = $this->guard->getProvider();
@@ -118,7 +123,7 @@ public function showLoginForm(Request $request)
      */
     public function resetCookieLockMe(CookieJar $cookieJar)
     {
-        $lockUser = $cookieJar->forget('lockUser');
+        $lockUser = $cookieJar->forget($this->nameForLock());
 
         return redirect()->route('platform.login')->withCookie($lockUser);
     }
@@ -151,4 +156,14 @@ public function logout(Request $request)
             ? new JsonResponse([], 204)
             : redirect('/');
     }
+
+    /**
+     * Get a unique identifier for the auth session value.
+     *
+     * @return string
+     */
+    private function nameForLock(): string
+    {
+        return sprintf('%s_%s', $this->guard->getName(), '_orchid_lock');
+    }
 }
diff --git a/src/Platform/Listeners/LockUserForLogin.php b/src/Platform/Listeners/LockUserForLogin.php
diff --git a/src/Platform/Providers/EventServiceProvider.php b/src/Platform/Providers/EventServiceProvider.php
diff --git a/src/Platform/Providers/FoundationServiceProvider.php b/src/Platform/Providers/FoundationServiceProvider.php
@@ -100,7 +100,6 @@ public function provides(): array
             IconServiceProvider::class,
             BreadcrumbsServiceProvider::class,
             RouteServiceProvider::class,
-            EventServiceProvider::class,
             PlatformServiceProvider::class,
         ];
     }

diff --git a/tests/Feature/Platform/AuthTest.php b/tests/Feature/Platform/AuthTest.php
@@ -4,6 +4,7 @@
 
 namespace Orchid\Tests\Feature\Platform;
 
+use Illuminate\Support\Facades\Auth;
 use Orchid\Tests\TestFeatureCase;
 
 class AuthTest extends TestFeatureCase
@@ -38,7 +39,7 @@ public function testRouteDashboardLoginAuthSuccess(): void
         ])
             ->assertStatus(302)
             ->assertRedirect(route(config('platform.index')))
-            ->assertCookieNotExpired('lockUser');
+            ->assertCookieNotExpired(sprintf('%s_%s', Auth::guard()->getName(), '_orchid_lock'));
     }
 
     public function testRouteDashboardLoginAuthFail(): void
@@ -57,7 +58,7 @@ public function testRouteDashboardGuestLockAuth(): void
             'lockUser' => 1,
         ])
             ->assertRedirect(route('platform.login'))
-            ->assertCookieExpired('lockUser');
+            ->assertCookieExpired(sprintf('%s_%s', Auth::guard()->getName(), '_orchid_lock'));
     }
 
     public function testRouteDashboardSwitchLogout(): void