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

ssddanbrown · ssddanbrown · commit ff1ee2d71f2a · 2020-09-05T17:26:48.000+01:00
Was accidentally skipped during previous updates. Will now be used on
saml, ldap &amp; standard registration where required.
Uses session to know if the email was just sent and, if so, show the
confirmation route.
diff --git a/app/Auth/Access/RegistrationService.php b/app/Auth/Access/RegistrationService.php
@@ -74,6 +74,7 @@ public function registerUser(array $userData, ?SocialAccount $socialAccount = nu
 
             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');
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
@@ -44,6 +44,10 @@ protected function emailConfirmationErrorResponse(Request $request)
             ], 401);
         }
 
+        if (session()->get('sent-email-confirmation') === true) {
+            return redirect('/register/confirm');
+        }
+
         return redirect('/register/confirm/awaiting');
     }
 }
diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
@@ -170,6 +170,11 @@ public function test_restricted_registration()
             ->seePageIs('/register/confirm')
             ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => false]);
 
+        $this->visit('/')
+            ->seePageIs('/register/confirm/awaiting');
+
+        auth()->logout();
+
         $this->visit('/')->seePageIs('/login')
             ->type($user->email, '#email')
             ->type($user->password, '#password')
@@ -202,6 +207,10 @@ public function test_restricted_registration_with_confirmation_disabled()
             ->seePageIs('/register/confirm')
             ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => false]);
 
+        $this->visit('/')
+            ->seePageIs('/register/confirm/awaiting');
+
+        auth()->logout();
         $this->visit('/')->seePageIs('/login')
             ->type($user->email, '#email')
             ->type($user->password, '#password')
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
@@ -620,7 +620,7 @@ public function test_login_with_email_confirmation_required_maps_groups_but_show
                 ]
             ]]);
 
-        $this->mockUserLogin()->seePageIs('/register/confirm/awaiting');
+        $this->mockUserLogin()->seePageIs('/register/confirm');
         $this->seeInDatabase('users', [
             'email' => $user->email,
             'email_confirmed' => false,
diff --git a/tests/Auth/Saml2Test.php b/tests/Auth/Saml2Test.php
@@ -304,7 +304,9 @@ public function test_group_sync_functions_when_email_confirmation_required()
 
         $this->withPost(['SAMLResponse' => $this->acsPostData], function () use ($memberRole, $adminRole) {
             $acsPost = $this->followingRedirects()->post('/saml2/acs');
-            $acsPost->assertSee('Your email address has not yet been confirmed');
+
+            $this->assertEquals('http://localhost/register/confirm', url()->current());
+            $acsPost->assertSee('Please check your email and click the confirmation button to access BookStack.');
             $user = User::query()->where('external_auth_id', '=', 'user')->first();
 
             $userRoleIds = $user->roles()->pluck('id');

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,10 @@ protected function emailConfirmationErrorResponse(Request $request)`
`44`	`44`	`], 401);`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ if (session()->get('sent-email-confirmation') === true) {`
	`48`	`+ return redirect('/register/confirm');`
	`49`	`+ }`
	`50`	`+`
`47`	`51`	`return redirect('/register/confirm/awaiting');`
`48`	`52`	`}`
`49`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ public function test_login_with_email_confirmation_required_maps_groups_but_show`
`620`	`620`	`]`
`621`	`621`	`]]);`
`622`	`622`
`623`		`- $this->mockUserLogin()->seePageIs('/register/confirm/awaiting');`
	`623`	`+ $this->mockUserLogin()->seePageIs('/register/confirm');`
`624`	`624`	`$this->seeInDatabase('users', [`
`625`	`625`	`'email' => $user->email,`
`626`	`626`	`'email_confirmed' => false,`