Merge pull request #1063 from multiversx/rt/fix/base64utils

Fixed base64 utils encoding check and conversion

CHANGELOG.md

@@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Added support for nativeAuth impersonat](https://github.com/multiversx/mx-sdk-dapp/pull/1049)
 - [Updated WalletConnectV2 account provider to be updated on new or existing session](https://github.com/multiversx/mx-sdk-dapp/pull/1050)
 
+## [[v2.28.8]](https://github.com/multiversx/mx-sdk-dapp/pull/1062)] - 2024-03-07
+- [Fixed base64 utils conversion](https://github.com/multiversx/mx-sdk-dapp/pull/1061)
+
 ## [[v2.28.7]](https://github.com/multiversx/mx-sdk-dapp/pull/1048)] - 2024-02-13
 - [Updated AddressRow data-testids](https://github.com/multiversx/mx-sdk-dapp/pull/1047)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-dapp",
-  "version": "2.28.7-alpha.24",
+  "version": "2.28.8-alpha.0",
   "description": "A library to hold the main logic for a dapp on the MultiversX blockchain",
   "author": "MultiversX",
   "license": "GPL-3.0-or-later",

src/utils/decoders/base64Utils.ts

@@ -12,8 +12,7 @@
  *
  * Solution:
  * - if any conversion fails (atob(), btoa() or Buffer.from()), it is definitely not an encoded string
- * - if atob() conversion is equal to Buffer.from() conversion
- * or the string is equal to btoa() conversion of atob(), it is a regular base64 string
+ * - if the string is equal
  *
  * @see The tests for this function are in src/utils/decoders/tests/base64Utils.test.ts
  * @param str
@@ -27,13 +26,12 @@ export function isStringBase64(str: string) {
     const bufferFromEncoded = Buffer.from(bufferFromDecoded).toString('base64');
 
     // If the result is equal to the initial string
-    const isEqualToInitialString =
-      str === btoaEncoded && str === bufferFromEncoded;
+    const isBtoaEqual = str === btoaEncoded || btoaEncoded.startsWith(str);
+    const isBufferFromBase64Equal =
+      str === bufferFromEncoded || bufferFromEncoded.startsWith(str);
+    const isEqualToInitialString = isBtoaEqual && isBufferFromBase64Equal;
 
-    // or the atob() conversion is equal to the Buffer.from('base64')
-    const isAtobEqualToBufferFrom = atobDecoded === bufferFromDecoded;
-
-    if (isEqualToInitialString || isAtobEqualToBufferFrom) {
+    if (isEqualToInitialString) {
       // it is a regular base64 string
       return true;
     }

src/utils/decoders/tests/base64Utils.test.ts

@@ -64,4 +64,9 @@ describe('isStringBase64', () => {
     );
     expect(result).toStrictEqual(false);
   });
+
+  it('should return false for atob equal to base64 conversion', async () => {
+    const result = isStringBase64('fd');
+    expect(result).toStrictEqual(false);
+  });
 });