in2workspace
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 102 additions & 25 deletions b/‎.github/workflows/release.yml‎
Lines changed: 102 additions & 25 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 18 additions & 3 deletions b/‎CHANGELOG.md‎
Lines changed: 18 additions & 3 deletions
diff --git a/‎build.gradle‎
Lines changed: 3 additions & 14 deletions b/‎build.gradle‎
Lines changed: 3 additions & 14 deletions
diff --git a/‎settings.gradle‎
Lines changed: 1 addition & 1 deletion b/‎settings.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/es/in2/issuer/backend/backoffice/application/workflow/CredentialStatusWorkflow.java‎
Lines changed: 10 additions & 0 deletions b/‎src/main/java/es/in2/issuer/backend/backoffice/application/workflow/CredentialStatusWorkflow.java‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/main/java/es/in2/issuer/backend/backoffice/application/workflow/impl/ActivationCodeWorkflowImpl.java‎
Lines changed: 8 additions & 13 deletions b/‎src/main/java/es/in2/issuer/backend/backoffice/application/workflow/impl/ActivationCodeWorkflowImpl.java‎
Lines changed: 8 additions & 13 deletions
diff --git a/‎src/main/java/es/in2/issuer/backend/backoffice/application/workflow/impl/CredentialStatusWorkflowImpl.java‎
Lines changed: 102 additions & 0 deletions b/‎src/main/java/es/in2/issuer/backend/backoffice/application/workflow/impl/CredentialStatusWorkflowImpl.java‎
Lines changed: 102 additions & 0 deletions
diff --git a/‎src/main/java/es/in2/issuer/backend/backoffice/domain/exception/CreateDateException.java‎
Lines changed: 0 additions & 9 deletions b/‎src/main/java/es/in2/issuer/backend/backoffice/domain/exception/CreateDateException.java‎
Lines changed: 0 additions & 9 deletions
@@ -1,4 +1,5 @@
 name: Release
+
 on:
   push:
     branches:
@@ -10,13 +11,18 @@ on:
 
 permissions:
   contents: write
+  packages: write
 
 jobs:
   release-snapshot:
     if: github.event_name == 'pull_request'
     name: Release Snapshot
+    concurrency:
+      group: docker-${{ github.head_ref || github.ref_name }}
+      cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
+
       - name: Checkout Repository
         uses: actions/checkout@v4
 
@@ -29,9 +35,17 @@ jobs:
       - name: Make Gradlew Executable
         run: chmod +x ./gradlew
 
+      - name: Get Project Name
+        id: project_name
+        run: echo "PROJECT_NAME=$(./gradlew -q properties | grep '^name:' | awk '{print $2}')" >> $GITHUB_ENV
+
       - name: Get Project Version
-        id: get_version
-        run: echo "VERSION=$(./gradlew -q printVersion)" >> $GITHUB_ENV
+        id: project_version
+        run: echo "VERSION=$(./gradlew -q properties | grep '^version:' | awk '{print $2}')" >> $GITHUB_ENV
+
+      - name: Compute PR-based snapshot suffix
+        if: github.event_name == 'pull_request'
+        run: echo "SNAPSHOT_SUFFIX=-pr-${{ github.event.number }}" >> $GITHUB_ENV
 
       - name: Check for existing release tag (only on PR)
         if: github.event_name == 'pull_request'
@@ -47,19 +61,45 @@ jobs:
             echo "No existing release with tag v$VERSION found. Proceeding with build."
           fi
 
-      - name: Build and Push docker image
-        run: |
-          PROJECT_NAME=$(./gradlew -q printProjectName)
-          IMAGE_TAG="$PROJECT_NAME:v$VERSION$SUFFIX"
-          docker build --file Dockerfile --build-arg SKIP_TESTS=true --tag $DOCKER_HUB_CLIENT_NAME/$IMAGE_TAG .
-          echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
-          docker push $DOCKER_HUB_CLIENT_NAME/$IMAGE_TAG
+      # Logins
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PAT }}
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Build and Push docker image (DockerHub + ECR)
         env:
+          PROJECT_NAME: ${{ env.PROJECT_NAME }}
           VERSION: ${{ env.VERSION }}
