Skip to content

Commit

Permalink
Merge pull request #10131 from jp-tosca/9466-authentication-annotatio…
Browse files Browse the repository at this point in the history
…n-change

Remove the authentication annotation from info API
  • Loading branch information
pdurbin committed Nov 28, 2023
2 parents 410eb45 + 8e69c6d commit 1ea692b
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions src/main/java/edu/harvard/iq/dataverse/api/Info.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package edu.harvard.iq.dataverse.api;

import edu.harvard.iq.dataverse.api.auth.AuthRequired;
import edu.harvard.iq.dataverse.settings.JvmSettings;
import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
import edu.harvard.iq.dataverse.util.SystemConfig;
Expand All @@ -9,8 +8,6 @@
import jakarta.json.JsonValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.Response;

@Path("info")
Expand All @@ -35,30 +32,27 @@ public Response getMaxEmbargoDurationInMonths() {
}

@GET
@AuthRequired
@Path("version")
public Response getInfo(@Context ContainerRequestContext crc) {
public Response getInfo() {
String versionStr = systemConfig.getVersion(true);
String[] comps = versionStr.split("build",2);
String version = comps[0].trim();
JsonValue build = comps.length > 1 ? Json.createArrayBuilder().add(comps[1].trim()).build().get(0) : JsonValue.NULL;

return response( req -> ok( Json.createObjectBuilder().add("version", version)
.add("build", build)), getRequestUser(crc));
return ok(Json.createObjectBuilder()
.add("version", version)
.add("build", build));
}

@GET
@AuthRequired
@Path("server")
public Response getServer(@Context ContainerRequestContext crc) {
return response( req -> ok(JvmSettings.FQDN.lookup()), getRequestUser(crc));
public Response getServer() {
return ok(JvmSettings.FQDN.lookup());
}

@GET
@AuthRequired
@Path("apiTermsOfUse")
public Response getTermsOfUse(@Context ContainerRequestContext crc) {
return response( req -> ok(systemConfig.getApiTermsOfUse()), getRequestUser(crc));
public Response getTermsOfUse() {
return ok(systemConfig.getApiTermsOfUse());
}

@GET
Expand Down

0 comments on commit 1ea692b

Please sign in to comment.