Revize 4a772c43

Re #8583 - certificate.js and utilities.js using await

static/js/certificate.js

@@ -52 +52 @@
     },
     watch: {},
     methods: {
-        onCertificateDownload: function () {
-            onCertificateDownload(this.id);
+        onCertificateDownload: async function () {
+            await onCertificateDownload(this.id);
         },
-        onRootDownload: function () {
-            onCertificateRootDownload(this.id);
+        onRootDownload: async function () {
+            await onCertificateRootDownload(this.id);
         },
-        onChainDownload: function () {
-            onCertificateChainDownload(this.id);
+        onChainDownload: async function () {
+            await onCertificateChainDownload(this.id);
         },
-        onPublicKeyDownload: function () {
-            onPublicKeyDownload(this.id);
+        onPublicKeyDownload: async function () {
+            await onPublicKeyDownload(this.id);
         },
-        onPrivateKeyDownload: function () {
-            onPrivateKeyDownload(this.id);
+        onPrivateKeyDownload: async function () {
+            await onPrivateKeyDownload(this.id);
         },
-        onRevoke: function () {
+        onRevoke: async function () {
             document.body.scrollTop = 0;
             document.documentElement.scrollTop = 0;
-            axios.patch(API_URL + "certificates/" + this.id, {
-                status: "revoked",
-                reason: this.revocationReason
-            })
-                .then(function (response) {
-                    if (response.data["success"]) {
-                        certificateDetailsApp.successMessage = "Certificate revocation successful.";
-                    } else {
-                        certificateDetailsApp.errorMessage = "Certificate cannot be revoked - " + response.data["data"] + "!";
-                    }
-                })
-                .catch(function (error) {
-                    certificateDetailsApp.errorMessage = "An error occurred while revoking certificate";
+            try {
+                const response = await axios.patch(API_URL + "certificates/" + this.id, {
+                    status: "revoked",
+                    reason: this.revocationReason
                 });
+                if (response.data["success"]) {
+                    certificateDetailsApp.successMessage = "Certificate revocation successful.";
+                } else {
+                    certificateDetailsApp.errorMessage = "Certificate cannot be revoked - " + response.data["data"] + "!";
+                }
+            } catch (error) {
+                certificateDetailsApp.errorMessage = "An error occurred while revoking certificate";
+            }
         },
-        onDelete: function () {
+        onDelete: async function () {
             document.body.scrollTop = 0;
             document.documentElement.scrollTop = 0;
-            axios.delete(API_URL + "certificates/" + this.id)
-                .then(function (response) {
-                    if (response.data["success"]) {
-                        window.location.href = "/static/index.html?success=Certificate+successfully+deleted";
-                    } else {
-                        certificateDetailsApp.errorMessage = "Certificate cannot be deleted - " + response.data["data"] + "!";
-                    }
-                })
-                .catch(function (error) {
-                    certificateDetailsApp.errorMessage = "An error occurred while deleting certificate";
-                });
-        },
-        loadIssuedCertificates: function () {
-
+            try {
+                const response = await axios.delete(API_URL + "certificates/" + this.id);
+                if (response.data["success"]) {
+                    window.location.href = "/static/index.html?success=Certificate+successfully+deleted";
+                } else {
+                    certificateDetailsApp.errorMessage = "Certificate cannot be deleted - " + response.data["data"] + "!";
+                }
+            } catch (error) {
+                certificateDetailsApp.errorMessage = "An error occurred while deleting certificate";
+            }
         }
     },
-    mounted: function () {
+    mounted: async function () {
         // get details of the selected certificate
         const params = window.location.search;
         if (params !== "") {
@@ -113 +108 @@
             if (urlParams.get("id") != null) {
                 const id = urlParams.get("id");
                 this.id = id;
+                var loadedDetails = false;
                 // query certificate details
-                axios.get(API_URL + "certificates/" + id + "/details")
-                    .then(function (response) {
-                        if (response.data["success"]) {
-                            // display certificate
-                            certificateDetailsApp.certificate = response.data["data"];
-                            axios.get(API_URL + "certificates", {
-                                params: {
-                                    filtering: {
-                                        issuedby: parseInt(certificateDetailsApp.id)
-                                    }
-                                }
-                            })
-                                .then(function (response) {
-                                    if (response.data["success"]) {
-                                        response.data["data"].forEach(item => {
-                                            if (item.id != certificateDetailsApp.id) certificateDetailsApp.issuedCertificates.push(item)
-                                        })
-                                    } else {
-                                        certificateDetailsApp.issuedCertificates = [];
-                                    }
-                                })
-                                .catch(function (error) {
-                                    console.log(error);
-                                });
-                            certificateDetailsApp.loading = false;
-                            certificateDetailsApp.error = false;
-                        } else {
-                            // certificate does not exists
-                            console.error("Required certificate does not exists");
-                            certificateDetailsApp.loading = false;
-                            certificateDetailsApp.error = true;
-                        }
-                    })
-                    .catch(function (error) {
-                        // server error
-                        console.error(error);
+                try {
+                    const response = await axios.get(API_URL + "certificates/" + id + "/details");
+                    if (response.data["success"]) {
+                        // display certificate
+                        certificateDetailsApp.certificate = response.data["data"];
+                        loadedDetails = true;
+                    } else {
+                        // certificate does not exists
+                        console.error("Required certificate does not exists");
                         certificateDetailsApp.loading = false;
                         certificateDetailsApp.error = true;
-                    });
+                    }
+                } catch (error) {
+                    console.error(error);
+                    certificateDetailsApp.loading = false;
+                    certificateDetailsApp.error = true;
+                }
             } else {
                 // id was not provided as a URL parameter
                 console.error("URL does not contain 'id' parameter")
@@ -164 +138 @@
             certificateDetailsApp.loading = false;
             certificateDetailsApp.error = true;
         }
+
+        if (!loadedDetails) return;
+        try {
+            const response = await axios.get(API_URL + "certificates", {
+                params: {
+                    filtering: {
+                        issuedby: parseInt(certificateDetailsApp.id)
+                    }
+                }
+            });
+            if (response.data["success"]) {
+                response.data["data"].forEach(item => {
+                    if (item.id != certificateDetailsApp.id) certificateDetailsApp.issuedCertificates.push(item)
+                })
+            } else {
+                certificateDetailsApp.issuedCertificates = [];
+            }
+        } catch (error) {
+            console.log(error);
+        }
+        this.loading = false;
+        this.error = false;
     }
 });