From e9203aa056354ef42b3c188ba39a92b1e1374a1f Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Mon, 13 Apr 2026 15:54:17 +0200
Subject: [PATCH 1/4] Prevent logout flow being triggered when incorrect
 credentials are used

---
 composer.json                                 |  2 +-
 .../js/components/Checkout/CheckoutLogin.vue  | 11 +++-
 resources/js/stores/useUser.js                |  1 +
 .../views/components/notifications.blade.php  |  2 +-
 tests/playwright/checkout.spec.js             | 50 +++++++++++++++----
 tests/playwright/pages/CheckoutPage.js        | 36 ++++++++-----
 6 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/composer.json b/composer.json
index 72b1fd521..645aba1b2 100644
--- a/composer.json
+++ b/composer.json
@@ -74,6 +74,6 @@
         "rapidez/reviews": "<4.1"
     },
     "scripts": {
-        "analyse": "phpstan --memory-limit=256M"
+        "analyse": "phpstan --dmemory-limit=512M"
     }
 }
diff --git a/resources/js/components/Checkout/CheckoutLogin.vue b/resources/js/components/Checkout/CheckoutLogin.vue
index f660d7f8f..74080bb1a 100644
--- a/resources/js/components/Checkout/CheckoutLogin.vue
+++ b/resources/js/components/Checkout/CheckoutLogin.vue
@@ -1,4 +1,5 @@
 <script>
+import { SessionExpired } from '../../fetch'
 import { cart, setGuestEmailOnCart } from '../../stores/useCart'
 import { isEmailAvailable, login, register, user } from '../../stores/useUser'
 import { useDebounceFn } from '@vueuse/core'
