Skip to content

JCL-342: Use correct data subject property for access requests #446

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 2 commits into from
May 9, 2023
Merged

JCL-342: Use correct data subject property for access requests #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f316dc
JCL-342: Use correct data subject property for access requests
acoburn May 8, 2023
94cd785
Merge branch 'main' into JCL-342-access-request-agent
timea-solid May 9, 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
7 changes: 6 additions & 1 deletion access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ protected AccessGrant(final String grant) throws IOException {
final Optional<URI> person = asUri(consent.get("isProvidedToPerson"));
final Optional<URI> controller = asUri(consent.get("isProvidedToController"));
final Optional<URI> other = asUri(consent.get("isProvidedTo"));
this.grantee = person.orElseGet(() -> controller.orElseGet(() -> other.orElse(null)));
final Optional<URI> dataSubject = asUri(consent.get("isConsentForDataSubject"));
if (subject.containsKey("hasConsent")) {
this.grantee = dataSubject.orElse(null);
} else {
this.grantee = person.orElseGet(() -> controller.orElseGet(() -> other.orElse(null)));
}
this.modes = asSet(consent.get("mode")).orElseGet(Collections::emptySet);
this.resources = asSet(consent.get("forPersonalData")).orElseGet(Collections::emptySet)
.stream().map(URI::create).collect(Collectors.toSet());
Expand Down
18 changes: 14 additions & 4 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 @@ -175,6 +175,9 @@ public AccessGrantClient session(final Session session) {
*/
public CompletionStage<AccessGrant> issue(final URI type, final URI agent, final Set<URI> resources,
final Set<String> modes, final Set<String> purposes, final Instant expiration) {
Objects.requireNonNull(type, "Access Grant type may not be null!");
Objects.requireNonNull(resources, "Resources may not be null!");
Objects.requireNonNull(modes, "Access modes may not be null!");
return v1Metadata().thenCompose(metadata -> {
final Map<String, Object> data;
if (ACCESS_GRANT.equals(type)) {
Expand Down Expand Up @@ -522,6 +525,7 @@ static URI asUri(final Object value) {

static Map<String, Object> buildAccessGrantv1(final URI agent, final Set<URI> resources, final Set<String> modes,
final Instant expiration, final Set<String> purposes) {
Objects.requireNonNull(agent, "Access grant agent may not be null!");
final Map<String, Object> consent = new HashMap<>();
consent.put(MODE, modes);
consent.put(HAS_STATUS, "https://w3id.org/GConsent#ConsentStatusExplicitlyGiven");
Expand All @@ -536,7 +540,9 @@ 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.truncatedTo(ChronoUnit.SECONDS).toString());
if (expiration != null) {
credential.put("expirationDate", expiration.truncatedTo(ChronoUnit.SECONDS).toString());
}
credential.put(CREDENTIAL_SUBJECT, subject);

final Map<String, Object> data = new HashMap<>();
Expand All @@ -547,10 +553,12 @@ static Map<String, Object> buildAccessGrantv1(final URI agent, final Set<URI> re
static Map<String, Object> buildAccessRequestv1(final URI agent, final Set<URI> resources, final Set<String> modes,
final Instant expiration, final Set<String> purposes) {
final Map<String, Object> consent = new HashMap<>();
consent.put(MODE, modes);
consent.put(HAS_STATUS, "https://w3id.org/GConsent#ConsentStatusRequested");
consent.put(MODE, modes);
consent.put(FOR_PERSONAL_DATA, resources);
consent.put(IS_PROVIDED_TO_PERSON, agent);
if (agent != null) {
consent.put("isConsentForDataSubject", agent);
}
if (!purposes.isEmpty()) {
consent.put("forPurpose", purposes);
}
Expand All @@ -560,7 +568,9 @@ 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.truncatedTo(ChronoUnit.SECONDS).toString());
if (expiration != null) {
credential.put("expirationDate", expiration.truncatedTo(ChronoUnit.SECONDS).toString());
}
credential.put(CREDENTIAL_SUBJECT, subject);

final Map<String, Object> data = new HashMap<>();
Expand Down
2 changes: 1 addition & 1 deletion access-grant/src/test/resources/vc-5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"hasConsent":{
"mode":["Read","Append"],
"hasStatus":"https://w3id.org/GConsent#ConsentStatusRequested",
"isProvidedToPerson":"https://id.test/agent",
"isConsentForDataSubject":"https://id.test/agent",
"forPurpose":["https://purpose.test/Purpose1"],
"forPersonalData":["https://storage.test/data/"]}},
"proof":{
Expand Down