esoko/rvr-nextgen
esoko/rvr-nextgen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

feature/upgrade-soko-web #21

Merged
bence merged 2 commits from feature/upgrade-soko-web into master 2023-04-16 16:05:52 +02:00
Conversation 0 Commits 2 Files Changed 4 +4 -5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c6d33753c8 - Show all commits

8
src/Controller/OAuthController.php
View File

@ -80,16 +80,14 @@ class OAuthController
public function getUserInfo() : IContent public function getUserInfo() : IContent
{ {
//TODO: headers should be set by soko-web $authorization = $this->request->header('Authorization');
$headers = getallheaders(); if ($authorization === null) {
if (!isset($headers['Authorization'])) {
return new JsonContent([ return new JsonContent([
'error' => 'No Authorization header was sent.' 'error' => 'No Authorization header was sent.'
]); ]);
} }
$accessToken = substr($headers['Authorization'], strlen('Bearer ')); $accessToken = substr($authorization, strlen('Bearer '));
$token = $this->oAuthTokenRepository->getByAccessToken($accessToken); $token = $this->oAuthTokenRepository->getByAccessToken($accessToken);
if ($token === null || $token->getExpiresDate() < new DateTime()) { if ($token === null || $token->getExpiresDate() < new DateTime()) {

1
web.php
View File

@ -86,6 +86,7 @@ Container::$request = new SokoWeb\Request\Request(
$_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'], $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'],
$_GET, $_GET,
$_POST, $_POST,
getallheaders(),
$_SESSION, $_SESSION,
new RVR\Repository\UserRepository() new RVR\Repository\UserRepository()
); );