Merge pull request #103 from nuts-foundation/v6-apis

Update web app to work on Nuts v6 APIs

api/api.go

@@ -32,11 +32,11 @@ func (w Wrapper) CreateIdentity(ctx echo.Context) error {
 	if err := ctx.Bind(&identityRequest); err != nil {
 		return err
 	}
-	id, err := w.Identity.Create(ctx.Request().Context(), identityRequest.DidQualifier)
+	result, err := w.Identity.Create(ctx.Request().Context(), identityRequest.Subject)
 	if err != nil {
 		return err
 	}
-	return ctx.JSON(http.StatusOK, id)
+	return ctx.JSON(http.StatusOK, result)
 }
 
 func (w Wrapper) GetIdentity(ctx echo.Context, did string) error {
@@ -54,11 +54,13 @@ func (w Wrapper) GetIssuedCredentials(ctx echo.Context, params GetIssuedCredenti
 	}
 	result := make([]vc.VerifiableCredential, 0)
 	for _, currID := range identities {
-		credentials, err := w.IssuerService.GetIssuedCredentials(ctx.Request().Context(), currID.DID, strings.Split(params.CredentialTypes, ","))
-		if err != nil {
-			return err
+		for _, issuerDID := range currID.DIDs {
+			credentials, err := w.IssuerService.GetIssuedCredentials(ctx.Request().Context(), issuerDID, strings.Split(params.CredentialTypes, ","))
+			if err != nil {
+				return err
+			}
+			result = append(result, credentials...)
 		}
-		result = append(result, credentials...)
 	}
 	return ctx.JSON(http.StatusOK, result)
 }

api/api.yaml

@@ -24,10 +24,8 @@ paths:
           application/json:
             schema:
               type: object
-              required:
-                - did_qualifier
               properties:
-                did_qualifier:
+                subject:
                   type: string
       responses:
         '200':
@@ -113,16 +111,17 @@ components:
       description: An identity object
       required:
         - did
-        - name
+        - subject
       properties:
         did:
-          type: string
           description: The DID associated with this identity
+          type: array
+          items:
+            type: string
           example:
-            "did:web:example.com:iam:user1"
-        name:
+            [did:web:example.com:iam:user1, did:tdw:1234]
+        subject:
           type: string
           description: |
-            The name of this identity, which is the last path part of a did:web DID.
-            If the DID does not contain paths, or it is not a did:web DID, it will be the same as the DID.
-          example: "user1"
+            Identifier the Nuts node uses to refer to this identity.
+          example: "hospital_x"

api/proxy.go

@@ -45,11 +45,6 @@ var allowedProxyRoutes = []proxyRoute{
 		method: http.MethodDelete,
 		path:   "/internal/discovery/v1/([a-z-A-Z0-9_\\-\\:\\.%]+)/([a-z-A-Z0-0_\\-\\:\\.%]+)",
 	},
-	// List owned DIDs
-	{
-		method: http.MethodGet,
-		path:   "/internal/vdr/v2/did",
-	},
 	// Issue Verifiable Credentials
 	{
 		method: http.MethodPost,

discovery/model.go

@@ -4,7 +4,7 @@ import "github.com/nuts-foundation/go-did/vc"
 
 // DIDStatus represents the status of a DID in the discovery service
 type DIDStatus struct {
-	ServiceID    string                     `json:"id"`
-	Active       bool                       `json:"active"`
-	Presentation *vc.VerifiablePresentation `json:"vp"`
+	ServiceID     string                      `json:"id"`
+	Active        bool                        `json:"active"`
+	Presentations []vc.VerifiablePresentation `json:"vps"`
 }