Merge branch '6-revise-test-based-on-phase-2-changes' into 'main'

Resolve "Revise test based on phase 2 changes" Closes #6 See merge request !42

Merge branch '6-revise-test-based-on-phase-2-changes' into 'main'
Resolve "Revise test based on phase 2 changes" Closes #6 See merge request !42
7c489fe8 · Rosen Georgiev · 16196e97 · 4db9730c · 7c489fe8 · 7c489fe8
Commit 7c489fe8 authored 1 year ago by Rosen Georgiev
--- a/src/main/resources/REST/json/Credential.json
+++ b/src/main/resources/REST/json/Credential.json
 {
  "for_proof": {
-    "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "key": "key1",
    "namespace": "transit",
    "credential": {
@@ -14,10 +14,10 @@
        "VerifiableCredential",
        "UniversityDegreeCredential"
      ],
-      "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "issuanceDate": "2010-01-01T00:00:00Z",
      "credentialSubject": {
-        "id": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "allow": true,
        "num": 123,
        "array": {
@@ -56,7 +56,7 @@
    }
  },
  "for_proof_happypath_vault": {
-    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "key": "key1",
    "namespace": "transit",
    "credential": {
@@ -70,10 +70,10 @@
        "VerifiableCredential",
        "UniversityDegreeCredential"
      ],
-      "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "issuanceDate": "2010-01-01T00:00:00Z",
      "credentialSubject": {
-        "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "allow": true,
        "num": 123,
        "array": {
@@ -125,57 +125,7 @@
        "VerifiableCredential",
        "UniversityDegreeCredential"
      ],
-      "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
-      "issuanceDate": "2010-01-01T00:00:00Z",
-      "credentialSubject": {
-        "id": "did:example:ebfeb1f712ebc6f1c276e12ec21",
-        "degree": {
-          "type": "BachelorDegree",
-          "name": "Bachelor of Science and Arts"
-        }
-      }
-    }
-  },
-  "for_proof_alumni": {
-    "issuer": "http://example.edu/credentials/3732",
-    "key": "key1",
-    "namespace": "transit",
-    "credential": {
-      "@context": [
-        "https://www.w3.org/2018/credentials/v1",
-        "https://www.w3.org/2018/credentials/examples/v1"
-      ],
-      "id": "http://example.edu/credentials/3732",
-      "type": [
-        "VerifiableCredential",
-        "UniversityDegreeCredential"
-      ],
-      "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
-      "issuanceDate": "2010-01-01T00:00:00Z",
-      "credentialSubject": {
-        "id": "did:example:ebfeb1f712ebc6f1c276e12ec21",
-        "degree": {
-          "type": "BachelorDegree",
-          "name": "Bachelor of Science and Arts"
-        }
-      }
-    }
-  },
-  "for_proof_alumni": {
-    "issuer": "http://example.edu/credentials/3732",
-    "key": "key1",
-    "namespace": "transit",
-    "credential": {
-      "@context": [
-        "https://www.w3.org/2018/credentials/v1",
-        "https://www.w3.org/2018/credentials/examples/v1"
-      ],
-      "id": "http://example.edu/credentials/3732",
-      "type": [
-        "VerifiableCredential",
-        "UniversityDegreeCredential"
-      ],
-      "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "issuanceDate": "2010-01-01T00:00:00Z",
      "credentialSubject": {
        "id": "did:example:ebfeb1f712ebc6f1c276e12ec21",
@@ -187,7 +137,7 @@
    }
  },
  "for_proof_without_ID": {
-    "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "key": "key1",
    "namespace": "transit",
    "credential": {
@@ -201,7 +151,7 @@
        "VerifiableCredential",
        "UniversityDegreeCredential"
      ],
-      "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "issuanceDate": "2010-01-01T00:00:00Z",
      "credentialSubject": {
        "allow": true,
@@ -214,7 +164,7 @@
    }
  },
  "for_proof_incorrect_ID_space": {
-    "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "key": "key1",
    "namespace": "transit",
    "credential": {
@@ -228,7 +178,7 @@
        "VerifiableCredential",
        "UniversityDegreeCredential"
      ],
-      "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "issuanceDate": "2010-01-01T00:00:00Z",
      "credentialSubject": {
        "id": " ",
@@ -242,7 +192,7 @@
    }
  },
  "for_proof_incorrect_ID_symbols": {
-    "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "key": "key1",
    "namespace": "transit",
    "credential": {
@@ -256,7 +206,7 @@
        "VerifiableCredential",
        "UniversityDegreeCredential"
      ],
-      "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "issuanceDate": "2010-01-01T00:00:00Z",
      "credentialSubject": {
        "id": ":",
@@ -270,7 +220,7 @@
    }
  },
  "incorrect_id": {
-    "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "key": "key1",
    "namespace": "transit",
    "credential": {
@@ -278,7 +228,7 @@
        "https://www.w3.org/2018/credentials/v1",
        "https://w3id.org/security/suites/jws-2020/v1"
      ],
-      "id": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "type": "VerifiablePresentation",
      "verifiableCredential": [
        {
@@ -292,7 +242,7 @@
            "id": "ZZZZZZZZZZZZZZZ"
          },
          "issuanceDate": "2022-07-01T11:07:57.975459274Z",
-          "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+          "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
          "type": "VerifiableCredential"
        }
      ]
@@ -310,12 +260,12 @@
        "txt1": "1",
        "txt2": "2"
      },
-      "id": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "num": 123
    },
    "id": "http://example.edu/credentials/3732",
    "issuanceDate": "2010-01-01T00:00:00Z",
-    "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "type": [
      "VerifiableCredential",
      "UniversityDegreeCredential"
@@ -333,18 +283,18 @@
        "txt1": "1",
        "txt2": "2"
      },
