API for update verified credential

docker-compose.yml

@@ -290,6 +290,7 @@ services:
     image: redis:latest
     ports:
       - "6379:6379"
+
   digilocker-certificate-api:
     image: dockerhub/sunbird-rc-digilocker-certificate-api
     volumes:

docker-compose.yml.save

@@ -0,0 +1,283 @@
+version: "2.4"
+
+services:
+  es:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.10.1
+    environment:
+      - discovery.type=single-node
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - ELASTIC_PASSWORD=
+      - xpack.security.enabled=false
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "localhost:9200/_cluster/health", "--header",  "Authorization: Basic ZWxhc3RpYzpEa0llZFBQU0Ni" ]
+      interval: 30s
+      timeout: 10s
+      retries: 4
+  db:
+    image: postgres
+    volumes:
+      - ./${DB_DIR-db-data}:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_DB=registry
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+  registry:
+    image: dockerhub/sunbird-rc-core:latest
+    volumes:
+      - ./schema:/home/sunbirdrc/config/public/_schemas
+    environment:
+      - connectionInfo_uri=jdbc:postgresql://db:5432/registry
+      - connectionInfo_username=postgres
+      - connectionInfo_password=postgres
+      - elastic_search_connection_url=es:9200
+      - elastic_search_auth_enabled=false
+      - elastic_search_username=
+      - elastic_search_password=
+      - search_providerName=dev.sunbirdrc.registry.service.ElasticSearchService
+      - sunbird_sso_realm=sunbird-rc
+      - sunbird_sso_url=http://keycloak:8080/auth
+      - sunbird_sso_admin_client_id=admin-api
+      - sunbird_sso_client_id=registry-frontend
+      - sunbird_sso_admin_client_secret=45678
+      - claims_url=http://claim-ms:8082
+      - sign_url=http://certificate-signer:8079/sign
+      - verify_url=http://certificate-signer:8079/verify
+      - sign_health_check_url=http://certificate-signer:8079/health
+      - signature_enabled=true
+      - pdf_url=http://certificate-api:8078/api/v1/certificatePDF
+      - certificate_health_check_url=http://certificate-api:8078/health
+      - template_base_url=http://registry:8081/api/v1/templates/ #Looks for certificate templates for pdf copy of the signed certificate
+      - sunbird_keycloak_user_set_password=true
+      - filestorage_connection_url=http://file-storage:9000
+      - filestorage_access_key=admin
+      - filestorage_secret_key=12345678
+      - filestorage_bucket_key=issuance
+      - registry_base_apis_enable=false
+      - sunbird_keycloak_user_password=abcd@123
+      - logging.level.root=INFO
+      - enable_external_templates=true
+      - async_enabled=false
+      - authentication_enabled=true
+      - kafka_bootstrap_address=kafka:9092
+      - webhook_enabled=false
+      - webhook_url=http://localhost:5001/api/v1/callback
+      - redis_host=redis
+      - redis_port=6379
+      - manager_type=DefinitionsManager
+    ports:
+      - "8081:8081"
+    depends_on:
+      es:
+        condition: service_healthy
+      db:
+        condition: service_healthy
+    healthcheck:
+      test: [ "CMD-SHELL", "wget -nv -t1 --spider http://localhost:8081/health || exit 1" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+  keycloak:
+    image: dockerhub/sunbird-rc-keycloak:latest
+    volumes:
+      - ./imports:/opt/jboss/keycloak/imports
+    environment:
+      - DB_VENDOR=postgres
+      - DB_ADDR=db
+      - DB_PORT=5432
+      - DB_DATABASE=registry
+      - DB_USER=postgres
+      - DB_PASSWORD=postgres
+      - KEYCLOAK_USER=admin
+      - KEYCLOAK_PASSWORD=admin
+      - KEYCLOAK_IMPORT=/opt/jboss/keycloak/imports/realm-export.json
+      - PROXY_ADDRESS_FORWARDING=true
+      - KEYCLOAK_LOGO=https://raw.githubusercontent.com/Sunbird-RC/demo-education-registry/federated_edu_registry/imports/ndearLogo.svg
+      - KEYCLOAK_PORTAL_TITLE=Education
+      - KEYCLOAK_PORTAL_SUB_TITLE=
+      - VALIDATE_NONCE=false
+      - KEYCLOAK_URL=http://localhost:8080/auth
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:9990/ || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    ports:
+      - "8080:8080"
+      - "9990:9990"
+    depends_on:
+      - db
+  claim-ms:
+    image: dockerhub/sunbird-rc-claim-ms:${RELEASE_VERSION}
+    environment:
+      - connectionInfo_uri=jdbc:postgresql://db:5432/registry
+      - connectionInfo_username=postgres
+      - connectionInfo_password=postgres
+      - sunbirdrc_url=http://registry:8081
+    ports:
+      - "8082:8082"
+    depends_on:
+      db:
+        condition: service_started
+      registry:
+        condition: service_started
+    healthcheck:
+      test: [ "CMD-SHELL", "wget -nv -t1 --spider http://localhost:8082/health || exit 1" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+  certificate-signer:
+    image: dockerhub/sunbird-rc-certificate-signer:${RELEASE_VERSION}
+    environment:
+      - PORT=8079
+    ports:
+      - "8079:8079"
+    volumes:
+      - ./imports:/etc/signer
+    healthcheck:
+      test:
+        [ "CMD-SHELL", "curl -f http://localhost:8079/health || exit 1" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+  certificate-api:
+    image: dockerhub/sunbird-rc-certificate-api:${RELEASE_VERSION}
+    environment:
+      - PORT=8078
+    ports:
+      - "8078:8078"
+    healthcheck:
+      test:
+        [ "CMD-SHELL", "wget -nv -t1 --spider http://localhost:8078/health || exit 1" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+  file-storage:
+    image: quay.io/minio/minio
+    volumes:
+      - ${HOME}/minio/data:/data
+    environment:
+      - MINIO_ROOT_USER=admin
+      - MINIO_ROOT_PASSWORD=12345678
+    command: server --address 0.0.0.0:9000 --console-address 0.0.0.0:9001 /data
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
+      interval: 30s
+      timeout: 20s
+      retries: 10
+  notification-ms:
+    image: dockerhub/sunbird-rc-notification-service:${RELEASE_VERSION}
+    ports:
+      - "8765:8765"
+    healthcheck:
+      test:
+        [ "CMD-SHELL", "wget -nv -t1 --spider http://localhost:8765/notification-service/v1/health || exit 1" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+  zookeeper:
+    image: confluentinc/cp-zookeeper:latest
+    ports:
+      - "2181:2181"
+    environment:
+      ZOOKEEPER_CLIENT_PORT: "2181"
+      ZOOKEEPER_TICK_TIME: "2000"
+  kafka:
+    image: confluentinc/cp-kafka:latest
+    depends_on:
+      zookeeper:
+        condition: service_started
+    ports:
+      - "9092:9092"
+    environment:
+      KAFKA_BROKER_ID: "1"
+      KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
+      KAFKA_ADVERTISED_LISTENERS: "INTERNAL://kafka:9092,OUTSIDE://localhost:9094"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INTERNAL:PLAINTEXT,OUTSIDE:PLAINTEXT"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL"
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: "1"
+    healthcheck:
+      test:
+        [ "CMD", "kafka-topics", "--list", "--zookeeper", "zookeeper:2181" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+  public-key-service:
+    image: dockerhub/sunbird-rc-public-key-service
+    environment:
+      - CONFIG_BASE_PATH=/etc/keys
+    ports:
+      - "3300:3300"
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "localhost:3300/public-key-service/api/v1/health" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+    volumes:
+      - ./imports:/etc/keys
+  context-proxy-service:
+    image: dockerhub/sunbird-rc-context-proxy-service
+    ports:
+      - "4400:4400"
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "localhost:4400/health" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+  nginx:
+    image: dockerhub/sunbird-rc-nginx
+    ports:
+      - "80:80"
+    depends_on:
+      registry:
+        condition: service_healthy
+      context-proxy-service:
+        condition: service_started
+      public-key-service:
+        condition: service_started
+      keycloak:
+        condition: service_started
+      claim-ms:
+        condition: service_started
+      file-storage:
+        condition: service_started
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "localhost:80" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+  redis:
+    image: redis:latest
+    ports:
+      - "6379:6379"
+  digilocker-certificate-api:
+    image: dockerhub/sunbird-digilocker-certificate-api:latest
+    volumes:
+      - ${PWD}/services/digilocker-certificate-api/config/:/go/config/
+    ports:
+      - "8087:8087"
+    environment:
+      KEYCLOAK_CLIENT_ID: admin-api
+      KEYCLOAK_CLIENT_SECRET: ${KEYCLOAK_SECRET}
+      DIGILOCKER_HMAC_AUTHKEY: ${DIGILOCKER_HMAC_AUTHKEY}
+      DIGILOCKER_AUTH_KEYNAME: x-digilocker-hmac
+      PORT: 8087
+  bulk_issuance:
+    image: dockerhub/sunbird-rc-bulk-issuance
+    ports:
+      - "5665:5665"
+    environment:
+      REGISTRY_BASE_URL: http://registry:8081/
+      DATABASE_HOST: db

java/registry/src/main/java/dev/sunbirdrc/registry/controller/RegistryEntityController.java

@@ -226,7 +226,6 @@ public ResponseEntity<Object> putEntity(
         String userId = USER_ANONYMOUS;
         if (registryHelper.doesEntityOperationRequireAuthorization(entityName)) {
             try {
-
                 userId = registryHelper.authorize(entityName, entityId, request);
             } catch (Exception e) {
                 return createUnauthorizedExceptionResponse(e);
@@ -237,7 +236,6 @@ public ResponseEntity<Object> putEntity(
         ((ObjectNode) rootNode).put(uuidPropertyName, entityId);
         ObjectNode newRootNode = objectMapper.createObjectNode();
         newRootNode.set(entityName, rootNode);
-
         try {
             checkEntityNameInDefinitionManager(entityName);
             String tag = "RegistryController.update " + entityName;
@@ -249,13 +247,11 @@ public ResponseEntity<Object> putEntity(
                         existingNode.get(entityName).get(OSSystemFields._osSignedData.name()).asText(""));
             }
             registryHelper.updateEntityAndState(existingNode, newRootNode, userId);
-
             registryHelper.invalidateAttestation(entityName, entityId, userId, null);
             registryHelper.autoRaiseClaim(entityName, entityId, userId, existingNode, newRootNode, emailId);
             responseParams.setErrmsg("");
             responseParams.setStatus(Response.Status.SUCCESSFUL);
             watch.stop(tag);
-
             return new ResponseEntity<>(response, HttpStatus.OK);
 
         } catch (RecordNotFoundException e) {

java/registry/src/main/java/dev/sunbirdrc/registry/entities/UpdateCredential.java

@@ -0,0 +1,20 @@
+package dev.sunbirdrc.registry.entities;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Builder
+@EqualsAndHashCode
+public class UpdateCredential {
+    private String entity;
+    private String entityId;
+    private String attestationProperty;
+    private String attestationPropertyId;
+    private String signedData;
+    private String signedHash;
+    private String userId;
+}
+
+

java/registry/src/main/java/dev/sunbirdrc/registry/service/impl/RegistryServiceImpl.java

@@ -382,7 +382,6 @@ public void updateEntity(Shard shard, String userId, String id, String jsonStrin
 
                 if (isInternalRegistry(entityType) && isElasticSearchEnabled()) {
                     if (addShardPrefixForESRecord && !shard.getShardLabel().isEmpty()) {
-                        // Replace osid with shard details
                         String prefix = shard.getShardLabel() + RecordIdentifier.getSeparator();
                         JSONUtil.addPrefix((ObjectNode) mergedNode, prefix, new ArrayList<>(Collections.singletonList(uuidPropertyName)));
                     }