Commit f6387d8f authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Added refresh token in check token response and minor fix

parent 66d0f69b

classes/IdTokenBuilder.php

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,8 @@ class IdTokenBuilder { 
        $payloadArr = array(

        $payloadArr = array(

            'iss' => $this->locator->config->jwtIssuer,

            'iss' => $this->locator->config->jwtIssuer,

            'sub' => $user->id,

            'sub' => $user->id,

            'iat' => $accessToken->creationTime,

            'iat' => intval($accessToken->creationTime),

            'exp' => $accessToken->expirationTime,

            'exp' => intval($accessToken->expirationTime),

            'name' => $user->getCompleteName(),

            'name' => $user->getCompleteName(),

            'aud' => $accessToken->clientId

            'aud' => $accessToken->clientId

        );

        );

classes/OAuth2RequestHandler.php

+5 −0
Original line number Original line Diff line number Diff line
@@ -202,12 +202,17 @@ class OAuth2RequestHandler { 
    public function handleCheckTokenRequest($token): array {

    public function handleCheckTokenRequest($token): array {





        $accessToken = $this->locator->getAccessTokenDAO()->getAccessToken($token);

        $accessToken = $this->locator->getAccessTokenDAO()->getAccessToken($token);

        if ($accessToken === null) {

            throw new UnauthorizedException("Invalid access token");

        }



        $user = $this->locator->getUserDAO()->findUserById($accessToken->userId);

        $user = $this->locator->getUserDAO()->findUserById($accessToken->userId);





        $result = [];

        $result = [];

        $result['exp'] = $accessToken->expirationTime - time();

        $result['exp'] = $accessToken->expirationTime - time();

        $result['user_name'] = $user->id;

        $result['user_name'] = $user->id;

        $result['client_id'] = $accessToken->clientId;

        $result['client_id'] = $accessToken->clientId;

        $result['refresh_token'] = $this->getNewRefreshToken($accessToken);





        if ($accessToken->scope !== null) {

        if ($accessToken->scope !== null) {

            $result['scope'] = $accessToken->scope;

            $result['scope'] = $accessToken->scope;