Merge signalapp/Signal-Desktop#6830

ts/Bytes.ts

@@ -26,6 +26,10 @@ export function toBase64(data: Uint8Array): string {
   return bytes.toBase64(data);
 }
 
+export function toBase64url(data: Uint8Array): string {
+  return bytes.toBase64url(data);
+}
+
 export function toHex(data: Uint8Array): string {
   return bytes.toHex(data);
 }

ts/context/Bytes.ts

@@ -25,6 +25,10 @@ export class Bytes {
     return Buffer.from(data).toString('base64');
   }
 
+  public toBase64url(data: Uint8Array): string {
+    return Buffer.from(data).toString('base64url');
+  }
+
   public toHex(data: Uint8Array): string {
     return Buffer.from(data).toString('hex');
   }

ts/state/selectors/items.ts

@@ -115,7 +115,7 @@ export const getUsernameLink = createSelector(
     const content = Bytes.concatenate([entropy, serverId]);
 
     return contactByEncryptedUsernameRoute
-      .toWebUrl({ encryptedUsername: Bytes.toBase64(content) })
+      .toWebUrl({ encryptedUsername: Bytes.toBase64url(content) })
       .toString();
   }
 );

ts/test-mock/pnp/username_test.ts

@@ -345,7 +345,7 @@ describe('pnp/username', function (this: Mocha.Suite) {
         encryptedUsername: Buffer.concat([
           entropy,
           uuidToBytes(serverId),
-        ]).toString('base64'),
+        ]).toString('base64url'),
       })
       .toString();