Changed: users/token GET endpoint to support all available auth mecha…

…nisms
IQSS · Oct 14, 2024 · cce22a2 · cce22a2
1 parent c44ad65
commit cce22a2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Users.java b/src/main/java/edu/harvard/iq/dataverse/api/Users.java
@@ -137,15 +137,20 @@ public Response deleteToken(@Context ContainerRequestContext crc) {
     @Path("token")
     @AuthRequired
     @GET
-    public Response getTokenExpirationDate() {
-        ApiToken token = authSvc.findApiToken(getRequestApiKey());
-
-        if (token == null) {
-            return notFound("Token " + getRequestApiKey() + " not found.");
+    public Response getTokenExpirationDate(@Context ContainerRequestContext crc) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            ApiToken token = authSvc.findApiTokenByUser(user);
+
+            if (token == null) {
+                return notFound("Token not found.");
+            }
+
+            return ok(String.format("Token %s expires on %s", token.getTokenString(), token.getExpireTime()));
+
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
         }
-
-        return ok("Token " + getRequestApiKey() + " expires on " + token.getExpireTime());
-
     }
 
     @Path("token/recreate")

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UsersIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UsersIT.java
@@ -405,7 +405,6 @@ public void testAPITokenEndpoints() {
         */
 
         createUser = UtilIT.createRandomUser();
-        String username = UtilIT.getUsernameFromResponse(createUser);
         String apiToken = UtilIT.getApiTokenFromResponse(createUser);
         Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
         createDataverseResponse.prettyPrint();
@@ -428,7 +427,7 @@ public void testAPITokenEndpoints() {
         getExpiration = UtilIT.getTokenExpiration(tokenForPrivateUrlUser);
         getExpiration.prettyPrint();
         getExpiration.then().assertThat()
-                .statusCode(NOT_FOUND.getStatusCode());
+                .statusCode(UNAUTHORIZED.getStatusCode());
 
         createUser = UtilIT.createRandomUser();
         assertEquals(OK.getStatusCode(), createUser.getStatusCode());