-      "id": "did:web:vault.XXXX.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "id": "did:web:vault.XXXX.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "num": 123
    },
    "id": "http://example.edu/credentials/3732",
    "issuanceDate": "2010-01-01T00:00:00Z",
-    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "proof": {
      "created": "2023-10-25T13:51:02.705137364Z",
      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCICbq3JF7aFBYzJ7WYasgbbnM-6Az6D-UkwaJyv2pK8KZAiEAphPGj01RKO527N_WYDeYZNosfLUsNKk24iGNy-6ArKE",
      "proofPurpose": "assertionMethod",
      "type": "JsonWebSignature2020",
-      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
+      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1"
    },
    "type": [
      "VerifiableCredential",
@@ -363,18 +313,18 @@
        "txt1": "1",
        "txt2": "2"
      },
-      "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "num": 123
    },
    "id": "http://example.edu/credentials/3732",
    "issuanceDate": "2000-01-01T00:00:00Z",
-    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "proof": {
      "created": "2023-10-25T13:51:02.705137364Z",
      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCICbq3JF7aFBYzJ7WYasgbbnM-6Az6D-UkwaJyv2pK8KZAiEAphPGj01RKO527N_WYDeYZNosfLUsNKk24iGNy-6ArKE",
      "proofPurpose": "assertionMethod",
      "type": "JsonWebSignature2020",
-      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
+      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1"
    },
    "type": [
      "VerifiableCredential",
@@ -393,18 +343,18 @@
        "txt1": "1",
        "txt2": "2"
      },
-      "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "num": 123
    },
    "id": "http://example.edu/credentials/3732",
    "issuanceDate": "2010-01-01T00:00:00Z",
-    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "proof": {
      "created": "2023-10-25T13:51:02.705137364Z",
      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCICbq3JF7aFBYzJ7WYasgbbnM-6Az6D-UkwaJyv2pK8KZAiEAphPGj01RKO527N_WYDeYZNosfLUsNKk24iGNy-6ArKE",
      "proofPurpose": "assertionMethod",
      "type": "JsonWebSignature2020",
-      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
+      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1"
    },
    "type": [
      "VerifiableCredential",
@@ -423,18 +373,18 @@
        "txt1": "I",
        "txt2": "2"
      },
