Use base64 from firebase/util

Author: schmidt-sebastian

packages/firestore/package.json

@@ -59,7 +59,6 @@
     "@firebase/webchannel-wrapper": "0.2.41",
     "@grpc/grpc-js": "0.8.1",
     "@grpc/proto-loader": "^0.5.0",
-    "js-base64": "2.5.2",
     "tslib": "1.11.1"
   },
   "peerDependencies": {
@@ -70,7 +69,6 @@
     "@firebase/app-exp": "0.x",
     "@firebase/app-types-exp": "0.x",
     "@types/json-stable-stringify": "1.0.32",
-    "@types/js-base64": "2.3.1",
     "json-stable-stringify": "1.0.1",
     "protobufjs": "6.9.0",
     "rollup": "2.7.6",

packages/firestore/src/platform_rn/rn_platform.ts

@@ -16,17 +16,21 @@
  */
 
 import { BrowserPlatform } from '../platform_browser/browser_platform';
-import { Base64 } from 'js-base64';
+import { base64 } from '@firebase/util';
 
 // Implements the Platform API for ReactNative.
 export class ReactNativePlatform extends BrowserPlatform {
   readonly base64Available = true;
 
   atob(encoded: string): string {
-    return Base64.decode(encoded);
+    // WebSafe uses a different URL-encoding safe alphabet that doesn't match
+    // the encoding used on the backend.
+    return base64.decodeString(encoded, /* webSafe =*/ false);
   }
 
   btoa(raw: string): string {
-    return Base64.encode(raw);
+    // WebSafe uses a different URL-encoding safe alphabet that doesn't match
+    // the encoding used on the backend.
+    return base64.encodeString(raw, /* webSafe =*/ false);
   }
 }

yarn.lock

@@ -2130,11 +2130,6 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/[email protected]":
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/@types/js-base64/-/js-base64-2.3.1.tgz#c39f14f129408a3d96a1105a650d8b2b6eeb4168"
-  integrity sha512-4RKbhIDGC87s4EBy2Cp2/5S2O6kmCRcZnD5KRCq1q9z2GhBte1+BdsfVKCpG8yKpDGNyEE2G6IqFIh6W2YwWPA==
-
 "@types/json-schema@^7.0.3":
   version "7.0.4"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
@@ -8735,11 +8730,6 @@ jquery@^3.4.1:
   resolved "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
   integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
 
-[email protected]:
-  version "2.5.2"
-  resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209"
-  integrity sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"