Merge pull request #1395 from crupest/dev

Refector 2023 v0.1

1 files changed, 16 insertions, 5 deletions

diff --git a/FrontEnd/src/utilities/base64.ts b/FrontEnd/src/utilities/base64.ts
index 59de7512..6eece979 100644
--- a/FrontEnd/src/utilities/base64.ts
+++ b/FrontEnd/src/utilities/base64.ts
@@ -1,8 +1,19 @@
-import { Base64 } from "js-base64";
+function bytesToBase64(bytes: Uint8Array): string {
+  const binString = Array.from(bytes, (x) => String.fromCodePoint(x)).join("");
+  return btoa(binString);
+}
+
+export default function base64(
+  data: Blob | Uint8Array | string,
+): Promise<string> {
+  if (typeof data === "string") {
+    // From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
+    const binString = new TextEncoder().encode(data);
+    return Promise.resolve(bytesToBase64(binString));
+  }
 
-export default function base64(blob: Blob | string): Promise<string> {
-  if (typeof blob === "string") {
-    return Promise.resolve(Base64.encode(blob));
+  if (data instanceof Uint8Array) {
+    return Promise.resolve(bytesToBase64(data));
   }
 
   return new Promise<string>((resolve) => {
@@ -10,6 +21,6 @@ export default function base64(blob: Blob | string): Promise<string> {
     reader.onload = function () {
       resolve((reader.result as string).replace(/^data:.*;base64,/, ""));
     };
-    reader.readAsDataURL(blob);
+    reader.readAsDataURL(data);
   });
 }