-      "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+      "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
      "num": 123
    },
    "id": "http://example.edu/credentials/3732",
    "issuanceDate": "2010-01-01T00:00:00Z",
-    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "proof": {
      "created": "2023-10-25T13:51:02.705137364Z",
      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCICbq3JF7aFBYzJ7WYasgbbnM-6Az6D-UkwaJyv2pK8KZAiEAphPGj01RKO527N_WYDeYZNosfLUsNKk24iGNy-6ArKE",
      "proofPurpose": "assertionMethod",
      "type": "JsonWebSignature2020",
-      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
+      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1"
    },
    "type": [
      "VerifiableCredential",

--- a/src/main/resources/REST/json/Infohub.json
+++ b/src/main/resources/REST/json/Infohub.json
@@ -4,13 +4,13 @@
      "https://www.w3.org/2018/credentials/v1",
      "https://w3id.org/security/suites/jws-2020/v1"
    ],
-    "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "proof": {
-      "created": "2023-10-25T11:40:23.899103894Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCIQDbD-pBC4nvuqPi-o8fGMjIHB-rIbSPRcNM4vyyAdP-BQIgEJkZvvFa9u9JVDgX7E9taJ3POrMmFDIjCkmFpYPcPjU",
+      "created": "2023-11-09T14:29:02.735353672Z",
+      "jws": "eyJhbGciOiIiLCJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdfQ..MEUCIDQOzOP-RLNmF03gGBCfwppLXMiFf3VyDLTOtDRGqNz-AiEAj9pOzVfgKTM7Q4py7QcVJuZdQAvVligjN4jSQyrDUtc",
      "proofPurpose": "assertionMethod",
      "type": "JsonWebSignature2020",
-      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
+      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1"
    },
    "type": "VerifiablePresentation",
    "verifiableCredential": [
@@ -21,12 +21,13 @@
          "https://schema.org"
        ],
        "credentialSubject": {
+          "age_over": 18,
          "allow": true,
-          "name": "pass",
-          "num": 123
+          "citizenship": "France",
+          "id": "https://vault.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
        },
        "issuanceDate": "2022-07-21T10:24:36.203848291Z",
-        "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "type": "VerifiableCredential"
      },
      {
@@ -37,19 +38,10 @@
        ],
        "credentialSubject": {
          "allow": true,
-          "array": [
-            {
-              "num1": 1,
-              "num2": 2
-            },
-            {
-              "txt1": "1",
-              "txt2": "2"
-            }
-          ]
+          "id": "https://vault.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
        },
        "issuanceDate": "2022-07-21T10:24:36.203861194Z",
-        "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "type": "VerifiableCredential"
      }
    ]
@@ -59,13 +51,13 @@
      "https://www.w3.org/2018/credentials/v1",
      "https://w3id.org/security/suites/jws-2020/v1"
    ],
-    "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "proof": {
-      "created": "2023-10-25T12:29:35.107668224Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEYCIQD-AqWDlKAIrOHTH87buG6P3L0IXhm2F0wrPFsDda-XYAIhAPHevClc_jBjBUaqRg9xmMUjhypnP564c6h8oyCqi3q7",
+      "created": "2023-11-09T14:49:01.930441438Z",
+      "jws": "eyJhbGciOiIiLCJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdfQ..MEUCIQCc0TJ6o4PGQmDEW4xO_-jWbwxnem-araTK8jOteUWcbAIgERukV-OSdDSSBohslgQLx7gE1v36TSxB15TGtfatjV0",
      "proofPurpose": "assertionMethod",
      "type": "JsonWebSignature2020",
-      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
+      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1"
    },
    "type": "VerifiablePresentation",
    "verifiableCredential": [
@@ -76,11 +68,13 @@
          "https://schema.org"
        ],
        "credentialSubject": {
+          "age_over": 18,
          "allow": true,
-          "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation"
+          "citizenship": "France",
+          "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation"
        },
        "issuanceDate": "2022-07-21T10:24:36.203848291Z",
