From 6a59102a90784901ef51aff42fe4d7e215bea16f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 4 Jun 2023 16:46:59 +1000
Subject: [PATCH] Correct redirects for the AP

---
 app/Http/Controllers/Traits/VerifiesUserEmail.php  |  1 +
 app/Http/Controllers/UserController.php            | 14 ++++++++------
 .../themes/ninja2020/auth/confirmed.blade.php      |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php
index f821631c6b87..02b7353de0b1 100644
--- a/app/Http/Controllers/Traits/VerifiesUserEmail.php
+++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php
@@ -84,6 +84,7 @@ trait VerifiesUserEmail
         return $this->render('auth.confirmed', [
             'root' => 'themes',
             'message' => ctrans('texts.security_confirmation'),
+            'redirect_url' => request()->hasHeader('X-React') ? 'https://app.invoicing.co/#/' : url('/'),
         ]);
     }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 60dbcf4d735f..bcabe5c16c0b 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -231,8 +231,11 @@ class UserController extends BaseController
 
         $return_user_collection = collect();
 
-        $users->each(function ($user, $key) use ($action, $return_user_collection) {
-            if (auth()->user()->can('edit', $user)) {
+        /** @var \App\Models\User $logged_in_user */
+        $logged_in_user = auth()->user(); 
+
+        $users->each(function ($user, $key) use ($logged_in_user, $action, $return_user_collection) {
+            if ($logged_in_user->can('edit', $user)) {
                 $this->user_repo->{$action}($user);
 
                 $return_user_collection->push($user->id);
@@ -251,12 +254,11 @@ class UserController extends BaseController
      */
     public function detach(DetachCompanyUserRequest $request, User $user)
     {
-        // if ($request->entityIsDeleted($user)) {
-        //     return $request->disallowUpdate();
-        // }
+        /** @var \App\Models\User $logged_in_user */
+        $logged_in_user = auth()->user();
 
         $company_user = CompanyUser::whereUserId($user->id)
-                                    ->whereCompanyId(auth()->user()->companyId())
+                                    ->whereCompanyId($logged_in_user->companyId())
                                     ->withTrashed()
                                     ->first();
 
diff --git a/resources/views/themes/ninja2020/auth/confirmed.blade.php b/resources/views/themes/ninja2020/auth/confirmed.blade.php
index 7bbad769ec40..ca147c2c0c93 100644
--- a/resources/views/themes/ninja2020/auth/confirmed.blade.php
+++ b/resources/views/themes/ninja2020/auth/confirmed.blade.php
@@ -8,7 +8,7 @@
                 <img src="{{ asset('images/invoiceninja-black-logo-2.png') }}" class="border-b border-gray-100 h-18 pb-4" alt="Invoice Ninja logo">
                 <h1 class="text-center text-3xl mt-10">{{ ctrans('texts.confirmation') }}</h1>
                 <p class="text-center opacity-75">{{ $message }}</p>
-                <a class="button button-primary text-blue-600 text-center mt-8" href="{{ url('/') }}">{{ ctrans('texts.return_to_login') }}</a>
+                <a class="button button-primary text-blue-600 text-center mt-8" href="{{ $redirect_url }}">{{ ctrans('texts.return_to_login') }}</a>
             </div>
         </div>
     </div>