From 9af14d26a752a5200a5f5f97c7ec80537b437276 Mon Sep 17 00:00:00 2001
From: CybAtax <62847599+CybAtax@users.noreply.github.com>
Date: Sun, 17 Nov 2024 22:11:35 +0100
Subject: [PATCH] fix: add missing fields

---
 frontend/src/pages/cert-request.vue | 128 +++++++++++++++++++---------
 frontend/src/types/certificate.d.ts |   1 +
 frontend/src/types/util.d.ts        |   4 +-
 3 files changed, 92 insertions(+), 41 deletions(-)

diff --git a/frontend/src/pages/cert-request.vue b/frontend/src/pages/cert-request.vue
index 3efd277..78c2f04 100644
--- a/frontend/src/pages/cert-request.vue
+++ b/frontend/src/pages/cert-request.vue
@@ -7,17 +7,17 @@
           <v-row>
             <v-col cols="12" md="4">
               <v-text-field
-                v-model="country"
-                :rules="countryRules"
+                v-model="subject.country"
+                :rules="subject.countryRules"
                 label="Country"
                 required
               />
             </v-col>
             <v-col cols="12" md="4">
               <v-text-field
-                v-model="state"
+                v-model="subject.state"
                 :counter="10"
-                :rules="stateRules"
+                :rules="subject.stateRules"
                 label="State"
                 required
               />
@@ -25,8 +25,8 @@
 
             <v-col cols="12" md="4">
               <v-text-field
-                v-model="city"
-                :rules="cityRules"
+                v-model="subject.city"
+                :rules="subject.cityRules"
                 label="City"
                 required
               />
@@ -35,53 +35,81 @@
           <v-row>
             <v-col cols="12" md="4">
               <v-text-field
-                v-model="organization"
-                :rules="organizationRules"
+                v-model="subject.organization"
+                :rules="subject.organizationRules"
                 label="Organization"
                 required
               />
             </v-col>
             <v-col cols="12" md="4">
               <v-text-field
-                v-model="orgUnit"
-                :rules="orgUnitRules"
+                v-model="subject.orgUnit"
+                :rules="subject.orgUnitRules"
                 label="Organization Unit"
                 required
               />
             </v-col>
             <v-col cols="12" md="4">
               <v-text-field
-                v-model="commonName"
+                v-model="subject.commonName"
                 :counter="10"
-                :rules="commonNameRules"
+                :rules="subject.commonNameRules"
                 label="Common name"
                 required
               />
             </v-col>
           </v-row>
+          <v-row>
+            <v-col cols="12" md="4">
+              <v-text-field type="number" v-model="validity.duration" label="Duration for validity in Days"/>
+            </v-col>
+          </v-row>
+          <v-row>
+            <v-col cols="12" md="6">
+              <v-text-field label="Alternative Names" v-model="ui.altName">
+                <template v-slot:append>
+                  <v-btn icon="mdi-plus" color="green" :disabled="!ui.altName" @click="addAltName"/>
+                </template>
+              </v-text-field>
+            </v-col>
+            <v-col cols="12" md="6">
+              <v-combobox
+                v-model="subject.altNames"
+                :items="subject.altNames"
+                label="Alternative Names"
+                multiple
+              >
+                <template v-slot:selection="data">
+                  <v-chip
+                    :key="JSON.stringify(data.item)"
+                    v-bind="data"
+                    size="small"
+                  >
+                    {{ data.item.title }}
+                  </v-chip>
+                </template>
+              </v-combobox>
+            </v-col>
+          </v-row>
+          <v-row>
+            <v-col cols="12" md="12">
+              <v-textarea v-model="trustingAuthority" label="Trusting Authority"/>
+            </v-col>
+          </v-row>
         </v-container>
       </v-form>
     </v-card-item>
     <v-card-actions>
       <v-col class="text-right">
-        <v-btn onclick="requestCertificate()" text="Request certificate" prepend-icon="mdi-certificate"/>
+        <v-btn :disabled="!valid" @click="requestCertificate" text="Request certificate" prepend-icon="mdi-certificate"/>
       </v-col>
     </v-card-actions>
   </v-card>
 </template>
 
 <script lang="ts">
-
-import type { Valid } from "@/types/util";
-
-type FormData = {
-  country: string;
-  state: string;
-  city: string;
-  organization: string;
-  orgUnit: string;
-  commonName: string;
-}
+import type { Validated } from "@/types/util";
+import type { Certificate, Subject, Validity } from "@/types/certificate";
 
 const requiredValidation = (fieldName: string) => {
   return (val: string) => {
@@ -90,21 +118,45 @@ const requiredValidation = (fieldName: string) => {
   }
 }
 
-export default {
-  data: (): Partial<Valid<FormData>> & Required<FormData> => ({
-    valid: false,
-    country: '',
-    countryRules: [requiredValidation("Country")],
-    state: '',
-    city: '',
-    organization: '',
-    orgUnit: '',
-    commonName: '',
-    commonNameRules: [requiredValidation("Common Name")],
-  }),
+type SubjectInput = Partial<Validated<Subject>> & Required<Subject>;
+type ValidityInput = Validated<{duration: number}>;//Partial<Valid<Validity>> & Required<Validity>;
+type UiInput = {
+  altName: string;
 }
 
-export function requestCertificate() {
-  throw new Error("Not supported yet");
+export default {
+  data: (): {valid: boolean, subject: SubjectInput; validity: ValidityInput; trustingAuthority: string; ui: UiInput} => ({
+    valid: false,
+    subject: {
+      country: '',
+      countryRules: [requiredValidation("Country")],
+      state: '',
+      city: '',
+      organization: '',
+      orgUnit: '',
+      commonName: '',
+      commonNameRules: [requiredValidation("Common Name")],
+      altNames: [],
+    },
+    validity: {
+      duration: undefined as unknown as number,
+      durationRules: [
+        requiredValidation("Validity duration"),
+      ]
+    },
+    trustingAuthority: '',
+    ui: {
+      altName: '',
+    },
+  }),
+  methods: {
+    addAltName() {
+      this.subject.altNames.push(this.ui.altName)
+      this.ui.altName = ''
+    },
+    requestCertificate(): Certificate {
+      throw new Error("Not supported yet");
+    },
+  }
 }
 </script>
diff --git a/frontend/src/types/certificate.d.ts b/frontend/src/types/certificate.d.ts
index 1fbaf20..5e576da 100644
--- a/frontend/src/types/certificate.d.ts
+++ b/frontend/src/types/certificate.d.ts
@@ -5,6 +5,7 @@ export interface Subject {
   country: string;
   state: string;
   city: string
+  altNames: string[];
 }
 
 export interface Validity {
diff --git a/frontend/src/types/util.d.ts b/frontend/src/types/util.d.ts
index eefe08e..8599ffa 100644
--- a/frontend/src/types/util.d.ts
+++ b/frontend/src/types/util.d.ts
@@ -1,5 +1,3 @@
-export type Valid<T> = {
+export type Validated<T> = {
   [K in keyof T as `${K}Rules`]: ((val: string) => true | string)[]
-} & {
-  valid: boolean;
 } & T;