Skip to content

JCL-337: Serialize expiration date as an ISO 8601 string #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timea-solid merged 3 commits into from
May 8, 2023
Merged

JCL-337: Serialize expiration date as an ISO 8601 string #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc0ec90
JCL-337: Serialize expiration date as an ISO 8601 string
acoburn May 5, 2023
55edf7e
Use correct identifier for access grant revocation
acoburn May 5, 2023
abe7aa8
fixed status access grant intergration tests
timea-solid May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
import java.util.concurrent.CompletionStage;
import java.util.stream.Collectors;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* A client for interacting with and managing Access Grant Resources.
*
Expand All @@ -77,6 +80,8 @@
*/
public class AccessGrantClient {

private static final Logger LOGGER = LoggerFactory.getLogger(AccessGrantClient.class);

private static final String CONTEXT = "@context";
private static final String VC_CONTEXT_URI = "https://www.w3.org/2018/credentials/v1";
private static final String INRUPT_CONTEXT_URI = "https://schema.inrupt.com/credentials/v1.jsonld";
Expand Down Expand Up @@ -293,7 +298,7 @@ public CompletionStage<Void> revoke(final AccessGrant accessGrant) {
credentialStatus.put("status", Integer.toString(status.getIndex()));

final Map<String, Object> data = new HashMap<>();
data.put("credentialId", status.getIdentifier());
data.put("credentialId", accessGrant.getIdentifier());
data.put("credentialStatus", Arrays.asList(credentialStatus));

final Request req = Request.newBuilder(metadata.statusEndpoint)
Expand Down Expand Up @@ -530,7 +535,7 @@ static Map<String, Object> buildAccessGrantv1(final URI agent, final Set<URI> re

final Map<String, Object> credential = new HashMap<>();
credential.put(CONTEXT, Arrays.asList(VC_CONTEXT_URI, INRUPT_CONTEXT_URI));
credential.put("expirationDate", expiration);
credential.put("expirationDate", expiration.toString());
credential.put(CREDENTIAL_SUBJECT, subject);

final Map<String, Object> data = new HashMap<>();
Expand All @@ -554,7 +559,7 @@ static Map<String, Object> buildAccessRequestv1(final URI agent, final Set<URI>

final Map<String, Object> credential = new HashMap<>();
credential.put(CONTEXT, Arrays.asList(VC_CONTEXT_URI, INRUPT_CONTEXT_URI));
credential.put("expirationDate", expiration);
credential.put("expirationDate", expiration.toString());
credential.put(CREDENTIAL_SUBJECT, subject);

final Map<String, Object> data = new HashMap<>();
Expand Down
6 changes: 4 additions & 2 deletions access-grant/src/test/java/com/inrupt/client/accessgrant/MockAccessGrantServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ private void setupMocks() {
.atPriority(1)
.withHeader("Authorization", containing("Bearer eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9."))
.withRequestBody(containing("\"providedConsent\""))
.withRequestBody(containing("\"2022-08-27"))
.willReturn(aResponse()
.withStatus(200)
.withHeader("Content-Type", "application/json")
Expand All @@ -164,6 +165,7 @@ private void setupMocks() {
.atPriority(1)
.withHeader("Authorization", containing("Bearer eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9."))
.withRequestBody(containing("\"hasConsent\""))
.withRequestBody(containing("\"2022-08-27"))
.willReturn(aResponse()
.withStatus(200)
.withHeader("Content-Type", "application/json")
Expand All @@ -178,14 +180,14 @@ private void setupMocks() {
wireMockServer.stubFor(post(urlEqualTo("/status"))
.atPriority(1)
.withHeader("Authorization", containing("Bearer eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9."))
.withRequestBody(containing("\"https://accessgrant.example/status/CVAM#2832\""))
.withRequestBody(containing("\"" + wireMockServer.baseUrl() + "/access-grant-1\""))
.willReturn(aResponse()
.withStatus(204)));

wireMockServer.stubFor(post(urlEqualTo("/status"))
.atPriority(1)
.withHeader("Authorization", containing("Bearer eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9."))
.withRequestBody(containing("\"https://accessgrant.example/status/CVAM#2833\""))
.withRequestBody(containing("\"" + wireMockServer.baseUrl() + "/access-grant-2\""))
.willReturn(aResponse()
.withStatus(403)));

Expand Down
7 changes: 5 additions & 2 deletions integration/base/src/main/java/com/inrupt/client/integration/base/MockAccessGrantServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import static java.nio.charset.StandardCharsets.UTF_8;

import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.common.ConsoleNotifier;
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;

import java.io.IOException;
Expand All @@ -42,7 +43,9 @@ class MockAccessGrantServer {
public MockAccessGrantServer(final String webId, final String sharedFile) {
this.webId = webId;
this.sharedFile = sharedFile;
wireMockServer = new WireMockServer(WireMockConfiguration.options().dynamicPort());
wireMockServer = new WireMockServer(WireMockConfiguration.options()
.notifier(new ConsoleNotifier(true))
.dynamicPort());
}

private void setupMocks() {
Expand Down Expand Up @@ -71,7 +74,7 @@ private void setupMocks() {
this.webId, this.sharedFile))));

wireMockServer.stubFor(post(urlEqualTo("/status"))
.withRequestBody(containing("\"https://accessgrant.example/status/CVAM#2832\""))
.withRequestBody(containing("\"RevocationList2020Status\""))
.willReturn(aResponse()
.withStatus(Utils.NO_CONTENT)));

Expand Down