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

Prevented email confirmation exception throw on registration

Browse Source 
Was preventing any other registration actions from taking place such as
LDAP/SAML group sync. Email confirmation should be actioned by
middleware on post-registration redirect.

Added testing to cover.
Tested for LDAP, SAML and normal registration with email confirmation
required to ensure flows work as expected.

Fixes #2082
This commit is contained in:
Dan Brown
2020-08-04 17:54:50 +01:00
parent c076ca408c
commit 87a5340a05
4 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/Auth/Saml2Test.php
View File

@@ -290,6 +290,33 @@ class Saml2Test extends TestCase
});
}
public function test_group_sync_functions_when_email_confirmation_required()
{
setting()->put('registration-confirmation', 'true');
config()->set([
'saml2.onelogin.strict' => false,
'saml2.user_to_groups' => true,
'saml2.remove_from_groups' => false,
]);
$memberRole = factory(Role::class)->create(['external_auth_id' => 'member']);
$adminRole = Role::getSystemRole('admin');
$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');
$user = User::query()->where('external_auth_id', '=', 'user')->first();
$userRoleIds = $user->roles()->pluck('id');
$this->assertContains($memberRole->id, $userRoleIds, 'User was assigned to member role');
$this->assertContains($adminRole->id, $userRoleIds, 'User was assigned to admin role');
$this->assertTrue($user->email_confirmed == false, 'User email remains unconfirmed');
});
$homeGet = $this->get('/');
$homeGet->assertRedirect('/register/confirm/awaiting');
}
protected function withGet(array $options, callable $callback)
{
return $this->withGlobal($_GET, $options, $callback);