-        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "type": "VerifiableCredential"
      },
      {
@@ -91,10 +85,10 @@
        ],
        "credentialSubject": {
          "allow": true,
-          "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation"
+          "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation"
        },
        "issuanceDate": "2022-07-21T10:24:36.203861194Z",
-        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "type": "VerifiableCredential"
      }
    ]
@@ -104,13 +98,13 @@
      "https://www.w3.org/2018/credentials/v1",
      "https://w3id.org/security/suites/jws-2020/v1"
    ],
-    "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "proof": {
-      "created": "2023-10-25T12:29:35.107668224Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEYCIQD-AqWDlKAIrOHTH87buG6P3L0IXhm2F0wrPFsDda-XYAIhAPHevClc_jBjBUaqRg9xmMUjhypnP564c6h8oyCqi3q7",
+      "created": "2023-11-09T14:49:01.930441438Z",
+      "jws": "eyJhbGciOiIiLCJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdfQ..MEUCIQCc0TJ6o4PGQmDEW4xO_-jWbwxnem-araTK8jOteUWcbAIgERukV-OSdDSSBohslgQLx7gE1v36TSxB15TGtfatjV0",
      "proofPurpose": "assertionMethod",
      "type": "JsonWebSignature2020",
-      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
+      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1"
    },
    "type": "VerifiablePresentation",
    "verifiableCredential": [
@@ -121,11 +115,13 @@
          "https://schema.org"
        ],
        "credentialSubject": {
+          "age_over": 18,
          "allow": true,
-          "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation"
+          "citizenship": "France",
+          "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation"
        },
        "issuanceDate": "2022-07-21T10:24:36.203848291Z",
-        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "type": "VerifiableCredential"
      },
      {
@@ -136,10 +132,10 @@
        ],
        "credentialSubject": {
          "allow": true,
-          "id": "did:web:vaultt.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation"
+          "id": "did:web:vault.vereignZZZZZZ.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation"
        },
        "issuanceDate": "2022-07-21T10:24:36.203861194Z",
-        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "type": "VerifiableCredential"
      }
    ]
@@ -149,13 +145,13 @@
      "https://www.w3.org/2018/credentials/v1",
      "https://w3id.org/security/suites/jws-2020/v1"
    ],
-    "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
    "proof": {
-      "created": "2023-10-25T12:38:33.999010509Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEQCIFYN2X6Mb_pQF0OYn6eTtvEkH_fa9zYiNeFnklqEXdoUAiAKfq3rq3U42G_v7vJKeAtHFf5AeI0qZ8tyFJzFGqj6hw",
+      "created": "2023-11-09T14:49:01.930441438Z",
+      "jws": "eyJhbGciOiIiLCJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdfQ..MEUCIQCc0TJ6o4PGQmDEW4xO_-jWbwxnem-araTK8jOteUWcbAIgERukV-OSdDSSBohslgQLx7gE1v36TSxB15TGtfatjV0",
      "proofPurpose": "assertionMethod",
      "type": "JsonWebSignature2020",
-      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
+      "verificationMethod": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1"
    },
    "type": "VerifiablePresentation",
    "verifiableCredential": [
@@ -166,11 +162,13 @@
          "https://schema.org"
        ],
        "credentialSubject": {
+          "age_over": 18,
          "allow": true,
-          "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation"
+          "citizenship": "France",
+          "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation"
        },
        "issuanceDate": "2022-07-21T10:24:36.203848291Z",
-        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "type": "VerifiableCredential"
      },
      {
@@ -180,11 +178,11 @@
          "https://schema.org"
        ],
        "credentialSubject": {
-          "allow": true,
-          "id": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation"
+          "allow": false,
+          "id": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation"
        },
        "issuanceDate": "2022-07-21T10:24:36.203861194Z",
-        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+        "issuer": "did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation",
        "type": "VerifiableCredential"
      }
    ]

