mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use function parameters

This commit is contained in:
Roeland Jago Douma 2016-08-19 21:41:55 +02:00
parent 16ff207465
commit b6520827f7
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/federation/lib/Controller/OCSAuthAPIController.php
View File

@ -96,14 +96,12 @@ class OCSAuthAPIController extends OCSController{
*
* request received to ask remote server for a shared secret
*
* @param string $url
* @param string $token
* @return Http\DataResponse
* @throws OCSForbiddenException
*/
public function requestSharedSecret() {
$url = $this->request->getParam('url');
$token = $this->request->getParam('token');
public function requestSharedSecret($url, $token) {
if ($this->trustedServers->isTrustedServer($url) === false) {
$this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret', ['app' => 'federation']);
throw new OCSForbiddenException();
@ -146,14 +144,12 @@ class OCSAuthAPIController extends OCSController{
*
* create shared secret and return it
*
* @param string $url
* @param string $token
* @return Http\DataResponse
* @throws OCSForbiddenException
*/
public function getSharedSecret() {
$url = $this->request->getParam('url');
$token = $this->request->getParam('token');
public function getSharedSecret($url, $token) {
if ($this->trustedServers->isTrustedServer($url) === false) {
$this->logger->error('remote server not trusted (' . $url . ') while getting shared secret', ['app' => 'federation']);
throw new OCSForbiddenException();

9
apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
View File

@ -97,8 +97,6 @@ class OCSAuthAPIControllerTest extends TestCase {
$url = 'url';
$this->request->expects($this->at(0))->method('getParam')->with('url')->willReturn($url);
$this->request->expects($this->at(1))->method('getParam')->with('token')->willReturn($token);
$this->trustedServers
->expects($this->once())
->method('isTrustedServer')->with($url)->willReturn($isTrustedServer);
@ -116,7 +114,7 @@ class OCSAuthAPIControllerTest extends TestCase {
}
try {
$result = $this->ocsAuthApi->requestSharedSecret();
$this->ocsAuthApi->requestSharedSecret($url, $token);
$this->assertTrue($ok);
} catch (OCSForbiddenException $e) {
$this->assertFalse($ok);
@ -143,9 +141,6 @@ class OCSAuthAPIControllerTest extends TestCase {
$url = 'url';
$token = 'token';
$this->request->expects($this->at(0))->method('getParam')->with('url')->willReturn($url);
$this->request->expects($this->at(1))->method('getParam')->with('token')->willReturn($token);
/** @var OCSAuthAPIController | \PHPUnit_Framework_MockObject_MockObject $ocsAuthApi */
$ocsAuthApi = $this->getMockBuilder('OCA\Federation\Controller\OCSAuthAPIController')
->setConstructorArgs(
@ -181,7 +176,7 @@ class OCSAuthAPIControllerTest extends TestCase {
}
try {
$result = $ocsAuthApi->getSharedSecret();
$result = $ocsAuthApi->getSharedSecret($url, $token);
$this->assertTrue($ok);
$data = $result->getData();
$this->assertSame('secret', $data['sharedSecret']);