From a675271ad71b7713d1b33bdba3c51b2b04813229 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 15 Nov 2015 12:50:33 -0500
Subject: Rewrite of session management

---
 app/Auth/Database.php     | 2 +-
 app/Auth/Github.php       | 2 +-
 app/Auth/Gitlab.php       | 2 +-
 app/Auth/Google.php       | 2 +-
 app/Auth/Ldap.php         | 2 +-
 app/Auth/RememberMe.php   | 4 ++--
 app/Auth/ReverseProxy.php | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/Auth')

diff --git a/app/Auth/Database.php b/app/Auth/Database.php
index 91b17a5f..c2041d4d 100644
--- a/app/Auth/Database.php
+++ b/app/Auth/Database.php
@@ -39,7 +39,7 @@ class Database extends Base
                     ->findOne();
 
         if (is_array($user) && password_verify($password, $user['password'])) {
-            $this->userSession->refresh($user);
+            $this->userSession->initialize($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
             return true;
         }
diff --git a/app/Auth/Github.php b/app/Auth/Github.php
index b89dc5b8..4777152a 100644
--- a/app/Auth/Github.php
+++ b/app/Auth/Github.php
@@ -39,7 +39,7 @@ class Github extends Base
         $user = $this->user->getByGithubId($github_id);
 
         if (! empty($user)) {
-            $this->userSession->refresh($user);
+            $this->userSession->initialize($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
             return true;
         }
diff --git a/app/Auth/Gitlab.php b/app/Auth/Gitlab.php
index a59bc1fa..698b59c3 100644
--- a/app/Auth/Gitlab.php
+++ b/app/Auth/Gitlab.php
@@ -39,7 +39,7 @@ class Gitlab extends Base
         $user = $this->user->getByGitlabId($gitlab_id);
 
         if (! empty($user)) {
-            $this->userSession->refresh($user);
+            $this->userSession->initialize($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
             return true;
         }
diff --git a/app/Auth/Google.php b/app/Auth/Google.php
index 32bcb4b1..6c1bc3cd 100644
--- a/app/Auth/Google.php
+++ b/app/Auth/Google.php
@@ -40,7 +40,7 @@ class Google extends Base
         $user = $this->user->getByGoogleId($google_id);
 
         if (! empty($user)) {
-            $this->userSession->refresh($user);
+            $this->userSession->initialize($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
             return true;
         }
diff --git a/app/Auth/Ldap.php b/app/Auth/Ldap.php
index c252be17..3d361aa7 100644
--- a/app/Auth/Ldap.php
+++ b/app/Auth/Ldap.php
@@ -237,7 +237,7 @@ class Ldap extends Base
             }
 
             // We open the session
-            $this->userSession->refresh($user);
+            $this->userSession->initialize($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
 
             return true;
diff --git a/app/Auth/RememberMe.php b/app/Auth/RememberMe.php
index fd8ed8bb..0a567cbe 100644
--- a/app/Auth/RememberMe.php
+++ b/app/Auth/RememberMe.php
@@ -101,10 +101,10 @@ class RememberMe extends Base
                 );
 
                 // Create the session
-                $this->userSession->refresh($this->user->getById($record['user_id']));
+                $this->userSession->initialize($this->user->getById($record['user_id']));
 
                 // Do not ask 2FA for remember me session
-                $this->session['2fa_validated'] = true;
+                $this->sessionStorage->postAuth['validated'] = true;
 
                 $this->container['dispatcher']->dispatch(
                     'auth.success',
diff --git a/app/Auth/ReverseProxy.php b/app/Auth/ReverseProxy.php
index 1910ad35..d119ca98 100644
--- a/app/Auth/ReverseProxy.php
+++ b/app/Auth/ReverseProxy.php
@@ -48,7 +48,7 @@ class ReverseProxy extends Base
                 $user = $this->user->getByUsername($login);
             }
 
-            $this->userSession->refresh($user);
+            $this->userSession->initialize($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
 
             return true;
-- 
cgit v1.2.3