updated config to also include Norwegian

[bookstack] / app / Auth / Access / RegistrationService.php

diff --git a/app/Auth/Access/RegistrationService.php b/app/Auth/Access/RegistrationService.php
index 9136b37b5a86ea49f1f0a8ccaac27b1fd25eb27d..ecc92c117d46ccb84de50a8c2defc2c75322a3a7 100644 (file)
--- a/app/Auth/Access/RegistrationService.php
+++ b/app/Auth/Access/RegistrationService.php
@@ -57,7 +57,7 @@ class RegistrationService
         // Ensure user does not already exist
         $alreadyUser = !is_null($this->userRepo->getByEmail($userEmail));
         if ($alreadyUser) {
         // Ensure user does not already exist
         $alreadyUser = !is_null($this->userRepo->getByEmail($userEmail));
         if ($alreadyUser) {

-            throw new UserRegistrationException(trans('errors.error_user_exists_different_creds', ['email' => $userEmail]));
+            throw new UserRegistrationException(trans('errors.error_user_exists_different_creds', ['email' => $userEmail]), '/login');

         }
 
         // Create the user
         }
 
         // Create the user


@@ -71,15 +71,15 @@ class RegistrationService
         // Start email confirmation flow if required
         if ($this->emailConfirmationService->confirmationRequired() && !$emailConfirmed) {
             $newUser->save();
         // Start email confirmation flow if required
         if ($this->emailConfirmationService->confirmationRequired() && !$emailConfirmed) {
             $newUser->save();

-            $message = '';

 
             try {
                 $this->emailConfirmationService->sendConfirmation($newUser);
 
             try {
                 $this->emailConfirmationService->sendConfirmation($newUser);

+                session()->flash('sent-email-confirmation', true);

             } catch (Exception $e) {
                 $message = trans('auth.email_confirm_send_error');
             } catch (Exception $e) {
                 $message = trans('auth.email_confirm_send_error');

+                throw new UserRegistrationException($message, '/register/confirm');

             }
 
             }
 

-            throw new UserRegistrationException($message, '/register/confirm');

         }
 
         return $newUser;
         }
 
         return $newUser;