Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 11:24:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update landing URLs after signup

Browse Source
This commit is contained in:
David Bomba 2023-06-11 16:43:04 +10:00
parent 0993676a05
commit 354c38e4ab
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Traits/VerifiesUserEmail.php
View File

@ -35,7 +35,10 @@ trait VerifiesUserEmail
$user = User::where('confirmation_code', request()->confirmation_code)->first(); $user = User::where('confirmation_code', request()->confirmation_code)->first();
if (! $user) { 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(); $user->email_verified_at = now();
@ -46,16 +49,18 @@ trait VerifiesUserEmail
return $this->render('auth.confirmed', [ return $this->render('auth.confirmed', [
'root' => 'themes', 'root' => 'themes',
'message' => ctrans('texts.security_confirmation'), '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)) { 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', [ return $this->render('auth.confirmed', [
'root' => 'themes', 'root' => 'themes',
'message' => ctrans('texts.security_confirmation'), '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', [ return $this->render('auth.confirmed', [
'root' => 'themes', 'root' => 'themes',
'message' => ctrans('texts.security_confirmation'), '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('/'),
]); ]);
} }
} }

8
app/Mail/Admin/VerifyUserObject.php
View File

@ -42,10 +42,16 @@ class VerifyUserObject
$this->user->confirmation_code = $this->createDbHash($this->company->db); $this->user->confirmation_code = $this->createDbHash($this->company->db);
$this->user->save(); $this->user->save();
$react_redirect = '';
if(Ninja::isHosted()) {
$react_redirect = '?react=true';
}
$data = [ $data = [
'title' => ctrans('texts.confirmation_subject'), 'title' => ctrans('texts.confirmation_subject'),
'message' => ctrans('texts.confirmation_message'), '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'), 'button' => ctrans('texts.button_confirmation_message'),
'settings' => $this->company->settings, 'settings' => $this->company->settings,
'logo' => $this->company->present()->logo(), 'logo' => $this->company->present()->logo(),