Add indicators for unique login expiration status (#19084)

Author: di

tests/unit/test_filters.py

@@ -24,6 +24,12 @@ def test_now():
     assert now() <= datetime.datetime.now()
 
 
+def test_now_with_timezone():
+    assert isinstance(now(tz=True), datetime.datetime)
+    assert now(tz=True).tzinfo is not None
+    assert now(tz=True) < datetime.datetime.now(datetime.UTC)
+
+
 def test_camo_url():
     request = pretend.stub(
         registry=pretend.stub(

warehouse/admin/templates/admin/users/detail.html

@@ -1002,6 +1002,7 @@ <h3 class="card-title">Unique logins</h3>
                   <th scope="col">Created</th>
                   <th scope="col">IP address</th>
                   <th scope="col">Status</th>
+                  <th scope="col">Expired?</th>
                   <th scope="col">Device Information</th>
                 </tr>
               </thead>
@@ -1011,6 +1012,17 @@ <h3 class="card-title">Unique logins</h3>
                   <td>{{ login.created }}</td>
                   <td><a href="{{ request.route_path('admin.ip_address.detail', ip_address=login.ip_address ) }}">{{ login.ip_address }}</a></td>
                   <td>{{ login.status.value }}</td>
+                  <td>
+                    {% if login.status.value == 'pending' %}
+                      {% if login.expires < now(tz=True) %}
+                      <span title="Expired: {{ login.expires|format_datetime }}">🔴</span>
+                      {% else %}
+                      <span title="Expires: {{ login.expires|format_datetime }}">🟠</span>
+                      {% endif %}
+                    {% elif login.status.value == 'confirmed' %}
+                    <span title="Confirmed">🟢</span>
+                    {% endif %}
+                  </td>
                   <td>{{ login.device_information }}</td>
                 </tr>
                 {% endfor %}

warehouse/utils/__init__.py

@@ -3,9 +3,10 @@
 import datetime
 
 
-def now() -> datetime.datetime:
-    """Return the current datetime in UTC without a timezone."""
-    return datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
+def now(tz=False) -> datetime.datetime:
+    """Return the current datetime in UTC with or without a timezone."""
+    now = datetime.datetime.now(datetime.UTC)
+    return now if tz else now.replace(tzinfo=None)
 
 
 def dotted_navigator(path):