From 354c38e4ab538cf4db8aa22d06784f81e9c53eda Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 11 Jun 2023 16:43:04 +1000
Subject: [PATCH] Update landing URLs after signup

---
 app/Http/Controllers/Traits/VerifiesUserEmail.php | 11 ++++++++---
 app/Mail/Admin/VerifyUserObject.php               |  8 +++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php
index 02b7353de0b1..7f94cb351ee1 100644
--- a/app/Http/Controllers/Traits/VerifiesUserEmail.php
+++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php
@@ -35,7 +35,10 @@ trait VerifiesUserEmail
         $user = User::where('confirmation_code', request()->confirmation_code)->first();
 
         if (! $user) {
-            return $this->render('auth.confirmed', ['root' => 'themes', 'message' => ctrans('texts.wrong_confirmation')]);
+            return $this->render('auth.confirmed', [
+                'root' => 'themes', 
+                'message' => ctrans('texts.wrong_confirmation'),
+                'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/')]);
         }
 
         $user->email_verified_at = now();
@@ -46,16 +49,18 @@ trait VerifiesUserEmail
             return $this->render('auth.confirmed', [
                 'root' => 'themes',
                 'message' => ctrans('texts.security_confirmation'),
+                'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/'),
             ]);
         }
 
         if (is_null($user->password) || empty($user->password) || Hash::check('', $user->password)) {
-            return $this->render('auth.confirmation_with_password', ['root' => 'themes', 'user_id' => $user->hashed_id]);
+            return $this->render('auth.confirmation_with_password', ['root' => 'themes', 'user_id' => $user->hashed_id, 'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/')]);
         }
 
         return $this->render('auth.confirmed', [
             'root' => 'themes',
             'message' => ctrans('texts.security_confirmation'),
+            'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/'),
         ]);
     }
 
@@ -84,7 +89,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('/'),
+            'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/'),
         ]);
     }
 }
diff --git a/app/Mail/Admin/VerifyUserObject.php b/app/Mail/Admin/VerifyUserObject.php
index a55eccdd3a7e..1410a7eb50a6 100644
--- a/app/Mail/Admin/VerifyUserObject.php
+++ b/app/Mail/Admin/VerifyUserObject.php
@@ -42,10 +42,16 @@ class VerifyUserObject
         $this->user->confirmation_code = $this->createDbHash($this->company->db);
         $this->user->save();
 
+        $react_redirect = '';
+
+        if(Ninja::isHosted()) {
+            $react_redirect = '?react=true';
+        }
+
         $data = [
             'title' => ctrans('texts.confirmation_subject'),
             'message' => ctrans('texts.confirmation_message'),
-            'url' => url("/user/confirm/{$this->user->confirmation_code}"),
+            'url' => url("/user/confirm/{$this->user->confirmation_code}".$react_redirect),
             'button' => ctrans('texts.button_confirmation_message'),
             'settings' => $this->company->settings,
             'logo' => $this->company->present()->logo(),