Use authType BASIC for Sabre client in integration tests
This helps massively reduce the numerous useless 401 exceptions that appears in the test log. These appear only because Sabre first connects without any auth type to receive the challenge and then sends the authentication data. With this change it will directly use basic auth. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
parent
2cd79a8d3d
commit
c54091d43b
|
@ -170,7 +170,6 @@ trait WebDav {
|
||||||
public function downloadPublicFileWithRange($range){
|
public function downloadPublicFileWithRange($range){
|
||||||
$token = $this->lastShareData->data->token;
|
$token = $this->lastShareData->data->token;
|
||||||
$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/webdav";
|
$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/webdav";
|
||||||
$headers['Range'] = $range;
|
|
||||||
|
|
||||||
$client = new GClient();
|
$client = new GClient();
|
||||||
$options = [];
|
$options = [];
|
||||||
|
@ -189,7 +188,6 @@ trait WebDav {
|
||||||
public function downloadPublicFileInsideAFolderWithRange($path, $range){
|
public function downloadPublicFileInsideAFolderWithRange($path, $range){
|
||||||
$token = $this->lastShareData->data->token;
|
$token = $this->lastShareData->data->token;
|
||||||
$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/webdav" . "$path";
|
$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/webdav" . "$path";
|
||||||
$headers['Range'] = $range;
|
|
||||||
|
|
||||||
$client = new GClient();
|
$client = new GClient();
|
||||||
$options = [];
|
$options = [];
|
||||||
|
@ -437,16 +435,17 @@ trait WebDav {
|
||||||
public function getSabreClient($user) {
|
public function getSabreClient($user) {
|
||||||
$fullUrl = substr($this->baseUrl, 0, -4);
|
$fullUrl = substr($this->baseUrl, 0, -4);
|
||||||
|
|
||||||
$settings = array(
|
$settings = [
|
||||||
'baseUri' => $fullUrl,
|
'baseUri' => $fullUrl,
|
||||||
'userName' => $user,
|
'userName' => $user,
|
||||||
);
|
];
|
||||||
|
|
||||||
if ($user === 'admin') {
|
if ($user === 'admin') {
|
||||||
$settings['password'] = $this->adminUser[1];
|
$settings['password'] = $this->adminUser[1];
|
||||||
} else {
|
} else {
|
||||||
$settings['password'] = $this->regularUser;
|
$settings['password'] = $this->regularUser;
|
||||||
}
|
}
|
||||||
|
$settings['authType'] = SClient::AUTH_BASIC;
|
||||||
|
|
||||||
return new SClient($settings);
|
return new SClient($settings);
|
||||||
}
|
}
|
||||||
|
@ -634,15 +633,17 @@ trait WebDav {
|
||||||
/*Set the elements of a proppatch, $folderDepth requires 1 to see elements without children*/
|
/*Set the elements of a proppatch, $folderDepth requires 1 to see elements without children*/
|
||||||
public function changeFavStateOfAnElement($user, $path, $favOrUnfav, $folderDepth, $properties = null){
|
public function changeFavStateOfAnElement($user, $path, $favOrUnfav, $folderDepth, $properties = null){
|
||||||
$fullUrl = substr($this->baseUrl, 0, -4);
|
$fullUrl = substr($this->baseUrl, 0, -4);
|
||||||
$settings = array(
|
$settings = [
|
||||||
'baseUri' => $fullUrl,
|
'baseUri' => $fullUrl,
|
||||||
'userName' => $user,
|
'userName' => $user,
|
||||||
);
|
];
|
||||||
if ($user === 'admin') {
|
if ($user === 'admin') {
|
||||||
$settings['password'] = $this->adminUser[1];
|
$settings['password'] = $this->adminUser[1];
|
||||||
} else {
|
} else {
|
||||||
$settings['password'] = $this->regularUser;
|
$settings['password'] = $this->regularUser;
|
||||||
}
|
}
|
||||||
|
$settings['authType'] = SClient::AUTH_BASIC;
|
||||||
|
|
||||||
$client = new SClient($settings);
|
$client = new SClient($settings);
|
||||||
if (!$properties) {
|
if (!$properties) {
|
||||||
$properties = [
|
$properties = [
|
||||||
|
|
Loading…
Reference in New Issue