Skip to content

Commit bca8bd0

Browse files
A few bug fixes
FIXED: regeneration of access token was failing because the API call made was incorrect FIXED: since namespace was given OauthException class was unable to find \Exception FIXED: user was unable to continue session after a few hours FIXED: code bug wher undefined $redirect variable was being used.
1 parent 4989987 commit bca8bd0

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/implementation/DefaultOauthStrategy.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ public function regenerateToken(string $refreshToken) : OauthToken{
4646
->formParam("refresh_token",$refreshToken)
4747
->formParam("client_id",$this->details->clientId)
4848
->formParam("client_secret",$this->details->clientSecret)
49-
->formParam("redirect_uri",$this->details->redirectUri)
50-
->formParam("grant_type","authorization_code")
49+
->formParam("grant_type","refresh_token")
5150
->getResponse();
5251

5352
$token = $this->helper->readToken($response->getBody());

src/oauth/OauthException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
namespace encryptorcode\authentication\oauth;
33

4-
class OauthException extends Exception{
4+
class OauthException extends \Exception{
55

66
}

src/server/AuthRequest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static function authenticate(AuthenticationHelper $helper) : void{
5858
// fetching new access token if the token is expired
5959
if(self::isTimePassed($token->getExpiryTime())){
6060
$strategy = $strategyLoader->get($session->getOauthStrategy());
61-
$token = $strategy->regenerateToken($token->getRefreshToken());
61+
$newToken = $strategy->regenerateToken($token->getRefreshToken());
6262
$newToken->setRefreshToken($token->getRefreshToken());
6363
$sessionStorage->updateSessionToken($sessionIdentifier,$newToken);
6464
}

src/service/AuthenticationService.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
use encryptorcode\server\request\Request as Request;
55
use encryptorcode\server\response\RedirectResponse as RedirectResponse;
66
use encryptorcode\authentication\server\AuthRequest as AuthRequest;
7+
use encryptorcode\authentication\oauth\OauthException as OauthException;
78

89
define("AUTH_USER_KEY","encryptorcode.authentication.user");
910
define("AUTH_SESSION_KEY","encryptorcode.authentication.session");
@@ -45,7 +46,7 @@ public function loginPage() : void{
4546
$strategyName = Request::param("strategy");
4647
if(isset($strategyName)){
4748
$strategy = $this->strategyLoader->get($strategyName);
48-
$_SESSION[SESSION_REDIRECT_KEY] = $redirect;
49+
$_SESSION[SESSION_REDIRECT_KEY] = Request::param("redirect");
4950
$this->doRedirection($strategy->getLoginUrl($strategyName));
5051
return;
5152
}

0 commit comments

Comments
 (0)