Merge pull request #489 from nextcloud/backport/409/stable16

nickvergessen · web-flow · commit 0909588fa8e2 · 2019-11-24T23:23:30.000+01:00
[stable16] The token id is an int
diff --git a/lib/Controller/PushController.php b/lib/Controller/PushController.php
@@ -154,7 +154,7 @@ public function removeDevice(): DataResponse {
 			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
 		}
 
-		$tokenId = $this->session->get('token-id');
+		$tokenId = (int)$this->session->get('token-id');
 		try {
 			$token = $this->tokenProvider->getTokenById($tokenId);
 		} catch (InvalidTokenException $e) {

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function removeDevice(): DataResponse {`
`154`	`154`	`return new DataResponse([], Http::STATUS_UNAUTHORIZED);`
`155`	`155`	`}`
`156`	`156`
`157`		`- $tokenId = $this->session->get('token-id');`
	`157`	`+ $tokenId = (int)$this->session->get('token-id');`
`158`	`158`	`try {`
`159`	`159`	`$token = $this->tokenProvider->getTokenById($tokenId);`
`160`	`160`	`} catch (InvalidTokenException $e) {`