Merge branch 'peacekeeper-titanium-json-ld' into master

Author: peacekeeper

examples-ldp.md

@@ -40,16 +40,23 @@ Verifiable Credentials with Linked Data Proofs:
 	LinkedHashMap<String, Object> jsonLdDriversLicense = new LinkedHashMap<String, Object> ();
 	jsonLdDriversLicense.put("licenseClass", "trucks");
 	jsonLdCredentialSubject.put("driversLicense", jsonLdDriversLicense);
-	
-	URI creator = URI.create("did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1");
-	String created = "2018-01-01T21:19:10Z";
-	String domain = null;
-	String nonce = "c0ae1c8e-c7e7-469f-b252-86e6a0e7387e";
-	
-	RsaSignature2018LdSigner signer = new RsaSignature2018LdSigner(creator, created, domain, nonce, TestUtil.testRSAPrivateKey);
-	LdSignature ldSignature = signer.sign(verifiableCredential.getJsonLdObject());
-	
-	System.out.println(JsonUtils.toString(verifiableCredential.getJsonLdObject()));
+
+    byte[] testEd25519PrivateKey = Hex.decodeHex("984b589e121040156838303f107e13150be4a80fc5088ccba0b0bdc9b1d89090de8777a28f8da1a74e7a13090ed974d879bf692d001cddee16e4cc9f84b60580".toCharArray());
+
+    JsonLDObject jsonLdObject = JsonLDObject.fromJson(new FileReader("input.jsonld"));
+    String verificationMethod = "https://example.com/jdoe/keys/1";
+    String domain = "example.com";
+    String nonce = null;
+
+    Ed25519Signature2018LdSigner signer = new Ed25519Signature2018LdSigner(testEd25519PrivateKey);
+    signer.setCreated(new Date());
+    signer.setProofPurpose(LDSecurityKeywords.JSONLD_TERM_ASSERTIONMETHOD);
+    signer.setVerificationMethod(verificationMethod);
+    signer.setDomain(domain);
+    signer.setNonce(nonce);
+    LdProof ldProof = signer.sign(jsonLdObject);
+
+    System.out.println(ldProof.toJson(true));
 
 ### Example code (verifying)
 

pom.xml

@@ -123,20 +123,17 @@
 			<groupId>info.weboftrust</groupId>
 			<artifactId>ld-signatures-java</artifactId>
 			<version>0.3-SNAPSHOT</version>
-			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>nimbus-jose-jwt</artifactId>
-			<version>8.14.1</version>
-			<scope>compile</scope>
+			<version>9.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.11.1</version>
 		</dependency>
-		<!-- <dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-nop</artifactId>
-			<version>1.7.25</version>
-			<scope>compile</scope>
-		</dependency> -->
 	</dependencies>
 
 </project>

src/main/java/com/danubetech/verifiablecredentials/CredentialSubject.java

@@ -0,0 +1,101 @@
+package com.danubetech.verifiablecredentials;
+
+
+import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialContexts;
+import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialKeywords;
+import foundation.identity.jsonld.JsonLDKeywords;
+import foundation.identity.jsonld.JsonLDObject;
+import foundation.identity.jsonld.JsonLDUtils;
+import info.weboftrust.ldsignatures.LdProof;
+import info.weboftrust.ldsignatures.jsonld.LDSecurityContexts;
+import info.weboftrust.ldsignatures.jsonld.LDSecurityKeywords;
+
+import javax.json.JsonObject;
+import javax.json.JsonValue;
+import java.io.Reader;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class CredentialSubject extends JsonLDObject {
+
+	public static final URI[] DEFAULT_JSONLD_CONTEXTS = { VerifiableCredentialContexts.JSONLD_CONTEXT_W3C_2018_CREDENTIALS_V1 };
+	public static final String[] DEFAULT_JSONLD_TYPES = { };
+	public static final String DEFAULT_JSONLD_PREDICATE = VerifiableCredentialKeywords.JSONLD_TERM_CREDENTIALSUBJECT;
+
+	private CredentialSubject() {
+		super(VerifiableCredentialContexts.DOCUMENT_LOADER);
+	}
+
+	public CredentialSubject(JsonObject jsonObject) {
+		super(VerifiableCredentialContexts.DOCUMENT_LOADER, jsonObject);
+	}
+
+	/*
+	 * Factory methods
+	 */
+
+	public static class Builder extends JsonLDObject.Builder<Builder, CredentialSubject> {
+
+		private Map<String, JsonValue> claims;
+
+		public Builder(CredentialSubject jsonLDObject) {
+			super(jsonLDObject);
+		}
+
+		@Override
+		public CredentialSubject build() {
+
+			super.build();
+
+			// add JSON-LD properties
+			if (this.claims != null) JsonLDUtils.jsonLdAddAllJsonValueMap(this.jsonLDObject, this.claims);
+
+			return this.jsonLDObject;
+		}
+
+		public Builder claims(Map<String, JsonValue> claims) {
+			this.claims = claims;
+			return this;
+		}
+	}
+
+	public static Builder builder() {
+		return new Builder(new CredentialSubject());
+	}
+
+	/*
+	 * Reading the JSON-LD object
+	 */
+
+	public static CredentialSubject fromJson(Reader reader) {
+		return JsonLDObject.fromJson(CredentialSubject.class, reader);
+	}
+
+	public static CredentialSubject fromJson(String json) {
+		return JsonLDObject.fromJson(CredentialSubject.class, json);
+	}
+
+	/*
+	 * Adding, getting, and removing the JSON-LD object
+	 */
+
+	public static CredentialSubject getFromJsonLDObject(JsonLDObject jsonLdObject) {
+		return JsonLDObject.getFromJsonLDObject(CredentialSubject.class, jsonLdObject);
+	}
+
+	public static void removeFromJsonLdObject(JsonLDObject jsonLdObject) {
+		JsonLDObject.removeFromJsonLdObject(CredentialSubject.class, jsonLdObject);
+	}
+
+	/*
+	 * Getters
+	 */
+
+	public Map<String, JsonValue> getClaims() {
+		Map<String, JsonValue> claims = new LinkedHashMap<>(JsonLDUtils.jsonLdGetAsJsonValueMap(this.getJsonObject()));
+		claims.remove(JsonLDKeywords.JSONLD_TERM_ID);
+		return claims;
+	}
+}