Add configure

dfpc-coe · Oct 7, 2024 · 36dac1f · 36dac1f
1 parent b03c649
commit 36dac1f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/api/web/src/components/Configure.vue b/api/web/src/components/Configure.vue
@@ -58,6 +58,8 @@
                                     <div class='mb-2'>
                                         <label class='mx-2'>Admin Certificate</label>
                                         <CertificateP12
+                                            @certs='body.certs = $event'
+                                            @err='err = $event'
                                         />
                                     </div>
                                     <div class='form-footer'>
@@ -66,7 +68,7 @@
                                             class='btn btn-primary w-100'
                                             @click='updateServer'
                                         >
-                                            Create Admin
+                                            Configure Server
                                         </button>
                                     </div>
                                 </template>

diff --git a/api/web/src/components/Connection/CertificateP12.vue b/api/web/src/components/Connection/CertificateP12.vue
@@ -54,7 +54,6 @@ export default {
         TablerInput
     },
     emits: [
-        'close',
         'certs'
     ],
     data: function() {
@@ -80,12 +79,20 @@ export default {
         });
     },
     methods: {
-        close: function() {
-            this.$emit('close');
-        },
         extract: function() {
             const certs = convertToPem(atob(this.file.split('base64,')[1]), this.password);
-            this.$emit('certs', certs);
+            const cert = certs.pemCertificate
+                .split('-----BEGIN CERTIFICATE-----')
+                .join('-----BEGIN CERTIFICATE-----\n')
+                .split('-----END CERTIFICATE-----')
+                .join('\n-----END CERTIFICATE-----');
+            const key = certs.pemKey
+                .split('-----BEGIN RSA PRIVATE KEY-----')
+                .join('-----BEGIN RSA PRIVATE KEY-----\n')
+                .split('-----END RSA PRIVATE KEY-----')
+                .join('\n-----END RSA PRIVATE KEY-----');
+
+            this.$emit('certs', { key, cert });
         }
     }
 }

diff --git a/api/web/src/components/ConnectionEdit.vue b/api/web/src/components/ConnectionEdit.vue
@@ -348,16 +348,8 @@ export default {
         },
         p12upload: function(certs) {
             this.modal.upload = false;
-            this.connection.auth.cert = certs.pemCertificate
-                .split('-----BEGIN CERTIFICATE-----')
-                .join('-----BEGIN CERTIFICATE-----\n')
-                .split('-----END CERTIFICATE-----')
-                .join('\n-----END CERTIFICATE-----');
-            this.connection.auth.key = certs.pemKey
-                .split('-----BEGIN RSA PRIVATE KEY-----')
-                .join('-----BEGIN RSA PRIVATE KEY-----\n')
-                .split('-----END RSA PRIVATE KEY-----')
-                .join('\n-----END RSA PRIVATE KEY-----');
+            this.connection.auth.cert = certs.cert;
+            this.connection.auth.key = certs.key;
         },
         create: async function() {
             for (const field of ['name', 'description' ]) {