Skip to content

Modifications for batch upload #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modifications for batch upload #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions generator/cybersource-javascript-template/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@
if (httpMethod.toLowerCase() === this.constants.POST
|| httpMethod.toLowerCase() === this.constants.PATCH
|| httpMethod.toLowerCase() === this.constants.PUT) {
if (bodyParam !== "{}") {
if (bodyParam !== "{}" && Object.keys(formParams).length <= 0) {
bodyParam = JSON.stringify(bodyParam, null, 0);
}
}
Expand Down Expand Up @@ -672,18 +672,11 @@
axiosConfig.headers['Content-Type'] = contentTypeHeaderValue;
formParams = bodyParam;
axiosConfig.data = JSON.parse(formParams);
} else if (contentType == 'multipart/form-data') {
var _formParams = this.normalizeParams(formParams);
contentTypeHeaderValue = 'multipart/form-data';
axiosConfig.headers['Content-Type'] = contentTypeHeaderValue;
const formData = new formData();
for (var key in _formParams) {
if (_formParams.hasOwnProperty(key)) {
formData.append(key, _formParams[key]);
}
}
} else if (bodyParam) {
} else if (bodyParam && Object.keys(formParams).length <= 0) {
axiosConfig.data = JSON.parse(bodyParam);
} else if (bodyParam && Object.keys(formParams).length > 0) {
axiosConfig.data = bodyParam;
axiosConfig.headers['Content-Type'] = contentType;
}

var accept = this.jsonPreferredMime(accepts);
Expand Down
23 changes: 21 additions & 2 deletions generator/cybersource-javascript-template/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,20 @@
postBody = sdkTracker.insertDeveloperIdTracker(postBody, '<&vendorExtensions.x-jsdoc-type>', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);
</bodyParam>

<#formParams>
const path = require('path');
const fs = require('fs');
const crypto = require('crypto');

file = path.resolve(file);

var boundary = crypto.randomBytes(16).toString('hex');
var delimiter = "-------------" + boundary;

var fileContents;
fileContents = fs.readFileSync(file, 'utf8');
</formParams>

var pathParams = {<#pathParams>
'<baseName>': <#required><paramName></required><^required>opts['<paramName>']</required><#hasMore>,</hasMore></pathParams>
};
Expand All @@ -87,11 +101,16 @@
'<baseName>': <#required><paramName></required><^required>opts['<paramName>']</required><#hasMore>,</hasMore></headerParams>
};
var formParams = {<#formParams>
'<baseName>': <#collectionFormat>this.apiClient.buildCollectionParam(<#required><paramName></required><^required>opts['<paramName>']</required>, '<collectionFormat>')</collectionFormat><^collectionFormat><#required><paramName></required><^required>opts['<paramName>']</required></collectionFormat><#hasMore>,</hasMore></formParams>
[path.basename(<baseName>)]: <#collectionFormat>this.apiClient.buildCollectionParam(<#required><paramName></required><^required>opts['<paramName>']</required>, '<collectionFormat>')</collectionFormat><^collectionFormat><#required>fileContents</required><^required>opts['<paramName>']</required></collectionFormat><#hasMore>,</hasMore></formParams>
};

<#formParams>
const MultipartHelper = require('../utilities/multipart/MultipartHelper');
postBody = MultipartHelper.buildDataFiles(boundary, formParams);
</formParams>

