feat: improve last login data (#5745)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: Zaimwa9

api/app/settings/common.py

@@ -1239,7 +1239,8 @@
 
 # Define the cooldown duration, in seconds, for password reset emails
 PASSWORD_RESET_EMAIL_COOLDOWN = env.int("PASSWORD_RESET_EMAIL_COOLDOWN", 60 * 60 * 24)
-
+# Define the threshold, in minutes, for updating the last login timestamp
+LAST_LOGIN_UPDATE_THRESHOLD_MINUTES = env.int("LAST_LOGIN_UPDATE_THRESHOLD_MINUTES", 30)
 # Limit the count of password reset emails that can be dispatched within the `PASSWORD_RESET_EMAIL_COOLDOWN` timeframe.
 MAX_PASSWORD_RESET_EMAILS = env.int("MAX_PASSWORD_RESET_EMAILS", 5)
 

api/custom_auth/views.py

@@ -1,8 +1,10 @@
 import json
+from datetime import timedelta
 from typing import Any
 
 from django.conf import settings
 from django.contrib.auth import user_logged_out
+from django.utils import timezone
 from django.utils.decorators import method_decorator
 from djoser.views import TokenCreateView, UserViewSet  # type: ignore[import-untyped]
 from drf_yasg.utils import swagger_auto_schema  # type: ignore[import-untyped]
@@ -142,6 +144,17 @@ def perform_destroy(self, instance):  # type: ignore[no-untyped-def]
             )
         )
 
+    def retrieve(self, request: Request, *args: Any, **kwargs: Any) -> Response:
+        user = request.user
+        assert isinstance(user, FFAdminUser)
+        if not user.last_login or timezone.now() - user.last_login > timedelta(
+            minutes=settings.LAST_LOGIN_UPDATE_THRESHOLD_MINUTES
+        ):
+            user.last_login = timezone.now()
+            user.save(update_fields=["last_login"])
+        resp: Response = super().retrieve(request, *args, **kwargs)
+        return resp
+
     @action(
         detail=False,
         methods=["patch"],

api/tests/unit/users/test_unit_users_views.py

@@ -1,5 +1,6 @@
 import json
 import typing
+from datetime import datetime
 
 import pytest
 from dateutil.relativedelta import relativedelta
@@ -12,6 +13,7 @@
 from django.utils import timezone
 from djoser import utils  # type: ignore[import-untyped]
 from djoser.email import PasswordResetEmail  # type: ignore[import-untyped]
+from freezegun import freeze_time
 from pytest_django import DjangoAssertNumQueries
 from rest_framework import status
 from rest_framework.test import APIClient
@@ -921,3 +923,44 @@ def test_list_user_groups(
         (user1.pk, False),
         (user2.pk, True),
     }
+
+
+@freeze_time("2024-01-01T10:00:00Z")
+@pytest.mark.parametrize(
+    "last_login,expected_last_login",
+    [
+        (None, datetime.fromisoformat("2024-01-01T10:00:00Z")),
+        (
+            datetime.fromisoformat("2023-01-01T10:00:00Z"),
+            datetime.fromisoformat("2024-01-01T10:00:00Z"),
+        ),
+        (
+            datetime.fromisoformat("2024-01-01T09:59:00Z"),
+            datetime.fromisoformat("2024-01-01T09:59:00Z"),
+        ),
+    ],
+)
+def test_get_me_view_updates_last_login(
+    api_client: APIClient,
+    test_user: FFAdminUser,
+    last_login: datetime | None,
+    expected_last_login: datetime,
+) -> None:
+    # Given
+    test_user.last_login = last_login
+    test_user.save(update_fields=["last_login"])
+    test_user.refresh_from_db()
+
+    api_client.force_authenticate(test_user)
+    assert test_user.last_login is None or test_user.last_login < timezone.now()
+
+    url = reverse("api-v1:custom_auth:ffadminuser-me")
+
+    # When
+    response = api_client.get(url)
+
+    # Then
+    assert response.status_code == status.HTTP_200_OK
+    test_user.refresh_from_db()
+
+    assert test_user.last_login == expected_last_login

frontend/common/types/responses.ts

@@ -256,6 +256,8 @@ export type User = {
   last_login: string
   uuid: string
   onboarding: Onboarding
+  // TODO: Use enum
+  role: string
 }
 export type GroupUser = Omit<User, 'role'> & {
   group_admin: boolean

frontend/web/components/PermissionRow.tsx

@@ -8,7 +8,7 @@ import {
   RolePermission,
   UserPermissions,
 } from 'common/types/responses'
-import DerivedPermissionsList from './derived-permissions/DerivedPermissionsList'
+import DerivedPermissionsList from './users-permissions/derived-permissions/DerivedPermissionsList'
 import PermissionControl from './PermissionControl'
 import { PermissionRoleType } from 'common/types/requests'
 

frontend/web/components/inspect-permissions/Permissions.tsx

@@ -8,7 +8,7 @@ import Format from 'common/utils/format'
 import { PermissionRow } from 'components/PermissionRow'
 import { useGetAvailablePermissionsQuery } from 'common/services/useAvailablePermissions'
 
-import DerivedPermissionsList from 'components/derived-permissions/DerivedPermissionsList'
+import DerivedPermissionsList from 'components/users-permissions/derived-permissions/DerivedPermissionsList'
 import BooleanDotIndicator from 'components/BooleanDotIndicator'
 
 const Permissions = ({