dani
/
lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor newAccessToken

This commit is contained in:
Maxime Besson 2022-06-17 18:03:00 +02:00
parent 818143311c
commit 3ef3aac9c7
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
View File

@ -1389,8 +1389,7 @@ sub _handleAuthorizationCodeGrant {
# Get user identifier
my $apacheSession =
$self->p->getApacheSession( $codeSession->data->{user_session_id},
noInfo => 1 );
$self->p->getApacheSession( $codeSession->data->{user_session_id} );
unless ($apacheSession) {
$self->userLogger->error("Unable to find user session");
@ -1407,7 +1406,7 @@ sub _handleAuthorizationCodeGrant {
# Generate access_token
my $access_token = $self->newAccessToken(
$req, $rp, $scope,
$codeSession->data->{user_session_id},
$apacheSession->data,
{
grant_type => "authorizationcode",
user_session_id => $apacheSession->id,
@ -1590,7 +1589,7 @@ sub _handleRefreshTokenGrant {
$access_token = $self->newAccessToken(
$req, $rp,
$refreshSession->data->{scope},
$user_session_id,
$session->data,
{
user_session_id => $user_session_id,
grant_type => $refreshSession->data->{grant_type},

11
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm
View File

@ -864,15 +864,8 @@ sub makeJWT {
scope => $scope, # Scope
};
my $claims;
if ( ref($sessionInfo) eq "HASH" ) {
$claims = $self->buildUserInfoResponseFromData( $req, $scope,
$rp, $sessionInfo );
}
else {
$claims =
$self->buildUserInfoResponseFromId( $req, $scope, $rp, $sessionInfo );
}
my $claims =
$self->buildUserInfoResponseFromData( $req, $scope, $rp, $sessionInfo );
# Release claims, or only sub
if ( $self->conf->{oidcRPMetaDataOptions}->{$rp}