Merge pull request #1251 from ajay-beehyv/HLM-638

HLM-638 | Changes in verify certificate for revocation
egovernments · Sep 21, 2022 · 514bc32 · 514bc32
2 parents c5b820f + c301770
commit 514bc32
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/backend/vc-certification-service/src/controllers/certificate.controller.js b/backend/vc-certification-service/src/controllers/certificate.controller.js
@@ -4,7 +4,7 @@ const sunbirdRegistryService = require('../services/sunbird.service')
 const certifyConstants = require('../configs/constants');
 const {validationResult} = require('express-validator');
 const validationService = require('../services/validation.service');
-const {truncateShard} = require("../utils/certification.utils");
+const {truncateShard, extractFromArray} = require("../utils/certification.utils");
 
 const REVOKED = "REVOKED";
 const SUSPENDED = "SUSPENDED";
@@ -153,17 +153,19 @@ function getRevokeBody(req) {
 
 async function verifyCertificate (req,res){
     const certificate = req.body;
-    const certificateEntityType = certificate.evidence[0].type[0];
     const revokeEntityType = certifyConstants.REVOKED_ENTITY_TYPE;
-    const token = req.header("Authorization");
-    let certificateId= certificate.credentialSubject.id;
     let certificateStatus = "";
     let msg = "";
-    console.log({certificateId: certificateId});
-    let body = {
+    const token = "";
+
+    const body = {
         signedCredentials : certificate,
     }
     try{
+        const certificateEntityType = extractFromArray(extractFromArray(certificate.evidence).type);
+        const certificateId = extractFromArray(certificate.evidence).certificateId;
+        console.log({certificateEntityType: certificateEntityType, certificateId:certificateId });
+
         const verifyResp = await sunbirdRegistryService.verifyCertificate(body)
         if(verifyResp.verified){
             const certificateResponse = await getEntity(certificateId,"certificateId",certificateEntityType,token);

diff --git a/backend/vc-certification-service/src/routes/certificate.route.js b/backend/vc-certification-service/src/routes/certificate.route.js
@@ -14,5 +14,5 @@ router.get(`/certificate/:entityName/:certificateId`, authMiddleware, certificat
 router.put(`/certify/:entityType`, authMiddleware, (req, res) => certificateController.updateCertificate(req, res, kafkaProducer));
 router.post(`/certificate/revoke`, [authMiddleware, body(["entityName", "certificateId"], "Missing entityName or CertificateId in request body").exists()], certificateController.revokeCertificate);
 router.delete(`/certificate/revoke/:entityName/:revokedCertificateId`, [authMiddleware, param([ "entityName","revokedCertificateId"], "Missing entityName or Revoked CertificateId in request body").exists()], (req, res) => certificateController.deleteRevokeCertificate(req, res, kafkaProducer));
-router.post(`/certificate/verify`, authMiddleware, certificateController.verifyCertificate);
+router.post(`/certificate/verify`, certificateController.verifyCertificate);
 module.exports = {certifyRouter: router, setKafkaProducer}
diff --git a/backend/vc-certification-service/src/utils/certification.utils.js b/backend/vc-certification-service/src/utils/certification.utils.js
@@ -1,7 +1,15 @@
 const truncateShard = (osId) => {
     return osId?.substring(2);
 }
-
+const extractFromArray = (object) => {
+    if (object) {
+        object = Array.isArray(object) ? object[0] : object;
+    } else {
+        throw new CustomError(`${object} not available`, 400).error();
+    }
+    return object;
+}
 module.exports = {
-    truncateShard
+    truncateShard,
+    extractFromArray
 }