fix api

eclipse-edc · Dec 27, 2023 · 730452a · 730452a
1 parent 9d01206
commit 730452a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/apidoc.yaml b/.github/workflows/apidoc.yaml
@@ -25,7 +25,7 @@ concurrency:
 jobs:
   Publish-To-SwaggerHub:
     # do NOT run on forks. The Org ("edc") is unique all across SwaggerHub
-    #    if: github.repository == 'eclipse-edc/IdentityHub'
+    if: github.repository == 'eclipse-edc/IdentityHub'
     runs-on: ubuntu-latest
     env:
       rootDir: resources/openapi/yaml

diff --git a/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/v1/PresentationApi.java b/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/v1/PresentationApi.java
@@ -17,7 +17,6 @@
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn;
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
 import io.swagger.v3.oas.annotations.info.Info;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
@@ -37,9 +36,8 @@
 @SecurityScheme(name = "Authentication",
         description = "Self-Issued ID token containing an access_token",
         type = SecuritySchemeType.HTTP,
-        scheme = "Bearer",
-        bearerFormat = "JWT",
-        in = SecuritySchemeIn.HEADER)
+        scheme = "bearer",
+        bearerFormat = "JWT")
 public interface PresentationApi {
 
     @Tag(name = "Resolution API")

diff --git a/...ain/java/org/eclipse/edc/identityhub/api/didmanagement/v1/DidManagementApiController.java b/...ain/java/org/eclipse/edc/identityhub/api/didmanagement/v1/DidManagementApiController.java
@@ -15,7 +15,6 @@
 package org.eclipse.edc.identityhub.api.didmanagement.v1;
 
 import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.PUT;
 import jakarta.ws.rs.Path;
@@ -84,7 +83,8 @@ public void updateDid(DidDocument document, @QueryParam("republish") boolean rep
     }
 
     @Override
-    @DELETE
+    @POST
+    @Path("/delete")
     public void deleteDidFromBody(DidRequestPayload request) {
         documentService.deleteById(request.did())
                 .orElseThrow(exceptionMapper(DidDocument.class, request.did()));

diff --git a/...java/org/eclipse/edc/identityhub/api/didmanagement/v1/DidManagementApiControllerTest.java b/...java/org/eclipse/edc/identityhub/api/didmanagement/v1/DidManagementApiControllerTest.java
@@ -256,7 +256,7 @@ void deleteDid_success() {
         when(didDocumentServiceMock.deleteById(eq(TEST_DID))).thenReturn(ServiceResult.success());
         baseRequest()
                 .body(new DidRequestPayload(TEST_DID))
-                .delete("/")
+                .post("/delete")
                 .then()
                 .log().ifError()
                 .statusCode(204);
@@ -270,7 +270,7 @@ void deleteDid_whenNotExist_expect404() {
         when(didDocumentServiceMock.deleteById(eq(TEST_DID))).thenReturn(ServiceResult.notFound("test-message"));
         baseRequest()
                 .body(new DidRequestPayload(TEST_DID))
-                .delete("/")
+                .post("/delete")
                 .then()
                 .log().ifError()
                 .statusCode(404);
@@ -284,7 +284,7 @@ void deleteDid_whenAlreadyPublished_expect409() {
         when(didDocumentServiceMock.deleteById(eq(TEST_DID))).thenReturn(ServiceResult.conflict("test-message"));
         baseRequest()
                 .body(new DidRequestPayload(TEST_DID))
-                .delete("/")
+                .post("/delete")
                 .then()
                 .log().ifError()
                 .statusCode(409);