mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-07-28 17:02:04 +03:00
Apply fixes from StyleCI
This commit is contained in:
Dan Brown
StyleCI Bot
@ -27,18 +27,18 @@ class LdapTest extends TestCase
|
||||
define('LDAP_OPT_REFERRALS', 1);
|
||||
}
|
||||
config()->set([
|
||||
'auth.method' => 'ldap',
|
||||
'auth.defaults.guard' => 'ldap',
|
||||
'services.ldap.base_dn' => 'dc=ldap,dc=local',
|
||||
'services.ldap.email_attribute' => 'mail',
|
||||
'auth.method' => 'ldap',
|
||||
'auth.defaults.guard' => 'ldap',
|
||||
'services.ldap.base_dn' => 'dc=ldap,dc=local',
|
||||
'services.ldap.email_attribute' => 'mail',
|
||||
'services.ldap.display_name_attribute' => 'cn',
|
||||
'services.ldap.id_attribute' => 'uid',
|
||||
'services.ldap.user_to_groups' => false,
|
||||
'services.ldap.version' => '3',
|
||||
'services.ldap.user_filter' => '(&(uid=${user}))',
|
||||
'services.ldap.follow_referrals' => false,
|
||||
'services.ldap.tls_insecure' => false,
|
||||
'services.ldap.thumbnail_attribute' => null,
|
||||
'services.ldap.id_attribute' => 'uid',
|
||||
'services.ldap.user_to_groups' => false,
|
||||
'services.ldap.version' => '3',
|
||||
'services.ldap.user_filter' => '(&(uid=${user}))',
|
||||
'services.ldap.follow_referrals' => false,
|
||||
'services.ldap.tls_insecure' => false,
|
||||
'services.ldap.thumbnail_attribute' => null,
|
||||
]);
|
||||
$this->mockLdap = \Mockery::mock(Ldap::class);
|
||||
$this->app[Ldap::class] = $this->mockLdap;
|
||||
@ -70,9 +70,9 @@ class LdapTest extends TestCase
|
||||
protected function mockUserLogin(?string $email = null): TestResponse
|
||||
{
|
||||
return $this->post('/login', [
|
||||
'username' => $this->mockUser->name,
|
||||
'password' => $this->mockUser->password,
|
||||
] + ($email ? ['email' => $email] : []));
|
||||
'username' => $this->mockUser->name,
|
||||
'password' => $this->mockUser->password,
|
||||
] + ($email ? ['email' => $email] : []));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -95,8 +95,8 @@ class LdapTest extends TestCase
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
]]);
|
||||
|
||||
$resp = $this->mockUserLogin();
|
||||
@ -109,8 +109,8 @@ class LdapTest extends TestCase
|
||||
$resp->assertElementExists('#home-default');
|
||||
$resp->assertSee($this->mockUser->name);
|
||||
$this->assertDatabaseHas('users', [
|
||||
'email' => $this->mockUser->email,
|
||||
'email_confirmed' => false,
|
||||
'email' => $this->mockUser->email,
|
||||
'email_confirmed' => false,
|
||||
'external_auth_id' => $this->mockUser->name,
|
||||
]);
|
||||
}
|
||||
@ -126,8 +126,8 @@ class LdapTest extends TestCase
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
]]);
|
||||
|
||||
$resp = $this->mockUserLogin();
|
||||
@ -150,8 +150,8 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => $ldapDn,
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => $ldapDn,
|
||||
'mail' => [$this->mockUser->email],
|
||||
]]);
|
||||
|
||||
@ -170,10 +170,10 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => $ldapDn,
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => $ldapDn,
|
||||
'my_custom_id' => ['cooluser456'],
|
||||
'mail' => [$this->mockUser->email],
|
||||
'mail' => [$this->mockUser->email],
|
||||
]]);
|
||||
|
||||
$resp = $this->mockUserLogin();
|
||||
@ -189,8 +189,8 @@ class LdapTest extends TestCase
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
]]);
|
||||
$this->mockLdap->shouldReceive('bind')->times(2)->andReturn(true, false);
|
||||
|
||||
@ -219,14 +219,14 @@ class LdapTest extends TestCase
|
||||
$userForm->assertDontSee('Password');
|
||||
|
||||
$save = $this->post('/settings/users/create', [
|
||||
'name' => $this->mockUser->name,
|
||||
'name' => $this->mockUser->name,
|
||||
'email' => $this->mockUser->email,
|
||||
]);
|
||||
$save->assertSessionHasErrors(['external_auth_id' => 'The external auth id field is required.']);
|
||||
|
||||
$save = $this->post('/settings/users/create', [
|
||||
'name' => $this->mockUser->name,
|
||||
'email' => $this->mockUser->email,
|
||||
'name' => $this->mockUser->name,
|
||||
'email' => $this->mockUser->email,
|
||||
'external_auth_id' => $this->mockUser->name,
|
||||
]);
|
||||
$save->assertRedirect('/settings/users');
|
||||
@ -241,8 +241,8 @@ class LdapTest extends TestCase
|
||||
$editPage->assertDontSee('Password');
|
||||
|
||||
$update = $this->put("/settings/users/{$editUser->id}", [
|
||||
'name' => $editUser->name,
|
||||
'email' => $editUser->email,
|
||||
'name' => $editUser->name,
|
||||
'email' => $editUser->email,
|
||||
'external_auth_id' => 'test_auth_id',
|
||||
]);
|
||||
$update->assertRedirect('/settings/users');
|
||||
@ -271,8 +271,8 @@ class LdapTest extends TestCase
|
||||
$this->mockUser->attachRole($existingRole);
|
||||
|
||||
app('config')->set([
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.remove_from_groups' => false,
|
||||
]);
|
||||
|
||||
@ -280,14 +280,14 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$this->mockUser->email],
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$this->mockUser->email],
|
||||
'memberof' => [
|
||||
'count' => 2,
|
||||
0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
|
||||
1 => 'cn=ldaptester-second,ou=groups,dc=example,dc=com',
|
||||
0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
|
||||
1 => 'cn=ldaptester-second,ou=groups,dc=example,dc=com',
|
||||
],
|
||||
]]);
|
||||
|
||||
@ -316,8 +316,8 @@ class LdapTest extends TestCase
|
||||
$this->mockUser->attachRole($existingRole);
|
||||
|
||||
app('config')->set([
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.remove_from_groups' => true,
|
||||
]);
|
||||
|
||||
@ -325,13 +325,13 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(3)
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$this->mockUser->email],
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$this->mockUser->email],
|
||||
'memberof' => [
|
||||
'count' => 1,
|
||||
0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
|
||||
0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
|
||||
],
|
||||
]]);
|
||||
|
||||
@ -361,8 +361,8 @@ class LdapTest extends TestCase
|
||||
$roleToNotReceive = factory(Role::class)->create(['display_name' => 'ex-auth-a', 'external_auth_id' => 'test-second-param']);
|
||||
|
||||
app('config')->set([
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.remove_from_groups' => true,
|
||||
]);
|
||||
|
||||
@ -370,13 +370,13 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(3)
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$this->mockUser->email],
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$this->mockUser->email],
|
||||
'memberof' => [
|
||||
'count' => 1,
|
||||
0 => 'cn=ex-auth-a,ou=groups,dc=example,dc=com',
|
||||
0 => 'cn=ex-auth-a,ou=groups,dc=example,dc=com',
|
||||
],
|
||||
]]);
|
||||
|
||||
@ -402,8 +402,8 @@ class LdapTest extends TestCase
|
||||
setting()->put('registration-role', $roleToReceive->id);
|
||||
|
||||
app('config')->set([
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.remove_from_groups' => true,
|
||||
]);
|
||||
|
||||
@ -411,14 +411,14 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$this->mockUser->email],
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$this->mockUser->email],
|
||||
'memberof' => [
|
||||
'count' => 2,
|
||||
0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
|
||||
1 => 'cn=ldaptester-second,ou=groups,dc=example,dc=com',
|
||||
0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
|
||||
1 => 'cn=ldaptester-second,ou=groups,dc=example,dc=com',
|
||||
],
|
||||
]]);
|
||||
|
||||
@ -445,9 +445,9 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'displayname' => 'displayNameAttribute',
|
||||
]]);
|
||||
|
||||
@ -471,8 +471,8 @@ class LdapTest extends TestCase
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
]]);
|
||||
|
||||
$this->mockUserLogin()->assertRedirect('/login');
|
||||
@ -482,10 +482,10 @@ class LdapTest extends TestCase
|
||||
$resp->assertRedirect('/');
|
||||
$this->get('/')->assertSee($this->mockUser->name);
|
||||
$this->assertDatabaseHas('users', [
|
||||
'email' => $this->mockUser->email,
|
||||
'email_confirmed' => false,
|
||||
'email' => $this->mockUser->email,
|
||||
'email_confirmed' => false,
|
||||
'external_auth_id' => $this->mockUser->name,
|
||||
'name' => $this->mockUser->name,
|
||||
'name' => $this->mockUser->name,
|
||||
]);
|
||||
}
|
||||
|
||||
@ -499,8 +499,8 @@ class LdapTest extends TestCase
|
||||
$this->commonLdapMocks(0, 1, 1, 2, 1);
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
]]);
|
||||
|
||||
$this->mockLdap->shouldReceive('connect')->once()
|
||||
@ -566,8 +566,8 @@ class LdapTest extends TestCase
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
]]);
|
||||
|
||||
$resp = $this->post('/login', [
|
||||
@ -575,7 +575,7 @@ class LdapTest extends TestCase
|
||||
'password' => $this->mockUser->password,
|
||||
]);
|
||||
$resp->assertJsonStructure([
|
||||
'details_from_ldap' => [],
|
||||
'details_from_ldap' => [],
|
||||
'details_bookstack_parsed' => [],
|
||||
]);
|
||||
}
|
||||
@ -605,8 +605,8 @@ class LdapTest extends TestCase
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), ['cn', 'dn', 'uid', 'mail', 'cn'])
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [hex2bin('FFF8F7')],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
]]);
|
||||
|
||||
$details = $ldapService->getUserDetails('test');
|
||||
@ -619,14 +619,14 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'uid' => [$this->mockUser->name],
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => 'tester@example.com',
|
||||
]], ['count' => 1, 0 => [
|
||||
'uid' => ['Barry'],
|
||||
'cn' => ['Scott'],
|
||||
'dn' => ['dc=bscott' . config('services.ldap.base_dn')],
|
||||
'uid' => ['Barry'],
|
||||
'cn' => ['Scott'],
|
||||
'dn' => ['dc=bscott' . config('services.ldap.base_dn')],
|
||||
'mail' => 'tester@example.com',
|
||||
]]);
|
||||
|
||||
@ -646,8 +646,8 @@ class LdapTest extends TestCase
|
||||
setting()->put('registration-confirmation', 'true');
|
||||
|
||||
app('config')->set([
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.user_to_groups' => true,
|
||||
'services.ldap.group_attribute' => 'memberOf',
|
||||
'services.ldap.remove_from_groups' => true,
|
||||
]);
|
||||
|
||||
@ -655,20 +655,20 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')
|
||||
->times(6)
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'uid' => [$user->name],
|
||||
'cn' => [$user->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$user->email],
|
||||
'uid' => [$user->name],
|
||||
'cn' => [$user->name],
|
||||
'dn' => ['dc=test' . config('services.ldap.base_dn')],
|
||||
'mail' => [$user->email],
|
||||
'memberof' => [
|
||||
'count' => 1,
|
||||
0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
|
||||
0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
|
||||
],
|
||||
]]);
|
||||
|
||||
$login = $this->followingRedirects()->mockUserLogin();
|
||||
$login->assertSee('Thanks for registering!');
|
||||
$this->assertDatabaseHas('users', [
|
||||
'email' => $user->email,
|
||||
'email' => $user->email,
|
||||
'email_confirmed' => false,
|
||||
]);
|
||||
|
||||
@ -704,8 +704,8 @@ class LdapTest extends TestCase
|
||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
|
||||
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
|
||||
->andReturn(['count' => 1, 0 => [
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => $ldapDn,
|
||||
'cn' => [$this->mockUser->name],
|
||||
'dn' => $ldapDn,
|
||||
'jpegphoto' => [base64_decode('/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8Q
|
||||
EBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=')],
|
||||
'mail' => [$this->mockUser->email],
|
||||
|
||||
Reference in New Issue
Block a user