fix: use isomorphic solution for base64 encoding (#2526)

btoa npm dependency was using Buffer without an import. This causes probles in bundler environemnt and Node.js polyfills needs to be applied. Refs swagger-api/swagger-editor#3042

Author: char0n

package-lock.json

@@ -5,7 +5,10 @@
  "browser": {
  "./src/http/fold-formdata-to-request.node.js": "./src/http/fold-formdata-to-request.browser.js",
  "./lib/http/fold-formdata-to-request.node.js": "./lib/http/fold-formdata-to-request.browser.js",
- "./es/http/fold-formdata-to-request.node.js": "./es/http/fold-formdata-to-request.browser.js"
+ "./es/http/fold-formdata-to-request.node.js": "./es/http/fold-formdata-to-request.browser.js",
+ "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
+ "./lib/helpers/btoa.node.js": "./lib/helpers/btoa.browser.js",
+ "./es/helpers/btoa.node.js": "./es/helpers/btoa.browser.js"
  },
  "main": "lib/commonjs.js",
  "module": "es/index.js",
@@ -106,7 +109,6 @@
  },
  "dependencies": {
  "@babel/runtime-corejs3": "^7.11.2",
- "btoa": "^1.2.1",
  "cookie": "~0.5.0",
  "cross-fetch": "^3.1.5",
  "deepmerge": "~4.2.2",

package.json

@@ -9,7 +9,7 @@ import SWAGGER2_PARAMETER_BUILDERS from './swagger2/parameter-builders.js';
 import * as OAS3_PARAMETER_BUILDERS from './oas3/parameter-builders.js';
 import oas3BuildRequest from './oas3/build-request.js';
 import swagger2BuildRequest from './swagger2/build-request.js';
-import { getOperationRaw, legacyIdFromPathMethod, isOAS3 } from '../helpers.js';
+import { getOperationRaw, legacyIdFromPathMethod, isOAS3 } from '../helpers/index.js';
 
 const arrayOrEmpty = (ar) => (Array.isArray(ar) ? ar : []);
 

src/execute/index.js

@@ -2,7 +2,8 @@
 // `src/execute/index.js#buildRequest`
 import { isPlainObject } from 'is-plain-object';
 import get from 'lodash/get';
-import btoa from 'btoa';
+
+import btoa from '../../helpers/btoa.node.js';
 
 export default function buildRequest(options, req) {
  const { operation, requestBody, securities, spec, attachContentTypeForEmptyPayload } = options;

src/execute/oas3/build-request.js

@@ -1,4 +1,4 @@
-import btoa from 'btoa';
+import btoa from '../../helpers/btoa.node.js';
 
 // This function runs after the common function,
 // `src/execute/index.js#buildRequest`

src/execute/swagger2/build-request.js

@@ -0,0 +1,19 @@
+/* eslint-disable no-undef, no-restricted-globals */
+
+const globalObject = (() => {
+ // new standardized access to the global object
+ if (typeof globalThis !== 'undefined') {
+ return globalThis;
+ }
+
+ // WebWorker specific access
+ if (typeof self !== 'undefined') {
+ return self;
+ }
+
+ return window;
+})();
+
+const { btoa } = globalObject;
+
+export default btoa;

src/helpers/btoa.browser.js

@@ -0,0 +1,15 @@
+import { Buffer } from 'buffer';
+
+const btoa = (val) => {
+ let buffer;
+
+ if (val instanceof Buffer) {
+ buffer = val;
+ } else {
+ buffer = Buffer.from(val.toString(), 'binary');
+ }
+
+ return buffer.toString('base64');
+};
+
+export default btoa;

src/helpers/btoa.node.js

@@ -5,7 +5,7 @@ import Resolver, { clearCache } from './resolver.js';
 import resolveSubtree from './subtree-resolver/index.js';
 import { makeApisTagOperation } from './interfaces.js';
 import { execute, buildRequest, baseUrl } from './execute/index.js';
-import { opId } from './helpers.js';
+import { opId } from './helpers/index.js';
 
 Swagger.http = Http;
 Swagger.makeHttp = makeHttp.bind(null, Swagger.http);

src/helpers.js renamed to src/helpers/index.js

@@ -1,4 +1,4 @@
-import { eachOperation, opId } from './helpers.js';
+import { eachOperation, opId } from './helpers/index.js';
 
 const nullFn = () => null;