sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2163 from nextcloud/app-password-scope-warngings 

fix warnings when updating app password
pull/2196/head
Morris Jobke 2016-11-17 17:52:23 +07:00 committed by GitHub
parent 54ca411ff0 d2dee32756
commit bba32cf4b7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
settings/Controller/AuthSettingsController.php
Unescape Escape View File

@ -192,8 +192,7 @@ class AuthSettingsController extends Controller {
public function update($id, array $scope) {
$token = $this->tokenProvider->getTokenById($id);
$token->setScope([
'filesystem' => $scope['filesystem'],
'app' => array_values($scope['apps'])
'filesystem' => $scope['filesystem']
]);
$this->tokenProvider->updateToken($token);
return [];

5
tests/Settings/Controller/AuthSettingsControllerTest.php
Unescape Escape View File

@ -212,15 +212,14 @@ class AuthSettingsControllerTest extends TestCase {
$token->expects($this->once())
->method('setScope')
->with($this->equalTo([
'filesystem' => true,
'app' => ['dav', 'myapp']
'filesystem' => true
]));
$this->tokenProvider->expects($this->once())
->method('updateToken')
->with($this->equalTo($token));
$this->assertSame([], $this->controller->update(42, ['filesystem' => true, 'apps' => ['dav', 'myapp']]));
$this->assertSame([], $this->controller->update(42, ['filesystem' => true]));
}
}