Merge pull request #402 from madawas/EMM-1298

Fix for EMM-1298

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java

@@ -17,6 +17,7 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -42,8 +43,10 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
             for (EnrollmentCertificate enrollmentCertificate : enrollmentCertificates) {
                 certificate = new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
                 certificate.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
-                certificate.setSerial(enrollmentCertificate.getSerial());
+                X509Certificate x509Certificate = certificateService
-                certificate.setCertificate(certificateService.pemToX509Certificate(enrollmentCertificate.getPem()));
+                        .pemToX509Certificate(enrollmentCertificate.getPem());
+                certificate.setSerial(x509Certificate.getSerialNumber().toString());
+                certificate.setCertificate(x509Certificate);
                 certificates.add(certificate);
             }
             certificateService.saveCertificate(certificates);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs

@@ -51,14 +51,6 @@
                                 <div id="certificate-create-error-msg" class="alert alert-danger hidden" role="alert">
                                     <i class="icon fw fw-error"></i><span></span>
                                 </div>
-
-                                <label class="wr-input-label ">
-                                    Serial Number *
-                                </label>
-                                <br>
-                                <div id="serialNoInputField" class="form-group wr-input-control">
-                                    <input type="text" id="serialNo" class="form-control"/>
-                                </div>
                                 <label class="wr-input-label">Certificate *</label>
                                 <div id="certificateField" class="form-group wr-input-control">
                                     <input type="file" id="certificate" class="form-control"/>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/public/js/certificate-create.js

@@ -92,17 +92,11 @@ $(document).ready(function () {
      * when a user clicks on "Add Certificate" button.
      */
     $("button#add-certificate-btn").click(function () {
-        var serialNoInput = $("input#serialNo");
+        if (!pemContent) {
-        var serialNo = serialNoInput.val();
-        if (!serialNo) {
-            $(errorMsg).text("Serial Number is a required field. It cannot be empty.");
-            $(errorMsgWrapper).removeClass("hidden");
-        } else if (!pemContent) {
             $(errorMsg).text(" .pem file must contains certificate information.");
             $(errorMsgWrapper).removeClass("hidden");
         } else {
             var addCertificateFormData = {};
-            addCertificateFormData.serial = serialNo;
             addCertificateFormData.pem = pemContent;
             var certificateList = [];
             certificateList.push(addCertificateFormData);