From 37756c3be25c4b0e270dbcf259bfee0430ef1b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Sun, 21 Jul 2013 18:53:02 +0000
Subject: [PATCH] Store BrowserID verification answer in session (#584)

---
 .../lib/Lemonldap/NG/Manager/Sessions.pm               | 10 +++++-----
 .../lib/Lemonldap/NG/Portal/AuthBrowserID.pm           |  8 +++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm
index dadc730b6..7b8e5b03b 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm
@@ -212,8 +212,7 @@ sub doubleIp {
             $res .= "<li class=\"open\" id=\"di$ip\"><span>$ip</span><ul>";
 
             # For each IP node, store sessions sorted by start time
-            foreach
-              my $session ( sort { $a->{startTime} <=> $b->{startTime} }
+            foreach my $session ( sort { $a->{startTime} <=> $b->{startTime} }
                 @{ $byUid->{$uid}->{$ip} } )
             {
                 $res .=
@@ -473,8 +472,9 @@ sub session {
         'saml'         => [
             qw(_idp _idpConfKey _samlToken _lassoSessionDump _lassoIdentityDump)
         ],
-        'groups' => [qw(groups)],
-        'ldap'   => [qw(dn)],
+        'groups'    => [qw(groups)],
+        'ldap'      => [qw(dn)],
+        'BrowserID' => [qw(_browserIdAnswer _browserIdAnswerRaw)],
     };
 
     # Display categories
@@ -552,7 +552,7 @@ sub session {
         foreach ( keys %session ) {
             next if $_ !~ /^notification_(.+)/;
             $res .=
-                '<li><strong>'
+                '<li><strong>' 
               . $1
               . '</strong>: '
               . $session{$_} . " ("
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthBrowserID.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthBrowserID.pm
index 69107030a..a7f52ac26 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthBrowserID.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthBrowserID.pm
@@ -48,6 +48,8 @@ sub setAuthSessionInfo {
 
     $self->{sessionInfo}->{_user}               = $self->{user};
     $self->{sessionInfo}->{authenticationLevel} = $self->{browserIdAuthnLevel};
+    $self->{sessionInfo}->{_browserIdAnswer}    = $self->{browserIdAnswer};
+    $self->{sessionInfo}->{_browserIdAnswerRaw} = $self->{browserIdAnswerRaw};
 
     PE_OK;
 }
@@ -89,14 +91,14 @@ sub extractFormInfo {
         if ( $answer->code() == "200" ) {
 
             # Get JSON answser
-            my $browserIdVerificationAnswer = $answer->content;
+            $self->{browserIdAnswerRaw} = $answer->content;
             $self->lmLog(
-                "Received BrowserID answer: $browserIdVerificationAnswer",
+                "Received BrowserID answer: " . $self->{browserIdAnswerRaw},
                 'debug' );
 
             my $json = new JSON();
             $self->{browserIdAnswer} =
-              $json->decode($browserIdVerificationAnswer);
+              $json->decode( $self->{browserIdAnswerRaw} );
 
             if ( $self->{browserIdAnswer}->{status} eq "okay" ) {
                 $self->{user} = $self->{browserIdAnswer}->{email};