@telecrypt-io/storage 0.2.11 → 0.2.13

package/dist/TeleCryptIOStorage.js

@@ -3,6 +3,7 @@ import { Method } from "matrix-js-sdk/lib/http-api/method.js";
 import { ClientPrefix } from "matrix-js-sdk/lib/http-api/prefix.js";
 import { encryptAttachment, decryptAttachment } from "matrix-encrypt-attachment";
 import { decodeRecoveryKey } from "matrix-js-sdk/lib/crypto-api/recovery-key.js";
+const recoveryCallbackQueues = new WeakMap();
 export class TeleCryptIOStorage {
     client;
     constructor(client) {
@@ -135,21 +136,26 @@ export class TeleCryptIOStorage {
      * object in the first place (see `create()`'s doc comment).
      */
     async withSecretStorageKey(privateKey, fn) {
-        const callbacks = this.client.cryptoCallbacks;
-        const prevGetKey = callbacks.getSecretStorageKey;
-        const prevCache = callbacks.cacheSecretStorageKey;
-        callbacks.getSecretStorageKey = async ({ keys }) => {
-            const keyId = Object.keys(keys)[0];
-            return [keyId, privateKey];
-        };
-        callbacks.cacheSecretStorageKey = () => { };
-        try {
-            return await fn();
-        }
-        finally {
-            callbacks.getSecretStorageKey = prevGetKey;
-            callbacks.cacheSecretStorageKey = prevCache;
-        }
+        const previous = recoveryCallbackQueues.get(this.client) ?? Promise.resolve();
+        const run = previous.then(async () => {
+            const callbacks = this.client.cryptoCallbacks;
+            const prevGetKey = callbacks.getSecretStorageKey;
+            const prevCache = callbacks.cacheSecretStorageKey;
+            callbacks.getSecretStorageKey = async ({ keys }) => {
+                const keyId = Object.keys(keys)[0];
+                return [keyId, privateKey];
+            };
+            callbacks.cacheSecretStorageKey = () => { };
+            try {
+                return await fn();
+            }
+            finally {
+                callbacks.getSecretStorageKey = prevGetKey;
+                callbacks.cacheSecretStorageKey = prevCache;
+            }
+        });
+        recoveryCallbackQueues.set(this.client, run.then(() => undefined, () => undefined));
+        return run;
     }
     /**
      * Bootstraps cross-signing and secret storage with a brand-new server-side

package/dist/core/oidc.js

@@ -179,11 +179,31 @@ export async function refreshOidcToken(tokenEndpoint, clientId, refreshToken) {
         const body = await res.text();
         throw new CliError(`OIDC token refresh failed (${res.status}): ${body}`);
     }
-    const data = (await res.json());
+    const data = await res.json();
+    if (!data || typeof data !== "object") {
+        throw new CliError("OIDC token refresh returned an invalid response");
+    }
+    const record = data;
+    const accessToken = record.access_token;
+    const nextRefreshToken = record.refresh_token;
+    const expiresIn = record.expires_in;
+    if (typeof accessToken !== "string" || accessToken.trim() === "") {
+        throw new CliError("OIDC token refresh returned no access token");
+    }
+    if (nextRefreshToken !== undefined &&
+        (typeof nextRefreshToken !== "string" || nextRefreshToken.trim() === "")) {
+        throw new CliError("OIDC token refresh returned an invalid refresh token");
+    }
+    if (expiresIn !== undefined &&
+        (typeof expiresIn !== "number" || !Number.isFinite(expiresIn) || expiresIn < 0)) {
+        throw new CliError("OIDC token refresh returned an invalid expiry");
+    }
     return {
-        accessToken: data.access_token,
-        refreshToken: data.refresh_token,
-        expiry: data.expires_in ? new Date(Date.now() + data.expires_in * 1000) : undefined,
+        accessToken,
+        refreshToken: nextRefreshToken,
+        expiry: expiresIn === undefined
+            ? undefined
+            : new Date(Date.now() + expiresIn * 1000),
     };
 }
 /**

package/dist/core/operations.js

@@ -195,7 +195,7 @@ export async function unshareFolder(storage, folderId, userId) {
 }
 export async function listMembers(storage, folderId) {
     const tree = await resolveTree(storage, folderId);
-    return storage.listMembers(tree);
+    return withRateLimitRetry("listMembers", () => storage.listMembers(tree));
 }
 export async function listFiles(storage, folderId) {
     const tree = await resolveTree(storage, folderId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telecrypt-io/storage",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "license": "BUSL-1.1",
   "type": "module",
   "main": "dist/index.js",