diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-02-09 10:07:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 10:07:59 +0100 |
| commit | ac841ee002b7984288a67f845d23777bcf0caa4d (patch) | |
| tree | b771628dfbbd62d2080e304bc6e8f2f08b392e9a | |
| parent | 3c4b539fdf05a47c87a8088550776cdd7bd0707d (diff) | |
| parent | 5e728d0eda85710b667b6399dbae8c2cbab8e72d (diff) | |
| download | nextcloud-server-ac841ee002b7984288a67f845d23777bcf0caa4d.tar.gz nextcloud-server-ac841ee002b7984288a67f845d23777bcf0caa4d.zip | |
Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name
oc_token should be nc_token
| -rw-r--r-- | core/Controller/LoginController.php | 2 | ||||
| -rw-r--r-- | lib/private/AppFramework/Http/Request.php | 2 | ||||
| -rw-r--r-- | tests/Core/Controller/LoginControllerTest.php | 4 | ||||
| -rw-r--r-- | tests/lib/AppFramework/Http/RequestTest.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 28cc39b9137..954a18e8778 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -98,7 +98,7 @@ class LoginController extends Controller { * @return RedirectResponse */ public function logout() { - $loginToken = $this->request->getCookie('oc_token'); + $loginToken = $this->request->getCookie('nc_token'); if (!is_null($loginToken)) { $this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken); } diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 62d7fc7ed30..404c31879d2 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -490,7 +490,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { * @return bool */ private function cookieCheckRequired() { - if($this->getCookie(session_name()) === null && $this->getCookie('oc_token') === null) { + if($this->getCookie(session_name()) === null && $this->getCookie('nc_token') === null) { return false; } diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php index a1a4452abf8..72f921724a5 100644 --- a/tests/Core/Controller/LoginControllerTest.php +++ b/tests/Core/Controller/LoginControllerTest.php @@ -89,7 +89,7 @@ class LoginControllerTest extends TestCase { $this->request ->expects($this->once()) ->method('getCookie') - ->with('oc_token') + ->with('nc_token') ->willReturn(null); $this->config ->expects($this->never()) @@ -108,7 +108,7 @@ class LoginControllerTest extends TestCase { $this->request ->expects($this->once()) ->method('getCookie') - ->with('oc_token') + ->with('nc_token') ->willReturn('MyLoginToken'); $user = $this->getMockBuilder('\\OCP\\IUser')->getMock(); $user diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php index b1515b0efb5..6c6504b4de8 100644 --- a/tests/lib/AppFramework/Http/RequestTest.php +++ b/tests/lib/AppFramework/Http/RequestTest.php @@ -1651,7 +1651,7 @@ class RequestTest extends \Test\TestCase { 'HTTP_REQUESTTOKEN' => 'AAAHGxsTCTc3BgMQESAcNR0OAR0=:MyTotalSecretShareds', ], 'cookies' => [ - 'oc_token' => 'asdf', + 'nc_token' => 'asdf', ], ], $this->secureRandom, |