Auth group sync: Fixed unintential mapping behaviour change

[bookstack] / app / Http / Controllers / Auth / UserInviteController.php

diff --git a/app/Http/Controllers/Auth/UserInviteController.php b/app/Http/Controllers/Auth/UserInviteController.php
index ab745224836d4e82477e0513999d049c07a4528f..27b20f831b956d67b6501a4c17a8ee902e645a85 100644 (file)
--- a/app/Http/Controllers/Auth/UserInviteController.php
+++ b/app/Http/Controllers/Auth/UserInviteController.php
@@ -2,18 +2,16 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

-use BookStack\Actions\ActivityType;

 use BookStack\Auth\Access\UserInviteService;
 use BookStack\Auth\UserRepo;
 use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Exceptions\UserTokenNotFoundException;
 use BookStack\Auth\Access\UserInviteService;
 use BookStack\Auth\UserRepo;
 use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Exceptions\UserTokenNotFoundException;

-use BookStack\Facades\Theme;

 use BookStack\Http\Controllers\Controller;
 use BookStack\Http\Controllers\Controller;

-use BookStack\Theming\ThemeEvents;

 use Exception;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Exception;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;

+use Illuminate\Validation\Rules\Password;

 
 class UserInviteController extends Controller
 {
 
 class UserInviteController extends Controller
 {


@@ -34,6 +32,7 @@ class UserInviteController extends Controller
 
     /**
      * Show the page for the user to set the password for their account.
 
     /**
      * Show the page for the user to set the password for their account.

+     *

      * @throws Exception
      */
     public function showSetPassword(string $token)
      * @throws Exception
      */
     public function showSetPassword(string $token)


@@ -51,12 +50,13 @@ class UserInviteController extends Controller
 
     /**
      * Sets the password for an invited user and then grants them access.
 
     /**
      * Sets the password for an invited user and then grants them access.

+     *

      * @throws Exception
      */
     public function setPassword(Request $request, string $token)
     {
         $this->validate($request, [
      * @throws Exception
      */
     public function setPassword(Request $request, string $token)
     {
         $this->validate($request, [

-            'password' => 'required|min:8'
+            'password' => ['required', Password::default()],

         ]);
 
         try {
         ]);
 
         try {


@@ -70,19 +70,18 @@ class UserInviteController extends Controller
         $user->email_confirmed = true;
         $user->save();
 
         $user->email_confirmed = true;
         $user->save();
 

-        auth()->login($user);
-        Theme::dispatch(ThemeEvents::AUTH_LOGIN, auth()->getDefaultDriver(), $user);
-        $this->logActivity(ActivityType::AUTH_LOGIN, $user);
-        $this->showSuccessNotification(trans('auth.user_invite_success', ['appName' => setting('app-name')]));

         $this->inviteService->deleteByUser($user);
         $this->inviteService->deleteByUser($user);

+        $this->showSuccessNotification(trans('auth.user_invite_success_login', ['appName' => setting('app-name')]));

 
 

-        return redirect('/');
+        return redirect('/login');

     }
 
     /**
      * Check and validate the exception thrown when checking an invite token.
     }
 
     /**
      * Check and validate the exception thrown when checking an invite token.

-     * @return RedirectResponse|Redirector
+     *

      * @throws Exception
      * @throws Exception

+     *
+     * @return RedirectResponse|Redirector

      */
     protected function handleTokenException(Exception $exception)
     {
      */
     protected function handleTokenException(Exception $exception)
     {


@@ -92,6 +91,7 @@ class UserInviteController extends Controller
 
         if ($exception instanceof UserTokenExpiredException) {
             $this->showErrorNotification(trans('errors.invite_token_expired'));
 
         if ($exception instanceof UserTokenExpiredException) {
             $this->showErrorNotification(trans('errors.invite_token_expired'));

+

             return redirect('/password/email');
         }
 
             return redirect('/password/email');
         }