var authNames = [<#authMethods>'<name>'<#hasMore>, </hasMore></authMethods>];
var contentTypes = [<#consumes>'<& mediaType>'<#hasMore>, </hasMore></consumes>];
var contentTypes = <^formParams>[<#consumes>'<& mediaType>'<#hasMore>, </hasMore></consumes>]</formParams><#formParams>['multipart/form-data; boundary=' + delimiter]</formParams>;
var accepts = [<#produces>'<& mediaType>'<#hasMore>, </hasMore></produces>];
var returnType = <#returnType><&returnType></returnType><^returnType>null</returnType>;

Expand Down
17 changes: 5 additions & 12 deletions src/ApiClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@
if (httpMethod.toLowerCase() === this.constants.POST
|| httpMethod.toLowerCase() === this.constants.PATCH
|| httpMethod.toLowerCase() === this.constants.PUT) {
if (bodyParam !== "{}") {
if (bodyParam !== "{}" && Object.keys(formParams).length <= 0) {
bodyParam = JSON.stringify(bodyParam, null, 0);
}
}
Expand Down Expand Up @@ -674,18 +674,11 @@
axiosConfig.headers['Content-Type'] = contentTypeHeaderValue;
formParams = bodyParam;
axiosConfig.data = JSON.parse(formParams);
} else if (contentType == 'multipart/form-data') {
var _formParams = this.normalizeParams(formParams);
contentTypeHeaderValue = 'multipart/form-data';
axiosConfig.headers['Content-Type'] = contentTypeHeaderValue;
const formData = new formData();
for (var key in _formParams) {
if (_formParams.hasOwnProperty(key)) {
formData.append(key, _formParams[key]);
}
}
} else if (bodyParam) {
} else if (bodyParam && Object.keys(formParams).length <= 0) {
axiosConfig.data = JSON.parse(bodyParam);
} else if (bodyParam && Object.keys(formParams).length > 0) {
axiosConfig.data = bodyParam;
axiosConfig.headers['Content-Type'] = contentType;
}

var accept = this.jsonPreferredMime(accepts);
Expand Down
8 changes: 8 additions & 0 deletions src/api/BatchesApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
}



var pathParams = {
'batchId': batchId
};
Expand All @@ -86,6 +87,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/json;charset=utf-8'];
Expand Down Expand Up @@ -139,6 +141,7 @@
}



var pathParams = {
'batchId': batchId
};
Expand All @@ -149,6 +152,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/json;charset=utf-8'];
Expand Down Expand Up @@ -202,6 +206,7 @@
}



var pathParams = {
};
var queryParams = {
Expand All @@ -215,6 +220,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/json;charset=utf-8'];
Expand Down Expand Up @@ -269,6 +275,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/Body', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
};
var queryParams = {
Expand All @@ -278,6 +285,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/json;charset=utf-8'];
Expand Down
6 changes: 6 additions & 0 deletions src/api/BillingAgreementsApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/ModifyBillingAgreement', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
'id': id
};
Expand All @@ -93,6 +94,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/hal+json;charset=utf-8'];
Expand Down Expand Up @@ -153,6 +155,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/IntimateBillingAgreement', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
'id': id
};
Expand All @@ -163,6 +166,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/hal+json;charset=utf-8'];
Expand Down Expand Up @@ -217,6 +221,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/CreateBillingAgreement', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
};
var queryParams = {
Expand All @@ -226,6 +231,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/hal+json;charset=utf-8'];
Expand Down
2 changes: 2 additions & 0 deletions src/api/BinLookupApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/CreateBinLookupRequest', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
};
var queryParams = {
Expand All @@ -88,6 +89,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/json;charset=utf-8'];
Expand Down
2 changes: 2 additions & 0 deletions src/api/CaptureApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/CapturePaymentRequest', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
'id': id
};
Expand All @@ -93,6 +94,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/hal+json;charset=utf-8'];
Expand Down
2 changes: 2 additions & 0 deletions src/api/ChargebackDetailsApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
}



var pathParams = {
};
var queryParams = {
Expand All @@ -97,6 +98,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/hal+json', 'application/xml'];
Expand Down
2 changes: 2 additions & 0 deletions src/api/ChargebackSummariesApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
}



var pathParams = {
};
var queryParams = {
Expand All @@ -97,6 +98,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/hal+json', 'application/xml'];
Expand Down
2 changes: 2 additions & 0 deletions src/api/ConversionDetailsApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
}



var pathParams = {
};
var queryParams = {
Expand All @@ -97,6 +98,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/hal+json', 'application/xml'];
Expand Down
2 changes: 2 additions & 0 deletions src/api/CreateNewWebhooksApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/SaveSymEgressKey', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
};
var queryParams = {
Expand All @@ -101,6 +102,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/hal+json;charset=utf-8'];
Expand Down
2 changes: 2 additions & 0 deletions src/api/CreditApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/CreateCreditRequest', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
};
var queryParams = {
Expand All @@ -86,6 +87,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/hal+json;charset=utf-8'];
Expand Down
8 changes: 8 additions & 0 deletions src/api/CustomerApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
}



var pathParams = {
'customerId': customerId
};
Expand All @@ -89,6 +90,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/json;charset=utf-8'];
Expand Down Expand Up @@ -145,6 +147,7 @@
}



var pathParams = {
'customerId': customerId
};
Expand All @@ -156,6 +159,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/json;charset=utf-8'];
Expand Down Expand Up @@ -220,6 +224,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/PatchCustomerRequest', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
'customerId': customerId
};
Expand All @@ -232,6 +237,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/json;charset=utf-8'];
Expand Down Expand Up @@ -289,6 +295,7 @@
var sdkTracker = new SdkTracker();
postBody = sdkTracker.insertDeveloperIdTracker(postBody, 'module:model/PostCustomerRequest', this.apiClient.merchantConfig.runEnvironment, this.apiClient.merchantConfig.defaultDeveloperId);


var pathParams = {
};
var queryParams = {
Expand All @@ -299,6 +306,7 @@
var formParams = {
};


var authNames = [];
var contentTypes = ['application/json;charset=utf-8'];
var accepts = ['application/json;charset=utf-8'];
Expand Down
Loading