Skip to content

Commit 9ca5efa

Browse files
Merge pull request #93 from payplug/PRE-2814-fix-double-auth
PRE-2814 refactor: Fix double auth
2 parents d886338 + 5392d54 commit 9ca5efa

2 files changed

Lines changed: 7 additions & 27 deletions

File tree

lib/Payplug/Authentication.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ public static function getRegisterUrl($setup_redirection_uri = '', $oauth_callba
298298
if (empty($oauth_callback_uri)) {
299299
throw new Exception\ConfigurationException('Expected string values for oauth callback uri.');
300300
}
301-
$httpClient = new Core\HttpClient(null);
302301

303302
$url_datas = array(
304303
'setup_redirection_uri' => $setup_redirection_uri,
@@ -307,11 +306,7 @@ public static function getRegisterUrl($setup_redirection_uri = '', $oauth_callba
307306

308307
$route = Core\APIRoutes::getServiceRoute(Core\APIRoutes::PLUGIN_SETUP_SERVICE, $url_datas);
309308

310-
return $httpClient->get(
311-
$route,
312-
null,
313-
false
314-
);
309+
return $route;
315310
}
316311

317312
/**

tests/unit_tests/AuthenticationTest.php

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -393,27 +393,12 @@ public function testGetRegisterUrl()
393393
{
394394
$setup_redirection_uri = 'setup.redirection.uri.com';
395395
$oauth_callback_uri = 'oauth.callback.uri.com';
396-
$response = array(
397-
'redirect_to' => 'portal.uri.com'
396+
$register_url = Authentication::getRegisterUrl($setup_redirection_uri, $oauth_callback_uri);
397+
$parameters = array(
398+
'setup_redirection_uri' => $setup_redirection_uri,
399+
'oauth_callback_uri' => $oauth_callback_uri,
398400
);
399-
$this->_requestMock
400-
->expects($this->once())
401-
->method('exec')
402-
->will($this->returnValue(json_encode($response)));
403-
404-
$this->_requestMock
405-
->expects($this->any())
406-
->method('getinfo')
407-
->will($this->returnCallback(function ($option) {
408-
switch ($option) {
409-
case CURLINFO_HTTP_CODE:
410-
return 200;
411-
}
412-
return null;
413-
}));
414-
415-
$authentication = Authentication::getRegisterUrl($setup_redirection_uri, $oauth_callback_uri);
416-
$this->assertEquals(200, $authentication['httpStatus']);
417-
$this->assertEquals($response, $authentication['httpResponse']);
401+
$expect = Core\APIRoutes::$SERVICE_BASE_URL . Core\APIRoutes::PLUGIN_SETUP_SERVICE . '?' . http_build_query($parameters);
402+
$this->assertEquals($expect, $register_url);
418403
}
419404
}

0 commit comments

Comments
 (0)