fix: Improve btoa detection

xapijs · Apr 15, 2024 · 511eda1 · 511eda1
1 parent af9ac0b
commit 511eda1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/helpers/toBasicAuth/toBasicAuth.ts b/src/helpers/toBasicAuth/toBasicAuth.ts
@@ -1,6 +1,6 @@
 export function toBasicAuth(username: string, password: string): string {
   const credentials = `${username}:${password}`;
-  if (typeof window !== "undefined" && window.btoa) {
+  if (typeof btoa === "function") {
     return `Basic ${btoa(credentials)}`;
   } else if (typeof Buffer !== "undefined") {
     return `Basic ${Buffer.from(credentials, "binary").toString("base64")}`;

diff --git a/src/helpers/toBasicAuth/toBasicAuth.unit.test.ts b/src/helpers/toBasicAuth/toBasicAuth.unit.test.ts
@@ -23,8 +23,7 @@ test("converts username and password into Basic Auth header", () => {
 });
 
 test("throws error if environment not supported", () => {
-  if (typeof window !== "undefined") window.btoa = undefined;
-  // eslint-disable-next-line no-global-assign
+  if (typeof btoa === "function") btoa = undefined;
   if (Buffer) Buffer = undefined;
   expect(() => toBasicAuth("", "")).toThrowError();
 });