Extends users/token GET endpoint to support any auth mechanism for retrieving the token

doc/release-notes/10914-users-token-api-credentials.md

@@ -0,0 +1,3 @@
+Extended the users/token GET endpoint to support any auth mechanism for retrieving the token information.
+
+Previously, this endpoint only accepted an API token to retrieve its information. Now, it accepts any authentication mechanism and returns the associated API token information.

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")

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());