1 files changed, 32 insertions, 7 deletions
diff --git a/src/utils/base64.ts b/src/utils/base64.ts
index c0ef96a..44fda1e 100644
--- a/src/utils/base64.ts
+++ b/src/utils/base64.ts
@@ -1,15 +1,19 @@
 export { textToBase64, base64ToText, isValidBase64, removePotentialDataAndMimePrefix };
 
-function textToBase64(str: string) {
-  return window.btoa(str);
+function textToBase64(str: string, { makeUrlSafe = false }: { makeUrlSafe?: boolean } = {}) {
+  const encoded = window.btoa(str);
+  return makeUrlSafe ? makeUriSafe(encoded) : encoded;
 }
 
-function base64ToText(str: string) {
-  if (!isValidBase64(str)) {
+function base64ToText(str: string, { makeUrlSafe = false }: { makeUrlSafe?: boolean } = {}) {
+  if (!isValidBase64(str, { makeUrlSafe: makeUrlSafe })) {
     throw new Error('Incorrect base64 string');
   }
 
-  const cleanStr = removePotentialDataAndMimePrefix(str);
+  let cleanStr = removePotentialDataAndMimePrefix(str);
+  if (makeUrlSafe) {
+    cleanStr = unURI(cleanStr);
+  }
 
   try {
     return window.atob(cleanStr);
@@ -22,12 +26,33 @@ function removePotentialDataAndMimePrefix(str: string) {
   return str.replace(/^data:.*?;base64,/, '');
 }
 
-function isValidBase64(str: string) {
-  const cleanStr = removePotentialDataAndMimePrefix(str);
+function isValidBase64(str: string, { makeUrlSafe = false }: { makeUrlSafe?: boolean } = {}) {
+  let cleanStr = removePotentialDataAndMimePrefix(str);
+  if (makeUrlSafe) {
+    cleanStr = unURI(cleanStr);
+  }
 
   try {
+    if (makeUrlSafe) {
+      return removePotentialPadding(window.btoa(window.atob(cleanStr))) === cleanStr;
+    }
     return window.btoa(window.atob(cleanStr)) === cleanStr;
   } catch (err) {
     return false;
   }
 }
+
+function makeUriSafe(encoded: string) {
+  return encoded.replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
+}
+
+function unURI(encoded: string): string {
+  return encoded
+    .replace(/-/g, '+')
+    .replace(/_/g, '/')
+    .replace(/[^A-Za-z0-9+/]/g, '');
+}
+
+function removePotentialPadding(str: string) {
+  return str.replace(/=/g, '');
+}