community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dmgt-ra/certificate/bug' into 'master'

Browse Source 
Fix certification deletion issue in devicemgt react app

Closes product-iots#299

See merge request entgra/carbon-device-mgt!413
This commit is contained in:
Dharmakeerthi Lasantha 2020-01-07 07:05:12 +00:00
commit eda30dcf94
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java
View File

@ -306,8 +306,9 @@ public interface CertificateManagementAdminService {
@DELETE
@Path("/{serialNumber}")
@Consumes(MediaType.WILDCARD)
@ApiOperation(
consumes = MediaType.APPLICATION_JSON,
consumes = MediaType.WILDCARD,
produces = MediaType.APPLICATION_JSON,
httpMethod = "DELETE",
value = "Deleting an SSL Certificate",

2
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
View File

@ -18,6 +18,7 @@
package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.impl;
import javax.ws.rs.core.MediaType;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.CertificateManagementAdminService;
@ -145,6 +146,7 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
@DELETE
@Path("/{serialNumber}")
@Consumes(MediaType.WILDCARD)
public Response removeCertificate(@PathParam("serialNumber") String serialNumber) {
RequestValidationUtil.validateSerialNumber(serialNumber);

3
components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Configurations/Certificates/CertificateTable.js vendored
View File

@ -114,6 +114,7 @@ class CertificateTable extends React.Component {
{headers: {'Content-Type': 'application/json'}}
).then(res => {
if (res.status === 200) {
this.fetch();
notification["success"]({
message: "Done",
duration: 4,
@ -202,8 +203,6 @@ class CertificateTable extends React.Component {
}
];
render() {
const {data, pagination, loading} = this.state;