refactor session handling

Author: steven-fox

app/Livewire/OrderSuccess.php

@@ -37,7 +37,7 @@ public function loadData(): void
 
     private function loadEmail(): ?string
     {
-        if ($email = session('customer_email')) {
+        if ($email = session($this->sessionKey('email'))) {
             return $email;
         }
 
@@ -48,14 +48,14 @@ private function loadEmail(): ?string
             return null;
         }
 
-        session()->put('customer_email', $email);
+        session()->put($this->sessionKey('email'), $email);
 
         return $email;
     }
 
     private function loadLicenseKey(): ?string
     {
-        if ($licenseKey = session('license_key')) {
+        if ($licenseKey = session($this->sessionKey('license_key'))) {
             return $licenseKey;
         }
 
@@ -64,15 +64,15 @@ private function loadLicenseKey(): ?string
         }
 
         if ($licenseKey = Cache::get($this->email.'.license_key')) {
-            session()->put('license_key', $licenseKey);
+            session()->put($this->sessionKey('license_key'), $licenseKey);
         }
 
         return $licenseKey;
     }
 
     private function loadSubscription(): ?Subscription
     {
-        if ($subscription = session('subscription')) {
+        if ($subscription = session($this->sessionKey('subscription'))) {
             return Subscription::tryFrom($subscription);
         }
 
@@ -85,8 +85,13 @@ private function loadSubscription(): ?Subscription
 
         $subscription = Subscription::fromStripePriceId($priceId);
 
-        session()->put('subscription', $subscription->value);
+        session()->put($this->sessionKey('subscription'), $subscription->value);
 
         return $subscription;
     }
+
+    private function sessionKey(string $key): string
+    {
+        return "{$this->checkoutSessionId}.{$key}";
+    }
 }

tests/Feature/Livewire/OrderSuccessTest.php

@@ -61,8 +61,12 @@ public function it_displays_license_key_when_available()
     #[Test]
     public function it_uses_session_data_when_available()
     {
-        Session::put('customer_email', 'session@example.com');
-        Session::put('license_key', 'session-license-key');
+        Cache::flush();
+
+        $checkoutSessionId = 'cs_test_123';
+
+        Session::put("$checkoutSessionId.email", 'session@example.com');
+        Session::put("$checkoutSessionId.license_key", 'session-license-key');
 
         Livewire::test(OrderSuccess::class, ['checkoutSessionId' => 'cs_test_123'])
             ->assertSet('email', 'session@example.com')