Merge pull request #32 from tiagosiebler/orders

fix(): post req orders
tiagosiebler · Sep 19, 2024 · eac31a8 · eac31a8
2 parents 89df598 + f0b7d6f
commit eac31a8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/CBExchangeClient.ts b/src/CBExchangeClient.ts
@@ -423,7 +423,8 @@ export class CBExchangeClient extends BaseRestClient {
    * Get a single order by id.
    */
   getOrder(params: { order_id: string; market_type?: string }): Promise<any> {
-    return this.getPrivate(`/orders/${params.order_id}`, params);
+    const { order_id, ...otherParams } = params;
+    return this.getPrivate(`/orders/${order_id}`, otherParams);
   }
 
   /**
@@ -432,8 +433,9 @@ export class CBExchangeClient extends BaseRestClient {
    * Cancel a single open order by id.
    */
   cancelOrder(params: CancelCBExchOrderRequest): Promise<any> {
-    return this.deletePrivate(`/orders/${params.order_id}`, {
-      query: params,
+    const { order_id, ...otherParams } = params;
+    return this.deletePrivate(`/orders/${order_id}`, {
+      body: otherParams,
     });
   }
 

diff --git a/src/lib/BaseRestClient.ts b/src/lib/BaseRestClient.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import axios, { AxiosRequestConfig, AxiosResponse, Method } from 'axios';
 import https from 'https';
 import { nanoid } from 'nanoid';
@@ -397,9 +396,7 @@ export abstract class BaseRestClient {
     const encodeQueryStringValues = true;
 
     const requestBody = data?.body || data;
-    const requestBodyString = requestBody
-      ? JSON.stringify(data?.body || data)
-      : '';
+    const requestBodyString = requestBody ? JSON.stringify(requestBody) : '';
 
     if (signMethod === 'coinbase') {
       const clientType = this.getClientType();
@@ -458,7 +455,7 @@ export abstract class BaseRestClient {
           const timestampInSeconds = timestampInMs / 1000; // decimals are OK
 
           const signInput =
-            timestampInSeconds + method + endpoint + requestBodyString;
+            timestampInSeconds + method + endpoint + signRequestParams;
 
           if (!apiSecret) {
             throw new Error(`No API secret provided, cannot sign request.`);
@@ -483,6 +480,7 @@ export abstract class BaseRestClient {
             'CB-ACCESS-PASSPHRASE': apiPassphrase,
           };
 
+          // console.log('sign res: ', { signInput, ...headers });
           return {
             ...res,
             sign: sign,
@@ -656,10 +654,12 @@ export abstract class BaseRestClient {
       ...options.headers,
     };
 
-    const urlWithQueryParams =
-      options.url + '?' + signResult.queryParamsWithSign;
+    let urlWithQueryParams = options.url;
 
-    if (method === 'GET' || !params?.body) {
+    if (method === 'GET') {
+      if (signResult.queryParamsWithSign) {
+        urlWithQueryParams += signResult.queryParamsWithSign;
+      }
       return {
         ...options,
         headers: requestHeaders,