-          SUFFIX: -snapshot
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_TOKEN }}
-          DOCKER_HUB_CLIENT_NAME: in2workspace
+          SNAPSHOT_SUFFIX: ${{ env.SNAPSHOT_SUFFIX }}
+          DOCKERHUB_ORG: ${{ secrets.DOCKERHUB_ORG }}
+          ECR_REGISTRY: ${{ steps.ecr.outputs.registry }}
+          ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
+        run: |
+          set -euo pipefail
+          TAG="v${VERSION}${SNAPSHOT_SUFFIX}"
+          
+          DH_IMAGE="docker.io/${DOCKERHUB_ORG}/${PROJECT_NAME}:${TAG}"
+          ECR_IMAGE="${ECR_REGISTRY}/${ECR_REPOSITORY}:${TAG}"
+          
+          docker build -f Dockerfile --build-arg SKIP_TESTS=true -t "${DH_IMAGE}" .
+          docker tag "${DH_IMAGE}" "${ECR_IMAGE}"
+          
+          docker push "${DH_IMAGE}"
+          
+          docker push "${ECR_IMAGE}"
 
   release:
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
@@ -78,9 +118,13 @@ jobs:
       - name: Make Gradlew Executable
         run: chmod +x ./gradlew
 
+      - name: Get Project Name
+        id: project_name
+        run: echo "PROJECT_NAME=$(./gradlew -q properties | grep '^name:' | awk '{print $2}')" >> $GITHUB_ENV
+
       - name: Get Project Version
-        id: get_version
-        run: echo "VERSION=$(./gradlew -q printVersion)" >> $GITHUB_ENV
+        id: project_version
+        run: echo "VERSION=$(./gradlew -q properties | grep '^version:' | awk '{print $2}')" >> $GITHUB_ENV
 
       - name: Check for existing release tag (only on PR)
         if: github.event_name == 'pull_request'
@@ -96,18 +140,51 @@ jobs:
             echo "No existing release with tag v$VERSION found. Proceeding with build."
           fi
 
-      - name: Build and Push docker image
-        run: |
-          PROJECT_NAME=$(./gradlew -q printProjectName)
-          IMAGE_TAG="$PROJECT_NAME:v$VERSION"
-          docker build --file Dockerfile --build-arg SKIP_TESTS=true --tag $DOCKER_HUB_CLIENT_NAME/$IMAGE_TAG .
-          echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
-          docker push $DOCKER_HUB_CLIENT_NAME/$IMAGE_TAG
+      # Logins
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PAT }}
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Build and Push docker image (DockerHub + ECR)
         env:
+          PROJECT_NAME: ${{ env.PROJECT_NAME }}
           VERSION: ${{ env.VERSION }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_TOKEN }}
-          DOCKER_HUB_CLIENT_NAME: in2workspace
+          DOCKERHUB_ORG: ${{ secrets.DOCKERHUB_ORG }}
+          ECR_REGISTRY: ${{ steps.ecr.outputs.registry }}
+          ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
+        run: |
+          set -euo pipefail
+          TAG="v${VERSION}"
+
+          DH_IMAGE="docker.io/${DOCKERHUB_ORG}/${PROJECT_NAME}:${TAG}"
+          DH_LATEST="docker.io/${DOCKERHUB_ORG}/${PROJECT_NAME}:latest"
+
+          ECR_IMAGE="${ECR_REGISTRY}/${ECR_REPOSITORY}:${TAG}"
+          ECR_LATEST="${ECR_REGISTRY}/${ECR_REPOSITORY}:latest"
+
+          docker build -f Dockerfile --build-arg SKIP_TESTS=true -t "${DH_IMAGE}" .
+          docker tag "${DH_IMAGE}" "${DH_LATEST}"
+          docker tag "${DH_IMAGE}" "${ECR_IMAGE}"
+          docker tag "${DH_IMAGE}" "${ECR_LATEST}"
+
+          docker push "${DH_IMAGE}"
+          docker push "${DH_LATEST}"
+
+          docker push "${ECR_IMAGE}"
+          docker push "${ECR_LATEST}"
 
       - name: Create GitHub Release
         uses: actions/create-release@v1
 
