From 8e9546db0fb5b92a96a4e54a7933f73bf044fc99 Mon Sep 17 00:00:00 2001 From: "Andy Miller (IMS)" <48326098+amiller-ims@users.noreply.github.com> Date: Tue, 23 May 2023 10:18:46 +0900 Subject: [PATCH] Fix json samples Fixes #79 Updated ob3/simple-did-web-method.json and ob3/credential-status-revoked.json with fresh exports from Wellspring Portal. I also gave the AchievementCredentials names that correspond to the json file names so they are easier to update if needed. Once we get the BadgeConnect API working, we can probably update the tests to simply GET the credentials. --- .../ob30/credential-status-revoked.json | 96 ++++++++++--------- .../resources/ob30/simple-did-web-method.json | 50 ++++++---- 2 files changed, 85 insertions(+), 61 deletions(-) diff --git a/inspector-vc/src/test/resources/ob30/credential-status-revoked.json b/inspector-vc/src/test/resources/ob30/credential-status-revoked.json index c233d38..42140ba 100644 --- a/inspector-vc/src/test/resources/ob30/credential-status-revoked.json +++ b/inspector-vc/src/test/resources/ob30/credential-status-revoked.json @@ -1,56 +1,64 @@ { - "@context" : [ "https://www.w3.org/2018/credentials/v1", "https://purl.imsglobal.org/spec/ob/v3p0/context.json", "https://purl.imsglobal.org/spec/ob/v3p0/extensions.json", "https://w3id.org/security/suites/ed25519-2020/v1" ], - "id" : "https://dc.1edtech.org/wellspring2022/wellspring-portal/credential/54418d3f-ec01-4652-800a-861c890a51a1", - "type" : [ "VerifiableCredential", "AchievementCredential" ], - "issuer" : { - "id" : "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:da1e96e9-afcc-4eed-b9a2-2ddf7353214c", - "type" : "Profile", - "address" : { - "type" : "Address", - "addressCountry" : "Japan" + "@context": [ + "https://www.w3.org/2018/credentials/v1", + "https://purl.imsglobal.org/spec/ob/v3p0/context-3.0.1.json", + "https://purl.imsglobal.org/spec/ob/v3p0/extensions.json", + "https://w3id.org/security/suites/ed25519-2020/v1" + ], + "id": "https://dc.1edtech.org/wellspring2022/wellspring-portal/credential/54418d3f-ec01-4652-800a-861c890a51a1", + "type": [ + "VerifiableCredential", + "AchievementCredential" + ], + "issuer": { + "id": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:da1e96e9-afcc-4eed-b9a2-2ddf7353214c", + "type": "Profile", + "address": { + "type": "Address", + "addressCountry": "Japan" }, - "name" : "1EdTech Testing" + "name": "1EdTech Testing" }, - "awardedDate" : "2023-05-22T10:21:00Z", - "issuanceDate" : "2023-05-22T01:25:28Z", - "name" : "credential-status-revoked", - "description" : "This achievement credential is used in ims-inspector OB30Tests.", - "credentialSubject" : { - "id" : "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:learner:6896f98f-6b42-4c75-98ec-8befd0dc0b29", - "type" : "AchievementSubject", - "achievement" : { - "id" : "https://dc.1edtech.org/wellspring2022/wellspring-portal/achievement/45badd38-e201-4cf3-927f-be55bc7eb414", - "type" : "Achievement", - "achievementType" : "Achievement", - "criteria" : { - "narrative" : "Passes tests" + "awardedDate": "2023-05-22T10:21:00Z", + "issuanceDate": "2023-05-23T01:10:41Z", + "name": "ob3-credential-status-revoked.json", + "description": "This achievement credential is used in ims-inspector OB30Tests.", + "credentialSubject": { + "id": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:learner:6896f98f-6b42-4c75-98ec-8befd0dc0b29", + "type": "AchievementSubject", + "achievement": { + "id": "https://dc.1edtech.org/wellspring2022/wellspring-portal/achievement/45badd38-e201-4cf3-927f-be55bc7eb414", + "type": "Achievement", + "achievementType": "Achievement", + "criteria": { + "narrative": "Passes tests" }, - "description" : "Test achievement 1", - "name" : "Achievement 1" + "description": "Test achievement 1", + "name": "Achievement 1" }, - "source" : { - "id" : "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:da1e96e9-afcc-4eed-b9a2-2ddf7353214c", - "type" : "Profile", - "address" : { - "type" : "Address", - "addressCountry" : "Japan" + "source": { + "id": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:da1e96e9-afcc-4eed-b9a2-2ddf7353214c", + "type": "Profile", + "address": { + "type": "Address", + "addressCountry": "Japan" }, - "name" : "1EdTech Testing" + "name": "1EdTech Testing" } }, - "credentialStatus" : { - "id" : "https://dc.1edtech.org/wellspring2022/wellspring-portal/api/revocations/da1e96e9-afcc-4eed-b9a2-2ddf7353214c", - "type" : "1EdTechRevocationList" + "credentialStatus": { + "id": "https://dc.1edtech.org/wellspring2022/wellspring-portal/api/revocations/da1e96e9-afcc-4eed-b9a2-2ddf7353214c", + "type": "1EdTechRevocationList" }, - "refreshService" : { - "id" : "https://dc.1edtech.org/wellspring2022/wellspring-portal/api/refresh/54418d3f-ec01-4652-800a-861c890a51a1", - "type" : "1EdTechCredentialRefresh" + "refreshService": { + "id": "https://dc.1edtech.org/wellspring2022/wellspring-portal/api/refresh/54418d3f-ec01-4652-800a-861c890a51a1", + "type": "1EdTechCredentialRefresh" }, - "proof" : { - "type" : "Ed25519Signature2020", - "created" : "2023-05-22T01:25:28Z", - "proofPurpose" : "assertionMethod", - "verificationMethod" : "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:da1e96e9-afcc-4eed-b9a2-2ddf7353214c#key-0", - "proofValue" : "zXx8gzfqZT6snD9ZkJfMmRDVm1qoKt5gRoSnev6rTeQ4tCLPivv4ocpDEFpKwxyXakAqa76duAhfNcqUeWfnBasp" + "proof": { + "type": "Ed25519Signature2020", + "created": "2023-05-23T01:10:41Z", + "proofPurpose": "assertionMethod", + "verificationMethod": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:da1e96e9-afcc-4eed-b9a2-2ddf7353214c#key-0", + "proofValue": "z2gcheWGoh5y9Ft4Cd6uoAsEmQuWZAqppPtQifmnddddJqVw1dJLuUrWkaX3MGV2GUedeNAbFJ7b7xDTnd51nvWSr" } } \ No newline at end of file diff --git a/inspector-vc/src/test/resources/ob30/simple-did-web-method.json b/inspector-vc/src/test/resources/ob30/simple-did-web-method.json index 718e0a2..c7c150e 100644 --- a/inspector-vc/src/test/resources/ob30/simple-did-web-method.json +++ b/inspector-vc/src/test/resources/ob30/simple-did-web-method.json @@ -1,47 +1,63 @@ { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://purl.imsglobal.org/spec/ob/v3p0/context.json", + "https://purl.imsglobal.org/spec/ob/v3p0/context-3.0.1.json", "https://purl.imsglobal.org/spec/ob/v3p0/extensions.json", "https://w3id.org/security/suites/ed25519-2020/v1" ], - "id": "http://dc.1edtech.org/wellspring2022/wellspring-portal/credentials/5d7b7ff6-b1d5-47d5-83df-faf22533ba8f", + "id": "https://dc.1edtech.org/wellspring2022/wellspring-portal/credential/d002b4e9-6fd9-4af0-b1f7-faa9237b46ca", "type": [ "VerifiableCredential", "AchievementCredential" ], "issuer": { - "id": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:7ad80b28-4f3f-414d-85ec-6c0684344e5c", + "id": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:da1e96e9-afcc-4eed-b9a2-2ddf7353214c", "type": "Profile", - "name": "Wellspring School" + "address": { + "type": "Address", + "addressCountry": "Japan" + }, + "name": "1EdTech Testing" }, - "awardedDate": "2023-05-16T11:27:00Z", - "issuanceDate": "2023-05-16T07:18:52Z", - "name": "Simple assertion of achievement 1", + "awardedDate": "2023-05-22T14:09:00Z", + "issuanceDate": "2023-05-23T01:07:22Z", + "name": "ob3-simple-did-web-method.json", "credentialSubject": { - "id": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:learner:d4e1f6ad-9696-41cb-8729-8ff741f96c6a", + "id": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:learner:6896f98f-6b42-4c75-98ec-8befd0dc0b29", "type": "AchievementSubject", "achievement": { - "id": "http://dc.1edtech.org/wellspring2022/wellspring-portal/achievements/c44d8939-c237-4420-902c-9af305b15e2f", + "id": "https://dc.1edtech.org/wellspring2022/wellspring-portal/achievement/66457db3-fb3d-4ae3-8f32-bc8c79c9f0db", "type": "Achievement", "achievementType": "Achievement", "criteria": { - "narrative": "The credential must pass verification." + "narrative": "Passes tests" }, - "description": "This is a test achievement.", - "name": "Achievement 1" + "description": "A second testing achievement", + "name": "Achievement 2" }, "source": { - "id": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:7ad80b28-4f3f-414d-85ec-6c0684344e5c", + "id": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:da1e96e9-afcc-4eed-b9a2-2ddf7353214c", "type": "Profile", - "name": "Wellspring School" + "address": { + "type": "Address", + "addressCountry": "Japan" + }, + "name": "1EdTech Testing" } }, + "credentialStatus": { + "id": "https://dc.1edtech.org/wellspring2022/wellspring-portal/api/revocations/da1e96e9-afcc-4eed-b9a2-2ddf7353214c", + "type": "1EdTechRevocationList" + }, + "refreshService": { + "id": "https://dc.1edtech.org/wellspring2022/wellspring-portal/api/refresh/d002b4e9-6fd9-4af0-b1f7-faa9237b46ca", + "type": "1EdTechCredentialRefresh" + }, "proof": { "type": "Ed25519Signature2020", - "created": "2023-05-16T07:18:52Z", + "created": "2023-05-23T01:07:22Z", "proofPurpose": "assertionMethod", - "verificationMethod": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:7ad80b28-4f3f-414d-85ec-6c0684344e5c#key-0", - "proofValue": "zYQ6iszNf2qCqisuWvk1AkerTTp69RiofNWWzWp4s5TJwzBfFgieBSA5Knyjco6crJbPkJ1mvM1hzA2HLYfU8w8C" + "verificationMethod": "did:web:dc.1edtech.org:wellspring2022:wellspring-portal:org:da1e96e9-afcc-4eed-b9a2-2ddf7353214c#key-0", + "proofValue": "z5tVhex5rV9aTxTrGh26uyVdC6BWXG8dQCkzNjgkPWtwAjGzMyYXzrQYJ2XrKUsNpYE3fTXsgUSBwDCY11vbyGBw7" } } \ No newline at end of file