Enhance ticket creation api and UI to support ticket number of usage

Ticket uses left was already supported on core but no way to defined it, neither from UI neither from API Changed API to accept new optional field and update UI form to be able to set it from UI related #924
warp-tech · Mar 3, 2024 · 0289cdd · 0289cdd
1 parent 24f1b03
commit 0289cdd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/warpgate-admin/src/api/tickets_list.rs b/warpgate-admin/src/api/tickets_list.rs
@@ -24,7 +24,8 @@ enum GetTicketsResponse {
 struct CreateTicketRequest {
     username: String,
     target_name: String,
-    expiry: Option<DateTime<Utc>>
+    expiry: Option<DateTime<Utc>>,
+    number_of_usage: Option<i32>
 }
 
 #[derive(Object)]
@@ -87,6 +88,7 @@ impl Api {
             target: Set(body.target_name.clone()),
             created: Set(chrono::Utc::now()),
             expiry: Set(body.expiry),
+            uses_left: Set(body.number_of_usage),
             ..Default::default()
         };
 

diff --git a/warpgate-web/src/admin/CreateTicket.svelte b/warpgate-web/src/admin/CreateTicket.svelte
@@ -13,6 +13,7 @@ let users: User[]|undefined
 let selectedTarget: Target|undefined
 let selectedUser: User|undefined
 let selectedExpiry: string|undefined
+let selectedNumberOfUsage: number|undefined
 let result: TicketAndSecret|undefined
 
 async function load () {
@@ -39,6 +40,7 @@ async function create () {
                 username: selectedUser.username,
                 targetName: selectedTarget.name,
                 expiry: selectedExpiry ? new Date(selectedExpiry) : undefined,
+                numberOfUsage: selectedNumberOfUsage
             },
         })
     } catch (err) {
@@ -110,6 +112,10 @@ async function create () {
         <input type="datetime-local" bind:value={selectedExpiry} class="form-control"/>
     </FormGroup>
 
+    <FormGroup floating label="Number of usage (optional)">
+        <input type="number" bind:value={selectedNumberOfUsage} class="form-control"/>
+    </FormGroup>
+
     <AsyncButton
         outline
         click={create}

diff --git a/warpgate-web/src/admin/Tickets.svelte b/warpgate-web/src/admin/Tickets.svelte
@@ -4,7 +4,7 @@ import { link } from 'svelte-spa-router'
 import { Alert } from 'sveltestrap'
 import RelativeDate from './RelativeDate.svelte'
 import Fa from 'svelte-fa'
-import { faCalendarXmark, faCalendarCheck } from '@fortawesome/free-solid-svg-icons'
+import { faCalendarXmark, faCalendarCheck, faSquareXmark, faSquareCheck } from '@fortawesome/free-solid-svg-icons'
 
 let error: Error|undefined
 let tickets: Ticket[]|undefined
@@ -55,6 +55,11 @@ async function deleteTicket (ticket: Ticket) {
                             <Fa icon={ticket.expiry > new Date() ? faCalendarCheck : faCalendarXmark} fw /> Until {ticket.expiry?.toLocaleString()}
                         </small>
                     {/if}
+                    {#if ticket.usesLeft != null}
+                        <small class="text-muted ms-4">
+                            <Fa icon={ticket.usesLeft > 0 ? faSquareCheck : faSquareXmark} fw /> Uses left {ticket.usesLeft}
+                        </small>
+                    {/if}
                     <small class="text-muted me-4 ms-auto">
                         <RelativeDate date={ticket.created} />
                     </small>

diff --git a/warpgate-web/src/admin/lib/openapi-schema.json b/warpgate-web/src/admin/lib/openapi-schema.json
@@ -1127,6 +1127,10 @@
           "expiry": {
             "type": "string",
             "format": "date-time"
+          },
+          "number_of_usage": {
+            "type": "integer",
+            "format": "int32"
           }
         }
       },