Update given latest Nuts Node API changes

nuts-foundation · Sep 5, 2024 · 94ac7e9 · 94ac7e9
1 parent b832e86
commit 94ac7e9
Show file tree

Hide file tree

Showing 11 changed files with 156 additions and 165 deletions.
diff --git a/api/proxy.go b/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,

diff --git a/deploy/node.config.yaml b/deploy/node.config.yaml
diff --git a/discovery/model.go b/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"`
 }
diff --git a/discovery/nuts_discovery_client.gen.go b/discovery/nuts_discovery_client.gen.go
diff --git a/discovery/service.go b/discovery/service.go
@@ -37,9 +37,12 @@ func (i Service) ActivationStatus(ctx context.Context, serviceID string, subject
 	if response.JSON200 == nil {
 		return nil, errors.New("unable to get service activation")
 	}
-	return &DIDStatus{
-		ServiceID:    serviceID,
-		Active:       response.JSON200.Activated,
-		Presentation: response.JSON200.Vp,
-	}, nil
+	result := &DIDStatus{
+		ServiceID: serviceID,
+		Active:    response.JSON200.Activated,
+	}
+	if response.JSON200.Vp != nil {
+		result.Presentations = *response.JSON200.Vp
+	}
+	return result, nil
 }
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -10,6 +10,7 @@ services:
       NUTS_CRYPTO_STORAGE: fs
       NUTS_HTTP_INTERNAL_ADDRESS: :8081
       NUTS_URL: https://nuts.nl
+      NUTS_DISCOVERY_DEFINITIONS_DIRECTORY: /opt/nuts/discovery
 #  nuts-admin:
 #    build:
 #      context: .