From acaaf1c749eaeffeb3e7753d8bb817d5f5a3a967 Mon Sep 17 00:00:00 2001
From: Maxime Besson <maxime.besson@worteks.com>
Date: Fri, 8 Jan 2021 16:56:52 +0100
Subject: [PATCH] Refactor buildUserInfo (#2419)

---
 .../lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm
index a4ea0158e..a1b840cd6 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/OpenIDConnect.pm
@@ -1402,10 +1402,21 @@ sub buildUserInfoResponseFromId {
 # @return hashref UserInfo data
 sub buildUserInfoResponse {
     my ( $self, $req, $scope, $rp, $session ) = @_;
+    return $self->buildUserInfoResponseFromData( $req, $scope, $rp,
+        $session->data );
+}
+
+# Return Hash of UserInfo data
+# @param scope OIDC scope
+# @param rp Internal Relying Party identifier
+# @param sessionInfo hash of session data
+# @return hashref UserInfo data
+sub buildUserInfoResponseFromData {
+    my ( $self, $req, $scope, $rp, $session_data ) = @_;
     my $userinfo_response = {};
 
     my $data = {
-        %{ $session->data },
+        %{ $session_data },
         _clientId => $self->oidcRPList->{$rp}->{oidcRPMetaDataOptionsClientID},
         _clientConfKey => $rp,
         _scope         => $scope,