@@ -4,9 +4,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v1.7.1](https://github.com/in2workspace/in2-issuer-api/releases/tag/v1.7.1)Add commentMore actions
-### Fixed
-- Assign always default config. email to Issuer.
+## [v2.0.0](https://github.com/in2workspace/in2-issuer-api/releases/tag/v2.0.0)
+### Added
+- Label credential issuance.
+- LEARCredentialMachine issuance.
+- Sign access request.
+- Revocation endpoint.
+- Revoke and expired credential notification.
+- Handle error when sending PIN and when serializing credential.
+- Handle errors in security chains flow.
+
+### Changed
+- Adapt endpoints to oid4vci.
+- Refactor SecurityConfig credential issuer filters.
+- Standardize error handling to RFC 7807 across all endpoints.
+- Move GlobalExceptionHandler to shared module and add specific ControllerAdvice for each domain.
+- Remove unused exceptions.
+
+
 
 ## [v1.7.0](https://github.com/in2workspace/in2-issuer-api/releases/tag/v1.7.0)
 ### Added
 
@@ -11,7 +11,8 @@ plugins {
 }
 
 group = 'es.in2'
-version = '1.7.1'
+
+version = '2.0.0'
 
 java {
     sourceCompatibility = '17'
@@ -197,18 +198,6 @@ tasks.jacocoTestReport {
     }))
 }
 
-tasks.register('printVersion') {
-    doLast {
-        println version
-    }
-}
-
-tasks.register('printProjectName') {
-    doLast {
-        println rootProject.name
-    }
-}
-
 def isNonStable = { String version ->
     def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) }
     def regex = /^[0-9,.v-]+(-r)?$/
@@ -219,4 +208,4 @@ tasks.named("dependencyUpdates").configure {
     rejectVersionIf {
         isNonStable(it.candidate.version)
     }
-}
+}
@@ -1 +1 @@
-rootProject.name = 'in2-issuer-backend'
+rootProject.name = 'eudistack-issuer-api'
@@ -0,0 +1,10 @@
+package es.in2.issuer.backend.backoffice.application.workflow;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface CredentialStatusWorkflow {
+    Flux<String> getCredentialsByListId(String processId, int listId);
+
+    Mono<Void> revokeCredential(String processId, String bearerToken, String credentialId, int listId);
+}
@@ -48,19 +48,14 @@ private Mono<CredentialOfferUriResponse> buildCredentialOfferUriInternal(String
                                                                         transactionCode,
                                                                         preAuthorizedCodeResponse.grants().preAuthorizedCode()
                                                                 )
