Merge pull request #94 from gocardless/template-changes

Changes from gocardless-nodejs-template
gocardless · Apr 15, 2021 · 69df83e · 69df83e
2 parents cc1162d + 3090d01
commit 69df83e
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 37 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gocardless-nodejs",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Node.js client for the GoCardless API - a powerful, simple solution for the collection of recurring bank-to-bank payments",
   "author": "GoCardless Ltd <[email protected]>",
   "repository": {

diff --git a/src/constants.ts b/src/constants.ts
@@ -5,7 +5,7 @@ enum Environments {
   Sandbox = 'SANDBOX',
 }
 
-const CLIENT_VERSION = '2.0.0';
+const CLIENT_VERSION = '2.1.0';
 const API_VERSION = '2015-07-06';
 
 export { Environments, CLIENT_VERSION, API_VERSION };
diff --git a/src/services/bankAuthorisationService.ts b/src/services/bankAuthorisationService.ts
@@ -71,7 +71,7 @@ export class BankAuthorisationService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: BankAuthorisationResponse = {
-      ...response.body['bank_authorisations'],
+      ...(response.body?.['bank_authorisations'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/bankDetailsLookupService.ts b/src/services/bankDetailsLookupService.ts
@@ -66,7 +66,7 @@ export class BankDetailsLookupService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: BankDetailsLookupResponse = {
-      ...response.body['bank_details_lookups'],
+      ...(response.body?.['bank_details_lookups'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/billingRequestFlowService.ts b/src/services/billingRequestFlowService.ts
@@ -52,7 +52,7 @@ export class BillingRequestFlowService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: BillingRequestFlowResponse = {
-      ...response.body['billing_request_flows'],
+      ...(response.body?.['billing_request_flows'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/billingRequestService.ts b/src/services/billingRequestService.ts
@@ -217,7 +217,7 @@ export class BillingRequestService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: BillingRequestResponse = {
-      ...response.body['billing_requests'],
+      ...(response.body?.['billing_requests'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/creditorBankAccountService.ts b/src/services/creditorBankAccountService.ts
@@ -125,7 +125,7 @@ export class CreditorBankAccountService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: CreditorBankAccountResponse = {
-      ...response.body['creditor_bank_accounts'],
+      ...(response.body?.['creditor_bank_accounts'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/creditorService.ts b/src/services/creditorService.ts
@@ -126,7 +126,7 @@ export class CreditorService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: CreditorResponse = {
-      ...response.body['creditors'],
+      ...(response.body?.['creditors'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/customerBankAccountService.ts b/src/services/customerBankAccountService.ts
@@ -129,7 +129,7 @@ export class CustomerBankAccountService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: CustomerBankAccountResponse = {
-      ...response.body['customer_bank_accounts'],
+      ...(response.body?.['customer_bank_accounts'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/customerService.ts b/src/services/customerService.ts
@@ -241,7 +241,7 @@ export class CustomerService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: CustomerResponse = {
-      ...response.body['customers'],
+      ...(response.body?.['customers'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/instalmentScheduleService.ts b/src/services/instalmentScheduleService.ts
@@ -204,7 +204,7 @@ export class InstalmentScheduleService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: InstalmentScheduleResponse = {
-      ...response.body['instalment_schedules'],
+      ...(response.body?.['instalment_schedules'] ?? response),
       __response__: response.__response__,
     };
 
@@ -230,7 +230,7 @@ export class InstalmentScheduleService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: InstalmentScheduleResponse = {
-      ...response.body['instalment_schedules'],
+      ...(response.body?.['instalment_schedules'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/mandateImportEntryService.ts b/src/services/mandateImportEntryService.ts
@@ -79,7 +79,7 @@ export class MandateImportEntryService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: MandateImportEntryResponse = {
-      ...response.body['mandate_import_entries'],
+      ...(response.body?.['mandate_import_entries'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/mandateImportService.ts b/src/services/mandateImportService.ts
@@ -45,7 +45,7 @@ export class MandateImportService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: MandateImportResponse = {
-      ...response.body['mandate_imports'],
+      ...(response.body?.['mandate_imports'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/mandatePdfService.ts b/src/services/mandatePdfService.ts
@@ -160,7 +160,7 @@ export class MandatePdfService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: MandatePdfResponse = {
-      ...response.body['mandate_pdfs'],
+      ...(response.body?.['mandate_pdfs'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/mandateService.ts b/src/services/mandateService.ts
@@ -136,7 +136,7 @@ export class MandateService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: MandateResponse = {
-      ...response.body['mandates'],
+      ...(response.body?.['mandates'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/payerAuthorisationService.ts b/src/services/payerAuthorisationService.ts
@@ -86,7 +86,7 @@ export class PayerAuthorisationService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: PayerAuthorisationResponse = {
-      ...response.body['payer_authorisations'],
+      ...(response.body?.['payer_authorisations'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/paymentService.ts b/src/services/paymentService.ts
@@ -205,7 +205,7 @@ export class PaymentService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: PaymentResponse = {
-      ...response.body['payments'],
+      ...(response.body?.['payments'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/redirectFlowService.ts b/src/services/redirectFlowService.ts
@@ -91,7 +91,7 @@ export class RedirectFlowService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: RedirectFlowResponse = {
-      ...response.body['redirect_flows'],
+      ...(response.body?.['redirect_flows'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/refundService.ts b/src/services/refundService.ts
@@ -118,7 +118,7 @@ export class RefundService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: RefundResponse = {
-      ...response.body['refunds'],
+      ...(response.body?.['refunds'] ?? response),
       __response__: response.__response__,
     };
 

diff --git a/src/services/subscriptionService.ts b/src/services/subscriptionService.ts
@@ -232,7 +232,7 @@ export class SubscriptionService {
 
     const response = await this.api.request(requestParams);
     const formattedResponse: SubscriptionResponse = {
-      ...response.body['subscriptions'],
+      ...(response.body?.['subscriptions'] ?? response),
       __response__: response.__response__,
     };