@@ -70,7 +71,15 @@ export default {
         async handleLogin() {
             return await login(this.email, this.password)
                 .then(() => true)
-                .catch((error) => {
+                .catch(async (error) => {
+                    if (error instanceof SessionExpired) {
+                        let data = await error.response.json()
+                        if (data?.errors?.[0]?.message) {
+                            Notify(data.errors[0].message, 'error')
+                            return false
+                        }
+                    }
+
                     if (error.message) {
                         Notify(error.message, 'error')
                     }
diff --git a/resources/js/stores/useUser.js b/resources/js/stores/useUser.js
index b917596e4..51ceb1c75 100644
--- a/resources/js/stores/useUser.js
+++ b/resources/js/stores/useUser.js
@@ -148,6 +148,7 @@ export const login = async function (email, password) {
         },
         {
             notifyOnError: false,
+            redirectOnExpiration: false,
         },
     ).then(async (response) => {
         await loginByToken(response.data.generateCustomerToken.token)
diff --git a/resources/views/components/notifications.blade.php b/resources/views/components/notifications.blade.php
index 4e0a4e8af..93b83e598 100644
--- a/resources/views/components/notifications.blade.php
+++ b/resources/views/components/notifications.blade.php
@@ -1,5 +1,5 @@
 <notifications v-cloak v-slot="{ notifications }">
-    <div class="fixed sm:max-w-sm sm:w-full top-6 right-6 left-6 sm:left-auto flex flex-col z-notifications">
+    <div class="fixed sm:max-w-sm sm:w-full top-6 right-6 left-6 sm:left-auto flex flex-col z-notifications" data-testid="notifications" >
         <notification
             v-if="notifications.length"
             v-for="(notification, index) in notifications"
diff --git a/tests/playwright/checkout.spec.js b/tests/playwright/checkout.spec.js
index 1c686e06e..d546f0984 100644
--- a/tests/playwright/checkout.spec.js
+++ b/tests/playwright/checkout.spec.js
@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test'
 import { BasePage } from './pages/BasePage'
 import { ProductPage } from './pages/ProductPage'
-import { CheckoutPage } from './pages/CheckoutPage'
+import { CheckoutPage, screenshot_login, screenshot_credentials, screenshot_payment, screenshot_success } from './pages/CheckoutPage'
 import { AccountPage } from './pages/AccountPage'
 
 const checkoutTypes = ['default', 'onestep']
@@ -9,20 +9,20 @@ const checkoutTypes = ['default', 'onestep']
 checkoutTypes.forEach((type) => {
     test(type + ' - as guest', BasePage.tags, async ({ page }) => {
         const productPage = new ProductPage(page)
-        const checkoutPage = new CheckoutPage(page, type)
+        const checkoutPage = new CheckoutPage(page, type, [
+            screenshot_login,
+            screenshot_credentials,
+            screenshot_payment,
+            screenshot_success,
+        ])
 
         await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
-        await checkoutPage.checkout(`wayne+${crypto.randomUUID()}@enterprises.com`, false, false, [
-            'login',
-            'credentials',
-            'payment',
-            'success',
-        ])
+        await checkoutPage.checkout(`wayne+${crypto.randomUUID()}@enterprises.com`, false, false)
     })
 
     test(type + ' - as user', BasePage.tags, async ({ page }) => {
         const productPage = new ProductPage(page)
-        const checkoutPage = new CheckoutPage(page, type)
+        const checkoutPage = new CheckoutPage(page, type, [screenshot_login, screenshot_credentials])
         const accountPage = new AccountPage(page)
 
         const email = `wayne+${crypto.randomUUID()}@enterprises.com`
@@ -30,12 +30,42 @@ checkoutTypes.forEach((type) => {
 
         // Register
         await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
-        await checkoutPage.checkout(email, password, true, ['credentials'])
+        await checkoutPage.checkout(email, password, true)
 
         await accountPage.logout()
 
+        checkoutPage.screenshots = []
         // Login
         await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
         await checkoutPage.checkout(email, password)
     })
 })
+
+test('incorrect password login', BasePage.tags, async ({ page }) => {
+    const productPage = new ProductPage(page)
+    const checkoutPage = new CheckoutPage(page, 'default', [screenshot_credentials])
+    const accountPage = new AccountPage(page)
+
+    const email = `wayne+${crypto.randomUUID()}@enterprises.com`
+    const password = 'IronManSucks.91939'
+
+    // Register
+    await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
+    await checkoutPage.checkout(email, password, true)
+
+    await accountPage.logout()
+
+    checkoutPage.screenshots = []
+    // Login
+    await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
+    await checkoutPage.gotoCheckout()
+    await checkoutPage.login(email, password + '!')
+    await page.getByTestId('continue').click()
+    await page.waitForTimeout(500)
+    await page.waitForLoadState('networkidle')
+    await expect(page.getByTestId('notifications')).toContainText(
+        'The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.',
+    )
+
+    await checkoutPage.checkout(email, password)
+})
diff --git a/tests/playwright/pages/CheckoutPage.js b/tests/playwright/pages/CheckoutPage.js
index 40028eec2..c1885d7cb 100644
--- a/tests/playwright/pages/CheckoutPage.js
+++ b/tests/playwright/pages/CheckoutPage.js
@@ -1,10 +1,15 @@
 import { expect } from '@playwright/test'
 import { BasePage } from './BasePage'
 
+export const screenshot_login = 'login'
+export const screenshot_credentials = 'credentials'
+export const screenshot_payment = 'payment'
+export const screenshot_success = 'success'
 export class CheckoutPage {
-    constructor(page, type = 'default') {
+    constructor(page, type = 'default', screenshots = []) {
         this.page = page
         this.type = type
+        this.screenshots = screenshots
     }
 
     async gotoCheckout() {
@@ -14,18 +19,23 @@ export class CheckoutPage {
     }
 
     async login(email, password = false, register = false) {
+        await this.page.waitForLoadState('networkidle')
         await this.page.fill('[name=email]', email)
         await this.page.locator('[name=email]').press('Tab')
         await this.page.waitForLoadState('networkidle')
 
         if (password && !register) {
-            await new BasePage(this.page).screenshot('fullpage')
+            if (this.this.screenshots.includes(screenshot_login)) {
+                await new BasePage(this.page).screenshot('fullpage')
+            }
             await this.page.fill('[name=password]', password)
         }
 
         if (password && register) {
             await this.page.getByTestId('create-account').click()
-            await new BasePage(this.page).screenshot('fullpage')
+            if (this.this.screenshots.includes(screenshot_login)) {
+                await new BasePage(this.page).screenshot('fullpage')
+            }
             await this.page.fill('[name=password]', password)
             await this.page.fill('[name=password_repeat]', password)
             await this.page.fill('[name=firstname]', 'Bruce')
@@ -92,16 +102,16 @@ export class CheckoutPage {
         await this.page.getByTestId('continue').waitFor({ state: 'visible' })
     }
 
-    async checkout(email, password = false, register = false, screenshots = []) {
+    async checkout(email, password = false, register = false) {
         const method = this.type === 'onestep' ? 'checkoutOnestep' : 'checkoutDefault'
 
         await this[method](email, password, register, screenshots)
     }
 
-    async checkoutDefault(email = false, password = false, register = false, screenshots = []) {
+    async checkoutDefault(email = false, password = false, register = false) {
         await this.gotoCheckout()
 
-        if (screenshots.includes('login')) {
+        if (this.screenshots.includes(screenshot_login)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
@@ -110,7 +120,7 @@ export class CheckoutPage {
             await this.continue('credentials')
         }
 
-        if (screenshots.includes('credentials')) {
+        if (this.screenshots.includes(screenshot_credentials)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
@@ -118,7 +128,7 @@ export class CheckoutPage {
         await this.shippingMethod()
         await this.continue('payment')
 
-        if (screenshots.includes('payment')) {
+        if (this.screenshots.includes(screenshot_payment)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
@@ -126,15 +136,15 @@ export class CheckoutPage {
         await this.continue('success')
         await this.success()
 
-        if (screenshots.includes('success')) {
+        if (this.screenshots.includes(screenshot_success)) {
             await new BasePage(this.page).screenshot('fullpage-footer')
         }
     }
 
-    async checkoutOnestep(email = false, password = false, register = false, screenshots = []) {
+    async checkoutOnestep(email = false, password = false, register = false) {
         await this.gotoCheckout()
 
-        if (screenshots.includes('login')) {
+        if (this.screenshots.includes(screenshot_login)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
@@ -146,14 +156,14 @@ export class CheckoutPage {
         await this.shippingMethod()
         await this.paymentMethod()
 
-        if (screenshots.includes('payment')) {
+        if (this.screenshots.includes(screenshot_payment)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
         await this.continue('success')
         await this.success()
 
-        if (screenshots.includes('success')) {
+        if (this.screenshots.includes(screenshot_success)) {
             await new BasePage(this.page).screenshot('fullpage-footer')
         }
     }

From 09d37dde3159fe2614a075957ac6fce48ad8d68e Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Mon, 13 Apr 2026 16:03:14 +0200
Subject: [PATCH 2/4] Reset phpstan limit

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 645aba1b2..db0131efe 100644
--- a/composer.json
+++ b/composer.json
@@ -74,6 +74,6 @@
         "rapidez/reviews": "<4.1"
     },
     "scripts": {
-        "analyse": "phpstan --dmemory-limit=512M"
+        "analyse": "phpstan --memory-limit=512M"
     }
 }

From d661af9d8c0c0cc9cd55df2c68c818acc50a7c24 Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Mon, 13 Apr 2026 17:19:08 +0200
Subject: [PATCH 3/4] Removed screenshots param

---
 tests/playwright/pages/CheckoutPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/playwright/pages/CheckoutPage.js b/tests/playwright/pages/CheckoutPage.js
index c1885d7cb..6c666c558 100644
--- a/tests/playwright/pages/CheckoutPage.js
+++ b/tests/playwright/pages/CheckoutPage.js
@@ -105,7 +105,7 @@ export class CheckoutPage {
     async checkout(email, password = false, register = false) {
         const method = this.type === 'onestep' ? 'checkoutOnestep' : 'checkoutDefault'
 
-        await this[method](email, password, register, screenshots)
+        await this[method](email, password, register)
     }
 
     async checkoutDefault(email = false, password = false, register = false) {

From 00332a96879046b6029db557ff29627c0df4188c Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Mon, 13 Apr 2026 15:33:43 +0000
Subject: [PATCH 4/4] [CI] Update Snapshots

---
 .../default---as-user-1-Mobile-Chrome-linux.png               | 4 ++--
 .../default---as-user-1-Mobile-Safari-linux.png               | 4 ++--
 .../default---as-user-1-chromium-linux.png                    | 4 ++--
 .../default---as-user-1-firefox-linux.png                     | 4 ++--
 .../default---as-user-1-webkit-linux.png                      | 4 ++--
 .../onestep---as-user-1-Mobile-Chrome-linux.png               | 4 ++--
 .../onestep---as-user-1-Mobile-Safari-linux.png               | 4 ++--
 .../onestep---as-user-1-chromium-linux.png                    | 4 ++--
 .../onestep---as-user-1-firefox-linux.png                     | 4 ++--
 .../onestep---as-user-1-webkit-linux.png                      | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png
index c1e3aae3f..71c281cf8 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:187279e79050d0780b263aff357b8447ddfb375385a550e46da01e8eac5c0d65
-size 21350
+oid sha256:4109ed0e129385c9359e01bcc4b59337e2009e55331b55669528070e6d1161dc
+size 11149
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png
index 08ebc3a40..91ad33b66 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68e060ea82ec47c110c1f9abed0897bd4a906ea6aaac4420d7548272247681b7
-size 24577
+oid sha256:bac0936417543f848aa376f469c13a351fa28d07e93e96de695b04b192f6a844
+size 12892
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png
index fefe9bca4..43d9ceee2 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a6499d864472859e84ec5a7b95124b5b56377c52e9d8bfbfeb6c0c7cace6607
-size 31920
+oid sha256:fd0c1af17718dbd4cd17a3126aaa6a0f90328c9ce8986538615c0ceac37fa10c
+size 21022
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png
index 332531fa0..3cd31c3f0 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0152dfaadf28ddfe7873c75ebc1d6862299f04ff256e0e805a40b961759a5e4e
-size 56454
+oid sha256:f67c46d0489fedf99952a419a6e7bc5529fe130583b0f614ea0451bfd094a248
+size 38256
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png
index 602e509f7..12b334624 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01f1a95d56e6c4bb1e21bc43d7a8ef29b86f6f7526527ac22f965da8234ef461
-size 37579
+oid sha256:d8fe36619bef1d673e491002b259b78b498cf7e3772f665116a463fed080b311
+size 24254
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png
index 15242c46a..09d175737 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99d6437ebf0142d98ecf72a794f9fa8089094d4b6bb9bf59771fcb7891907834
-size 82748
+oid sha256:1c1591d8832b07871b5ce8b11135fcf08ad27d87b2cf735aaa4f0669e01d164f
+size 72092
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png
index fc1389600..76cfe3117 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb470ae7231934473a4e6aa022b8e0410033a94f69892a167787bba1b7a07746
-size 93017
+oid sha256:cd7f354faca492b8b04831ada6ec7a22318eeef80b82d41d91adb7d31c6ba947
+size 80720
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png
index d00ece216..518722a86 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a8ecd0da3c7ee5052ab3a2e31fa807eb5069a4ba6bb83a273154b741f0ac948
-size 79291
+oid sha256:58824fb42dffdc2f9cbf313b58d8d12e8584a5dfe2d3ac009c59ef2d63977cbf
+size 67763
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png
index 6afbf4c17..07287df15 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b9ff9ed07887c19278b8f5c06ac7e9aebcdc11078db1e7450a6039d20915425
-size 129268
+oid sha256:9cc7968b4fb938ea1c8eea5bf27274becfa3aac9351149056e96baab29ec153e
+size 106949
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png
index 5252eee97..4e93f8a7f 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82db2dd4347c1b475f67dc2dad782b917bd5c68a1f076656e476f35172621545
-size 95462
+oid sha256:c3e7c295191a216ee35bd38865c354751dfe03fa32106e47d0c1a4e2b99d2b9f
+size 80490