From 340ec43c0f6acb412950720161e62db0cf814bde Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Thu, 26 Apr 2018 17:57:58 +0300
Subject: [PATCH] Add last_login and auth_method to user table. (#1171)
---
.../pgsql/5.0/002-modify-user-columns.sql | 7 ++++++
module/VuFind/sql/mysql.sql | 2 ++
module/VuFind/sql/pgsql.sql | 2 ++
module/VuFind/src/VuFind/Auth/Manager.php | 23 +++++++++++++++++++
4 files changed, 34 insertions(+)
create mode 100644 module/VuFind/sql/migrations/pgsql/5.0/002-modify-user-columns.sql
diff --git a/module/VuFind/sql/migrations/pgsql/5.0/002-modify-user-columns.sql b/module/VuFind/sql/migrations/pgsql/5.0/002-modify-user-columns.sql
new file mode 100644
index 00000000000..da5edf58670
--- /dev/null
+++ b/module/VuFind/sql/migrations/pgsql/5.0/002-modify-user-columns.sql
@@ -0,0 +1,7 @@
+--
+-- Modifications to table `user`
+--
+
+ALTER TABLE "user"
+ ADD COLUMN last_login timestamp NOT NULL DEFAULT '1970-01-01 00:00:00',
+ ADD COLUMN auth_method varchar(50) DEFAULT NULL;
diff --git a/module/VuFind/sql/mysql.sql b/module/VuFind/sql/mysql.sql
index fcda4275e2b..56e252d06fd 100644
--- a/module/VuFind/sql/mysql.sql
+++ b/module/VuFind/sql/mysql.sql
@@ -198,6 +198,8 @@ CREATE TABLE `user` (
`home_library` varchar(100) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
`verify_hash` varchar(42) NOT NULL DEFAULT '',
+ `last_login` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+ `auth_method` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `username` (`username`),
UNIQUE KEY `cat_id` (`cat_id`)
diff --git a/module/VuFind/sql/pgsql.sql b/module/VuFind/sql/pgsql.sql
index e4e039699e0..76d41610e8d 100644
--- a/module/VuFind/sql/pgsql.sql
+++ b/module/VuFind/sql/pgsql.sql
@@ -123,6 +123,8 @@ major varchar(100) NOT NULL DEFAULT '',
home_library varchar(100) NOT NULL DEFAULT '',
created timestamp NOT NULL DEFAULT '1970-01-01 00:00:00',
verify_hash varchar(42) NOT NULL DEFAULT '',
+last_login timestamp NOT NULL DEFAULT '1970-01-01 00:00:00',
+auth_method varchar(50) DEFAULT NULL,
PRIMARY KEY (id),
UNIQUE (username),
UNIQUE (cat_id)
diff --git a/module/VuFind/src/VuFind/Auth/Manager.php b/module/VuFind/src/VuFind/Auth/Manager.php
index 4618d6da29d..73b58bc5dea 100644
--- a/module/VuFind/src/VuFind/Auth/Manager.php
+++ b/module/VuFind/src/VuFind/Auth/Manager.php
@@ -515,6 +515,7 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
public function create($request)
{
$user = $this->getAuth()->create($request);
+ $this->updateUser($user);
$this->updateSession($user);
return $user;
}
@@ -578,6 +579,9 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
throw new AuthException('authentication_error_technical');
}
+ // Update user object
+ $this->updateUser($user);
+
// Store the user in the session and send it back to the caller:
$this->updateSession($user);
return $user;
@@ -627,4 +631,23 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
{
return $this->getAuth()->validateCredentials($request);
}
+
+ /**
+ * Update common user attributes on login
+ *
+ * @param \VuFind\Db\Row\User $user User object
+ *
+ * @return void
+ */
+ protected function updateUser($user)
+ {
+ if ($this->getAuth() instanceof ChoiceAuth) {
+ $method = $this->getAuth()->getSelectedAuthOption();
+ } else {
+ $method = $this->activeAuth;
+ }
+ $user->auth_method = strtolower($method);
+ $user->last_login = date('Y-m-d H:i:s');
+ $user->save();
+ }
}
--
GitLab