From d3ddf928491f08e856d7be1459e7cfdf8e830a58 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Wed, 5 Jun 2024 19:25:42 +0530 Subject: [PATCH] Namespace in prep for a new method for unpadded --- web/packages/shared/crypto/helpers.ts | 2 +- web/packages/shared/crypto/internal/crypto.worker.ts | 4 ++-- web/packages/shared/crypto/internal/libsodium.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/packages/shared/crypto/helpers.ts b/web/packages/shared/crypto/helpers.ts index 6a1ee853ff..ede0b2c53c 100644 --- a/web/packages/shared/crypto/helpers.ts +++ b/web/packages/shared/crypto/helpers.ts @@ -34,7 +34,7 @@ export async function decryptAndStoreToken( const decryptedTokenBytes = await cryptoWorker.fromB64( urlUnsafeB64DecryptedToken, ); - decryptedToken = await cryptoWorker.toURLSafeB64(decryptedTokenBytes); + decryptedToken = await cryptoWorker.toB64URLSafe(decryptedTokenBytes); setData(LS_KEYS.USER, { ...user, token: decryptedToken, diff --git a/web/packages/shared/crypto/internal/crypto.worker.ts b/web/packages/shared/crypto/internal/crypto.worker.ts index bfb3273872..ef4f6a062e 100644 --- a/web/packages/shared/crypto/internal/crypto.worker.ts +++ b/web/packages/shared/crypto/internal/crypto.worker.ts @@ -195,8 +195,8 @@ export class DedicatedCryptoWorker { return libsodium.toB64(data); } - async toURLSafeB64(data: Uint8Array) { - return libsodium.toURLSafeB64(data); + async toB64URLSafe(data: Uint8Array) { + return libsodium.toB64URLSafe(data); } async fromB64(string: string) { diff --git a/web/packages/shared/crypto/internal/libsodium.ts b/web/packages/shared/crypto/internal/libsodium.ts index 8ae707ff73..80b6eb9d98 100644 --- a/web/packages/shared/crypto/internal/libsodium.ts +++ b/web/packages/shared/crypto/internal/libsodium.ts @@ -398,10 +398,10 @@ export async function toB64(input: Uint8Array) { return sodium.to_base64(input, sodium.base64_variants.ORIGINAL); } -export async function toURLSafeB64(input: Uint8Array) { +export const toB64URLSafe = async (input: Uint8Array) => { await sodium.ready; return sodium.to_base64(input, sodium.base64_variants.URLSAFE); -} +}; export async function fromUTF8(input: string) { await sodium.ready;