Say tokens are "expired" in /app/v4 when they are

1 files changed, 4 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 577cc737691..411d6c48686 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -978,7 +978,10 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
                 fingerprintObject.setString("created", tokenVersion.creationTime().toString());
                 fingerprintObject.setString("author", tokenVersion.author());
                 fingerprintObject.setString("expiration", tokenVersion.expiration().map(Instant::toString).orElse("none"));
-                fingerprintObject.setString("state", valueOf(states.get(tokenVersion.fingerPrint())));
+                String tokenState = tokenVersion.expiration().map(controller.clock().instant()::isAfter).orElse(false)
+                                    ? "expired"
+                                    : valueOf(states.get(tokenVersion.fingerPrint()));
+                fingerprintObject.setString("state", tokenState);
             }
             states.forEach((print, state) -> {
                 if (state != State.REVOKING) return;