Closes #762 and #763 - Last login time of an user added

components/inspectit-ocelot-configurationserver-ui/src/components/views/settings/userlist/UserDataTable.js

@@ -6,6 +6,7 @@ import { Column } from 'primereact/column';
 import { Button } from 'primereact/button';
 import { settingsActions } from '../../../../redux/ducks/settings';
 import DeleteDialog from '../dialogs/DeleteDialog';
+import dateformat from 'dateformat';
 
 /**
  * Fetches and lists all users.
@@ -30,6 +31,11 @@ class UserDataTable extends React.Component {
         <DataTable value={users} globalFilter={filterValue} scrollable={true} scrollHeight={maxHeight}>
           <Column field="id" header="ID" />
           <Column field="username" header="Username" />
+          <Column
+            field="lastLoginTime"
+            header="Last Login Time"
+            body={(user) => (user.lastLoginTime === 0 ? '-' : dateformat(user.lastLoginTime, 'yyyy-mm-dd HH:MM:ss'))}
+          />
           <Column field="ldapUser" header="LDAP User" body={(data) => <i className={data.ldapUser ? 'pi pi-check' : 'pi pi-times'}></i>} />
           <Column
             style={{ width: '3.5rem' }}

components/inspectit-ocelot-configurationserver/src/main/java/rocks/inspectit/ocelot/rest/users/AccountController.java

@@ -27,6 +27,7 @@
 import rocks.inspectit.ocelot.user.UserPermissions;
 import rocks.inspectit.ocelot.user.UserService;
 
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -58,8 +59,15 @@ public class AccountController extends AbstractBaseController {
     @ApiResponse(code = 200, message = "The access token", examples =
     @Example(value = @ExampleProperty(value = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTU2MTYyODE1NH0.KelDW1OXg9xlMjSiblwZqui7sya4Crq833b-98p8UZ4", mediaType = "text/plain")))
     @GetMapping("account/token")
-    public String acuireNewAccessToken(Authentication user) {
-        return tokenManager.createToken(user.getName());
+    public String acquireNewAccessToken(Authentication auth) {
+        Optional<User> userOptional = userService.getUserByName(auth.getName());
+
+        if (userOptional.isPresent()) {
+            User user = userOptional.get();
+            user.setLastLoginTime(System.currentTimeMillis());
+            userService.addOrUpdateUser(user);
+        }
+        return tokenManager.createToken(auth.getName());
     }
 
     @ApiOperation(value = "Change Password", notes = "Changes the password of the logged in user." +

components/inspectit-ocelot-configurationserver/src/main/java/rocks/inspectit/ocelot/user/User.java

@@ -56,6 +56,12 @@ public class User implements Auditable {
     @Column(nullable = false)
     private boolean isLdapUser;
 
+    /**
+     * Indicates the time when the user last logged in.
+     */
+    @Column
+    private long lastLoginTime;
+
     @Override
     @JsonIgnore
     public AuditDetail getAuditDetail() {

components/inspectit-ocelot-configurationserver/src/main/resources/db/migration/V2__added_user_login_time.sql

@@ -0,0 +1,2 @@
+ALTER TABLE user
+ADD last_login_time BIGINT;

components/inspectit-ocelot-configurationserver/src/test/java/rocks/inspectit/ocelot/rest/users/AccountControllerIntTest.java

@@ -119,4 +119,35 @@ void testAdminPermissions() {
                             .build());
         }
     }
+
+    @Nested
+    class AcquireNewAccessToken {
+
+        @Test
+        void acquireToken() {
+            long now = System.currentTimeMillis();
+
+            userService.addOrUpdateUser(User.builder()
+                    .username("John")
+                    .password("doe")
+                    .build());
+
+            long loginTimeBefore = userService
+                    .getUserByName("John").get()
+                    .getLastLoginTime();
+            assertThat(loginTimeBefore).isZero();
+
+            ResponseEntity<String> result = rest
+                    .withBasicAuth("John", "doe")
+                    .getForEntity("/api/v1/account/token", String.class);
+
+            assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+            long loginTimeAfter = userService
+                    .getUserByName("John").get()
+                    .getLastLoginTime();
+            assertThat(loginTimeAfter).isGreaterThanOrEqualTo(now);
+        }
+
+    }
 }