--- a/src/main/resources/REST/json/Presentation.json
+++ b/src/main/resources/REST/json/Presentation.json
--- a/src/test/java/api/test/rest/tsa/policy/PolicyStepDefinitions.java
+++ b/src/test/java/api/test/rest/tsa/policy/PolicyStepDefinitions.java
@@ -40,7 +40,7 @@ public class PolicyStepDefinitions extends BaseStepDefinitions {

    @And("^I execute the Policy group \\{(.*)\\} name \\{(.*)\\} version \\{(.*)\\} via TSA Policy API$")
    public void iExecuteThePolicyGroupNameVersionTSAPolicyAPI(String group, String name, String version) throws Throwable {
-        currentRequest.setPath("/policy/" + group + "/" + name + "/" + version + "/evaluation");
+        currentRequest.setPath("/policy/policies/" + group + "/" + name + "/" + version + "/evaluation");
        Response response = RestClient.post(currentRequest);
        addRequest(currentRequest);
        addResponse(response);
@@ -48,7 +48,7 @@ public class PolicyStepDefinitions extends BaseStepDefinitions {

    @When("^I lock the Policy group \\{(.*)\\} name \\{(.*)\\} version \\{(.*)\\}$")
    public void iLockThePolicyGroupNameVersion(String group, String name, String version) throws Throwable {
-        currentRequest.setPath("/policy/" + group + "/" + name + "/" + version + "/lock");
+        currentRequest.setPath("/policy/policies/" + group + "/" + name + "/" + version + "/lock");
        Response response = RestClient.post(currentRequest);
        addRequest(currentRequest);
        addResponse(response);
@@ -56,7 +56,7 @@ public class PolicyStepDefinitions extends BaseStepDefinitions {

    @When("^I unlock the policy group \\{(.*)\\} name \\{(.*)\\} version \\{(.*)\\}$")
    public void iUnlockThePolicy(String group, String name, String version) throws Throwable {
-        currentRequest.setPath("/policy/" + group + "/" + name + "/" + version + "/lock");
+        currentRequest.setPath("/policy/policies/" + group + "/" + name + "/" + version + "/lock");
        Response response = RestClient.delete(currentRequest);
        addRequest(currentRequest);
        addResponse(response);

--- a/src/test/resources/features/tsa/cache/v1/cache/GET.feature
+++ b/src/test/resources/features/tsa/cache/v1/cache/GET.feature
@@ -67,8 +67,9 @@ Feature: API -TSA - Cache - v1/cache GET
    Given I send the Cache GET request via TSA Cache API
    Then the status code should be {400}
    And the response is valid according to the {Cache_negative_schema.json} REST schema
-    And the field {message} has the value {"x-cache-key" is missing from header}
+    And the field {message} has the value {"key" is missing from header}

+  @wip #issue https://gitlab.eclipse.org/eclipse/xfsc/tsa/task/-/issues/5
  Scenario: TSA - Executing Task with DID resolver and Evaluate the Cache - Positive
    Given we are testing the TSA Task Api
    When I load the REST request {Policy.json} with profile {did_key}
@@ -93,8 +94,8 @@ Feature: API -TSA - Cache - v1/cache GET
    Then I load element {0} from Info SessionContainer into currentRequest HEADER {x-cache-key}
    When I send the Cache GET request via TSA Cache API
    And the field {allow} has the value {true}
-    And the field {id} has the value {did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation}
+    And the field {id} has the value {did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation}
    Then I load element {1} from Info SessionContainer into currentRequest HEADER {x-cache-key}
    When I send the Cache GET request via TSA Cache API
    And the field {allow} has the value {true}
-    And the field {id} has the value {did:web:vault.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation}
+    And the field {id} has the value {did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation}
--- a/src/test/resources/features/tsa/cache/v1/cache/POST.feature
+++ b/src/test/resources/features/tsa/cache/v1/cache/POST.feature
@@ -42,7 +42,7 @@ Feature: API -TSA - Cache - v1/cache POST
    And I send the Cache POST request via TSA Cache API
    Then the status code should be {400}
    And the response is valid according to the {Cache_negative_schema.json} REST schema
-    And the field {message} has the value {"x-cache-key" is missing from header}
+    And the field {message} has the value {"key" is missing from header}

  @negative
  Scenario: TSA - Setting Cache with missing body - Negative

--- a/src/test/resources/features/tsa/infohub/v1/export/GET.feature
+++ b/src/test/resources/features/tsa/infohub/v1/export/GET.feature
@@ -25,6 +25,7 @@ Feature: API - TSA - Infohub - v1/export GET
  Background:
    Given we are testing the TSA Infohub Api

+  @wip #issue https://gitlab.eclipse.org/eclipse/xfsc/tsa/task/-/issues/5
  Scenario: TSA - Export through Infohub - Positive
    When I export the {testexport} via TSA Infohub API
    Then the status code should be {200}
@@ -33,7 +34,7 @@ Feature: API - TSA - Infohub - v1/export GET
    When I export the {testexport} via TSA Infohub API
    Then the status code should be {200}
    And the response is valid according to the {Infohub_Export_schema.json} REST schema
-    And the field {proof.verificationMethod} contains the value {vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1}
+    And the field {proof.verificationMethod} contains the value {vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1}
    And the field {proof.type} has the value {JsonWebSignature2020}

  @negative

--- a/src/test/resources/features/tsa/signer/v1/credential/proof/POST.feature
+++ b/src/test/resources/features/tsa/signer/v1/credential/proof/POST.feature
@@ -30,7 +30,7 @@ Feature: API - TSA - Signer credential proof - v1/credential/proof POST
    And I create credential proof via TSA Signer API
    Then the status code should be {200}
    And the response is valid according to the {<schema>} REST schema
-    And the field {proof.verificationMethod} has the value {did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1}
+    And the field {proof.verificationMethod} has the value {did:web:vault.vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1}

    Examples:
      | labelSuffix | profileOption        | schema                                        |
@@ -52,7 +52,7 @@ Feature: API - TSA - Signer credential proof - v1/credential/proof POST
    When I load the REST request {Credential.json} with profile {<profileOption>}
    And I create credential proof via TSA Signer API
    Then the status code should be {400}
-    And the field {message} has the value {invalid format of subject id}
+    And the field {message} has the value {invalid subject id: must be URI}

    Examples:
      | labelSuffix | profileOption                  |

--- a/src/test/resources/features/tsa/signer/v1/credential/verify/POST.feature
+++ b/src/test/resources/features/tsa/signer/v1/credential/verify/POST.feature
@@ -30,7 +30,7 @@ Feature: API - TSA - Signer credential verify - v1/credential/verify POST
    And I create credential proof via TSA Signer API
    Then the status code should be {200}
    And the response is valid according to the {Signer_CredentialProof_schema.json} REST schema
-    And the field {proof.verificationMethod} contains the value {vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1}
+    And the field {proof.verificationMethod} contains the value {vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1}
    Then I get the last response body and load it to the current request body
    And I verify credential proof via TSA Signer API
    And the status code should be {200}

--- a/src/test/resources/features/tsa/signer/v1/presentation/proof/POST.feature
+++ b/src/test/resources/features/tsa/signer/v1/presentation/proof/POST.feature
@@ -54,7 +54,7 @@ Feature: API - TSA - Signer presentation proof - v1/presentation/proof POST
    When I load the REST request {Presentation.json} with profile {<profileOption>}
    And I create presentation proof via TSA Signer API
    Then the status code should be {400}
-    And the field {message} contains the value {invalid format of subject id}
+    And the field {message} contains the value {invalid subject id}

    Examples:
      | labelSuffix | profileOption                  |

--- a/src/test/resources/features/tsa/signer/v1/presentation/verify/POST.feature
+++ b/src/test/resources/features/tsa/signer/v1/presentation/verify/POST.feature
@@ -30,7 +30,7 @@ Scenario: TSA - verify presentation proof - Positive
    When I create presentation proof via TSA Signer API
    And the status code should be {200}
    And the response is valid according to the {Signer_PresentationProof_schema.json} REST schema
-    And the field {proof.verificationMethod} contains the value {vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1}
+    And the field {proof.verificationMethod} contains the value {vereign.com:tsa:policy:policy:policies:example:returnDID:1.0:evaluation#key1}
    Then I get the last response body and load it to the current request body
    And I verify presentation proof via TSA Signer API
    And the status code should be {200}

--- a/src/test/resources/features/tsa/task/v1/task/taskListStatus/GET.feature
+++ b/src/test/resources/features/tsa/task/v1/task/taskListStatus/GET.feature
@@ -25,6 +25,7 @@ Feature: API -TSA - Task - v1/taskList GET
  Background:
    Given we are testing the TSA Task Api

+  @wip #issue https://gitlab.eclipse.org/eclipse/xfsc/tsa/task/-/issues/5
  Scenario: TSA - Get status from Task List execution - Positive
    When I load the REST request {Policy.json} with profile {did_key}
    And I execute the taskList {testList} via TSA Task API
@@ -38,6 +39,7 @@ Feature: API -TSA - Task - v1/taskList GET
    And the field {status} has the value {done}
    And the field {$..tasks..status} has the value {["done","done"]}

+  @wip #issue https://gitlab.eclipse.org/eclipse/xfsc/tsa/task/-/issues/5
  Scenario: TSA - Get status from Task List with three synchronous tasks second fails - Negative
    When I set the following request body {{}}
    And I execute the taskList {failTestListSync} via TSA Task API
@@ -51,6 +53,7 @@ Feature: API -TSA - Task - v1/taskList GET
    And the field {status} has the value {failed}
    And the field {$..tasks..status} has the value {["done","failed","failed"]}

+  @wip #issue https://gitlab.eclipse.org/eclipse/xfsc/tsa/task/-/issues/5
  Scenario: TSA - Get status from Task List with three asynchronous tasks second fails - Negative
    When I set the following request body {{}}
    And I execute the taskList {failTestListAsync} via TSA Task API

--- a/src/test/resources/features/tsa/task/v1/task/taskResult/GET.feature
+++ b/src/test/resources/features/tsa/task/v1/task/taskResult/GET.feature
@@ -25,6 +25,7 @@ Feature: API -TSA - Task - v1/taskList GET
  Background:
    Given we are testing the TSA Task Api

+  @wip #issue https://gitlab.eclipse.org/eclipse/xfsc/tsa/task/-/issues/5
  Scenario: TSA - Executing Task with DID resolver and checking the Task Results - Positive
  #Execute Task
    When I load the REST request {Policy.json} with profile {did_key}
@@ -39,6 +40,7 @@ Feature: API -TSA - Task - v1/taskList GET
    And the response is valid according to the {Task_ExecuteDID_schema.json} REST schema
    And the field {data.didDocument.id} has the value {did:key:z6Mkfriq1MqLBoPWecGoDLjguo1sB9brj6wT3qZ5BxkKpuP6}

+  @wip #issue https://gitlab.eclipse.org/eclipse/xfsc/tsa/task/-/issues/5
  Scenario: TSA - Get result from Task List with two synchronous tasks - Positive
    When I set the following request body {{}}
    And I execute the taskList {testList} via TSA Task API

--- a/src/test/resources/features/tsa/task/v1/task/{taskName}/POST.feature
+++ b/src/test/resources/features/tsa/task/v1/task/{taskName}/POST.feature
@@ -30,6 +30,7 @@ Feature: API -TSA - Task - v1/task POST
  Background:
    Given we are testing the TSA Task Api

+  @wip #issue https://gitlab.eclipse.org/eclipse/xfsc/tsa/task/-/issues/5
  Scenario: TSA - Executing Task with DID resolver - Positive
    When I load the REST request {Policy.json} with profile {did_key}
    And I execute the Task {didResolve} via TSA Task API