refactor

senecajs · Nov 28, 2024 · 52a3f65 · 52a3f65
1 parent 8210992
commit 52a3f65
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 33 deletions.
diff --git a/dist/tillo-provider.js b/dist/tillo-provider.js
diff --git a/dist/tillo-provider.js.map b/dist/tillo-provider.js.map
diff --git a/src/tillo-provider.ts b/src/tillo-provider.ts
@@ -82,15 +82,15 @@ function TilloProvider(this: any, options: TilloProviderOptions) {
               const path = "brands"
               const timestamp = new Date().getTime().toString()
 
-              const options: Map<string, string> = new Map([
+              const signData: Map<string, string> = new Map([
                 ["apikey", this.shared.headers["API-Key"]],
                 ["method", "GET"],
                 ["path", path],
                 ["timestamp", timestamp],
                 ["apiSecret", this.shared.secret],
               ])
 
-              this.shared.headers.Signature = getAuthSignature(options)
+              this.shared.headers.Signature = getAuthSignature(signData)
               this.shared.headers.Timestamp = timestamp
               this.shared.headers.Accept = "application/json"
 
@@ -103,45 +103,45 @@ function TilloProvider(this: any, options: TilloProviderOptions) {
           }
         }
       },
-      digitalGC: {
+      dgc: {
         cmd: {
           save: {
             action: async function(this: any, entize: any, msg: any) {
               const timestamp = new Date().getTime().toString()
-              const clientRequestId = `${msg.q.user_id}-digitalissue-${timestamp}`
-              const brand = msg.q.brand
-              const currency = msg.q?.currency || "GBP"
-              const value = msg.q.value
-              const sector = msg.q?.sector || "other"
 
-              const options: Map<string, string> = new Map([
+              const { clientRequestId, brand, currency, value, sector } = msg.q
+
+              const clientRId = clientRequestId || `${msg.q.user_id}-digitalissue-${timestamp}`
+              const curr = currency || "GBP"
+
+              const signData: Map<string, string> = new Map([
                 ["apikey", this.shared.headers["API-Key"]],
                 ["method", "POST"],
                 ["path", "digital-issue"],
-                ["clientRequestId", clientRequestId],
+                ["clientRequestId", clientRId],
                 ["brand", brand],
-                ["currency", currency],
+                ["currency", curr],
                 ["value", value],
                 ["timestamp", timestamp],
                 ["apiSecret", this.shared.secret],
               ])
 
-              this.shared.headers.Signature = getAuthSignature(options)
+              this.shared.headers.Signature = getAuthSignature(signData)
               this.shared.headers.Timestamp = timestamp
               this.shared.headers.Accept = "application/json"
 
               let json: any =
                 await postJSON(makeUrl('digital/issue'), makeConfig({
                   body: {
-                    client_request_id: clientRequestId,
+                    client_request_id: clientRId,
                     brand: brand,
                     face_value: {
                       amount: value,
-                      currency,
+                      currency: curr,
                     },
                     delivery_method: 'url',
                     fulfilment_by: 'partner',
-                    sector: sector
+                    sector: sector || "other"
                   }
                 }))
 

diff --git a/test/tillo-provider.test.ts b/test/tillo-provider.test.ts
@@ -57,7 +57,7 @@ describe('tillo-provider', () => {
   //   if (!Config) return;
   //   const seneca = await makeSeneca()
   //
-  //   const redeemTemplate = await seneca.entity("provider/tillo/digitalGC").save$({
+  //   const redeemTemplate = await seneca.entity("provider/tillo/dgc").save$({
   //     user_id: "user01",
   //     brand: "hobbycraft",
   //     value: 10.00,