webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Updated flow to ensure /register/confirm route is used where needed

Browse Source 
Was accidentally skipped during previous updates. Will now be used on
saml, ldap & standard registration where required.
Uses session to know if the email was just sent and, if so, show the
confirmation route.
This commit is contained in:
Dan Brown
2020-09-05 17:26:48 +01:00
parent c029741a17
commit ff1ee2d71f
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Auth/Access/RegistrationService.php
View File

@ -74,6 +74,7 @@ class RegistrationService
try {
$this->emailConfirmationService->sendConfirmation($newUser);
session()->flash('sent-email-confirmation', true);
} catch (Exception $e) {
$message = trans('auth.email_confirm_send_error');
throw new UserRegistrationException($message, '/register/confirm');

4
app/Http/Middleware/Authenticate.php
View File

@ -44,6 +44,10 @@ class Authenticate
], 401);
}
if (session()->get('sent-email-confirmation') === true) {
return redirect('/register/confirm');
}
return redirect('/register/confirm/awaiting');
}
}