refactor

senecajs · Nov 29, 2024 · adbd17a · adbd17a
1 parent c90fc48
commit adbd17a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 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
@@ -17,7 +17,6 @@ function generateAuthSign(signData: Map<string, string>) {
   sd.delete("apiSecret")
   const sdList: any = []
 
-
   sd.forEach((v: any) => {
     sdList.push(v)
   })
@@ -111,7 +110,9 @@ function TilloProvider(this: any, options: TilloProviderOptions) {
 
               const { clientRequestId, brand, currency, value, sector } = msg.q
 
-              const clientRId = clientRequestId || `${msg.q.user_id}-digitalissue-${timestamp}`
+              const clientRId = clientRequestId ||
+                `${msg.q.user_id}-${brand}-digitalissue-${value}-${timestamp}`
+
               const curr = currency || "GBP"
 
               const signData: Map<string, string> = new Map([
@@ -165,7 +166,7 @@ function TilloProvider(this: any, options: TilloProviderOptions) {
     }
 
     this.shared.headers = {
-      'API-Key': res.keymap.key.value,
+      'API-Key': res.keymap.apikey.value,
     }
 
     this.shared.secret = res.keymap.secret.value
@@ -183,7 +184,7 @@ function TilloProvider(this: any, options: TilloProviderOptions) {
 const defaults: TilloProviderOptions = {
 
   // NOTE: include trailing /
-  url: 'https://sandbox.tillo.dev/api/v2/',
+  url: 'https://app.tillo.io/',
 
   // Use global fetch by default - if exists
   fetch: ('undefined' === typeof fetch ? undefined : fetch),

diff --git a/test/local-config-template.js b/test/local-config-template.js
@@ -1,2 +1,4 @@
 module.exports = {
+  TILLO_API_KEY: '<API_KEY>',
+  TILLO_SECRET: '<SECRET>',
 }
diff --git a/test/tillo-provider.test.ts b/test/tillo-provider.test.ts
@@ -83,22 +83,22 @@ async function makeSeneca() {
       // debug: true,
       file: [__dirname + '/local-config.js;?'],
       var: {
-        $TILLO_KEY: String,
+        $TILLO_API_KEY: String,
         $TILLO_SECRET: String,
       }
     })
     .use('provider', {
       provider: {
         tillo: {
           keys: {
-            key: { value: '$TILLO_KEY' },
+            apikey: { value: '$TILLO_API_KEY' },
             secret: { value: '$TILLO_SECRET' },
           }
         }
       }
     })
     .use(TilloProvider, {
-      // fetch: Fetch,
+      url: 'https://sandbox.tillo.dev/api/v2/',
     })
 
   return seneca.ready()