diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache
index 22cd56bd12c..57dfc0d937f 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache
@@ -449,7 +449,7 @@ export default class ApiClient {
}
{{#usePromises}}return new Promise((resolve, reject) => {
- request.end(function(error, response) {
+ request.end((error, response) => {
if (error) {
reject(error);
} else {
diff --git a/samples/client/petstore-security-test/javascript/src/ApiClient.js b/samples/client/petstore-security-test/javascript/src/ApiClient.js
index 4557fa86df5..b7eb8adcbdc 100644
--- a/samples/client/petstore-security-test/javascript/src/ApiClient.js
+++ b/samples/client/petstore-security-test/javascript/src/ApiClient.js
@@ -173,12 +173,15 @@
* @returns {Boolean} true
if param
represents a file.
*/
exports.prototype.isFileParam = function(param) {
- // fs.ReadStream in Node.js (but not in runtime like browserify)
- if (typeof window === 'undefined' &&
- typeof require === 'function' &&
- require('fs') &&
- param instanceof require('fs').ReadStream) {
- return true;
+ // fs.ReadStream in Node.js and Electron (but not in runtime like browserify)
+ if (typeof require === 'function') {
+ var fs;
+ try {
+ fs = require('fs');
+ } catch (err) {}
+ if (fs && fs.ReadStream && param instanceof fs.ReadStream) {
+ return true;
+ }
}
// Buffer in Node.js
if (typeof Buffer === 'function' && param instanceof Buffer) {