-                                                                .then(
-                                                                        credentialProcedureService.getMandateeEmailFromDecodedCredentialByProcedureId(procedureId)
-                                                                )
-                                                                .flatMap(email ->
-                                                                        credentialOfferService.buildCustomCredentialOffer(
-                                                                                        credentialProcedure.getCredentialType(),
-                                                                                        preAuthorizedCodeResponse.grants(),
-                                                                                        email,
-                                                                                        preAuthorizedCodeResponse.pin()
-                                                                                )
-                                                                                .flatMap(credentialOfferCacheRepository::saveCustomCredentialOffer)
-                                                                                .flatMap(credentialOfferService::createCredentialOfferUriResponse)
-                                                                )
+                                                                .then(Mono.defer(() -> credentialOfferService.buildCustomCredentialOffer(
+                                                                                credentialProcedure.getCredentialType(),
+                                                                                preAuthorizedCodeResponse.grants(),
+                                                                                credentialProcedure.getOwnerEmail(),
+                                                                                preAuthorizedCodeResponse.pin()
+                                                                        )
+                                                                        .flatMap(credentialOfferCacheRepository::saveCustomCredentialOffer)
+                                                                        .flatMap(credentialOfferService::createCredentialOfferUriResponse)))
                                                 )
                                                 .flatMap(credentialOfferUri ->
                                                         deferredCredentialMetadataService.updateCacheStoreForCTransactionCode(transactionCode)
 
@@ -0,0 +1,102 @@
+package es.in2.issuer.backend.backoffice.application.workflow.impl;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import es.in2.issuer.backend.backoffice.application.workflow.CredentialStatusWorkflow;
+import es.in2.issuer.backend.backoffice.domain.service.CredentialStatusAuthorizationService;
+import es.in2.issuer.backend.backoffice.domain.service.CredentialStatusService;
+import es.in2.issuer.backend.backoffice.domain.exception.InvalidStatusException;
+import es.in2.issuer.backend.shared.domain.model.dto.credential.CredentialStatus;
+import es.in2.issuer.backend.shared.domain.model.entities.CredentialProcedure;
+import es.in2.issuer.backend.shared.domain.model.enums.CredentialStatusEnum;
+import es.in2.issuer.backend.shared.domain.service.AccessTokenService;
+import es.in2.issuer.backend.shared.domain.service.CredentialProcedureService;
+import es.in2.issuer.backend.shared.domain.service.EmailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import static es.in2.issuer.backend.shared.domain.model.enums.CredentialStatusEnum.*;
+
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class CredentialStatusWorkflowImpl implements CredentialStatusWorkflow {
+
+    private final CredentialStatusService credentialStatusService;
+    private final AccessTokenService accessTokenService;
+    private final CredentialStatusAuthorizationService credentialStatusAuthorizationService;
+    private final CredentialProcedureService credentialProcedureService;
+    private final ObjectMapper objectMapper;
+    private final EmailService emailService;
+
+    @Override
+    public Flux<String> getCredentialsByListId(String processId, int listId) {
+        return credentialStatusService.getCredentialsByListId(listId)
+                .doFirst(() -> log.debug("Process ID: {} - Getting Credentials Status...", processId))
+                .doOnComplete(() -> log.debug(
+                        "Process ID: {} - All Credential Status retrieved successfully.",
+                        processId));
+    }
+
+    @Override
+    public Mono<Void> revokeCredential(String processId, String bearerToken, String credentialId, int listId) {
+        return accessTokenService.getCleanBearerToken(bearerToken)
+                .flatMap(token -> credentialStatusAuthorizationService.authorize(processId, token, credentialId)
+                        .then(credentialProcedureService.getCredentialByCredentialId(credentialId))
+                )
+                .flatMap(credential -> validateStatus(credential.getCredentialStatus())
+                        .thenReturn(credential)
+                )
+                .flatMap(credential -> Mono.just(credential.getCredentialDecoded())
+                .flatMap(decodedCredential -> {
+                    JsonNode credentialStatusNode;
+                    try {
+                        credentialStatusNode = objectMapper.readTree(decodedCredential).get("credentialStatus");
+                    } catch (JsonProcessingException e) {
+                        return Mono.error(new JsonParseException("Error processing credential status json"));
+                    }
+                    CredentialStatus credentialStatus = mapToCredentialStatus(credentialStatusNode);
+                    return revokeAndUpdateCredentialStatus(credential, processId, credentialId, listId, credentialStatus);
+                }));
+
+    }
+    private CredentialStatus mapToCredentialStatus(JsonNode credentialStatusNode) {
+        return CredentialStatus.builder()
+                .id(credentialStatusNode.get("id").asText())
+                .type(credentialStatusNode.get("type").asText())
+                .statusPurpose(credentialStatusNode.get("statusPurpose").asText())
+                .statusListIndex(credentialStatusNode.get("statusListIndex").asText())
+                .statusListCredential(credentialStatusNode.get("statusListCredential").asText())
+                .build();
+    }
+
+    private Mono<Void> revokeAndUpdateCredentialStatus(CredentialProcedure credentialProcedure, String processId, String credentialId, int listId, CredentialStatus credentialStatus) {
+        return credentialStatusService.revokeCredential(listId, credentialStatus)
+                .then(credentialProcedureService.updateCredentialProcedureCredentialStatusToRevoke(credentialProcedure))
+                .doFirst(() -> log.debug(
+                        "Process ID: {} - Revoking Credential with ID: {}",
+                        processId,
+                        credentialId))
+                .then(emailService.notifyIfCredentialStatusChanges(credentialProcedure, REVOKED.toString()))
+                .doOnSuccess(
+                        aVoid -> log.debug(
+                        "Process ID: {} - Credential with ID: {} revoked successfully.",
+                        processId,
+                        credentialId));
+    }
+
+    private Mono<Void> validateStatus(CredentialStatusEnum credentialStatus) {
+        if (credentialStatus.equals(CredentialStatusEnum.VALID)) {
+            return Mono.empty();
+        } else {
+            return Mono.error(new InvalidStatusException(
+                    "Invalid status: " + credentialStatus));
+        }
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-rootProject.name = 'in2-issuer-backend'`
	`1`	`+rootProject.name = 'eudistack-issuer-api'`