From 928345c8ea90f0d58d5c580146137e6f43ffb968 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 26 Oct 2023 20:45:38 +0200
Subject: [PATCH] fix: force password reset on invited accounts

---
 app/Http/Middleware/DecideWhatToDoWithUser.php | 2 +-
 bootstrap/helpers/subscriptions.php            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Http/Middleware/DecideWhatToDoWithUser.php b/app/Http/Middleware/DecideWhatToDoWithUser.php
index 3fb9dfea7..19a09125a 100644
--- a/app/Http/Middleware/DecideWhatToDoWithUser.php
+++ b/app/Http/Middleware/DecideWhatToDoWithUser.php
@@ -12,7 +12,7 @@ class DecideWhatToDoWithUser
     public function handle(Request $request, Closure $next): Response
     {
         if (!auth()->user() || !isCloud() || isInstanceAdmin()) {
-            if (!isCloud() && showBoarding()  && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
+            if (!isCloud() && showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
                 return redirect('boarding');
             }
             return $next($request);
diff --git a/bootstrap/helpers/subscriptions.php b/bootstrap/helpers/subscriptions.php
index 130654db5..6707f8937 100644
--- a/bootstrap/helpers/subscriptions.php
+++ b/bootstrap/helpers/subscriptions.php
@@ -148,6 +148,8 @@ function allowedPathsForInvalidAccounts() {
     return [
         'logout',
         'verify',
+        'force-password-reset',
+        'livewire/message/force-password-reset',
         'livewire/message/verify-email',
         'livewire/message/help'
     ];