@secrecy/lib 1.73.2-fix-save-in-cloud-sharing.1 → 1.73.2

package/dist/lib/base-client.js

@@ -18,6 +18,7 @@ export class BaseClient {
     client;
     secrecyUrls;
     sessionId;
+    #me = null;
     constructor(opts) {
         this.sessionId = opts.session;
         this.secrecyUrls = {
@@ -52,7 +53,19 @@ export class BaseClient {
         });
     }
     async me() {
-        return await this.client.user.self.query({});
+        if (this.#me === null ||
+            this.sessionId !== this.#me.sessionId ||
+            Date.now() - this.#me.fetchedAt > 5 * 60 * 1000) {
+            const data = await this.client.user.self.query({
+            // t: Date.now(), // TODO needed or what?
+            });
+            this.#me = {
+                data,
+                sessionId: this.sessionId,
+                fetchedAt: Date.now(),
+            };
+        }
+        return this.#me.data;
     }
     static async getUser(userId, opts) {
         const user = await getPublicUser(this.getBaseClient(opts), userId);

package/dist/lib/client/SecrecyCloudClient.js

@@ -29,7 +29,9 @@ export class SecrecyCloudClient {
         const node = await apiNodeFullToInternalFull(addDataToHistory, this.#keys);
         const data = node.history.find((d) => d.id === dataId);
         if (data !== undefined) {
-            const users = node.users.filter(([u]) => u.id !== this.#client.app.userId);
+            // TODO sad to have to make this extra request
+            const me = await this.#client.me();
+            const users = node.users.filter(([u]) => u.id !== me.id);
             const userIds = users.map(([user]) => user.id);
             const userKeys = await this.#client.app.userPublicKey(userIds);
             const shares = users.map(([user]) => {
@@ -295,8 +297,7 @@ export class SecrecyCloudClient {
             nameKey: encryptedNameKey,
         });
         const folder = await apiNodeToExternalNodeFull(createdFolder, this.#keys);
-        const users = folder.parent?.users?.filter(([u]) => u.id !== this.#client.app.userId) ??
-            [];
+        const users = folder.parent?.users?.filter(([u]) => u.id !== folder.owner.id) ?? [];
         if (users.length > 0) {
             await this.shareNode(users.map(([user, permissions]) => ({
                 userId: user.id,
@@ -618,12 +619,10 @@ export class SecrecyCloudClient {
             nameKey: encryptedNameKey,
         });
         const node = await apiNodeToExternalNodeFull(saveInCloud, this.#keys);
-        const me = node.parent?.users.find(([u]) => u.id === this.#client.app.userId);
-        console.log('SAVE IN CLOUD', { me, node });
+        const me = node.parent?.users.find(([u]) => u.id === node.owner.id);
         // TODO: ??
         if (me !== undefined && ['delete', 'write'].includes(me[1].rights)) {
-            const others = node.parent?.users.filter(([u]) => u.id !== this.#client.app.userId) ??
-                [];
+            const others = node.parent?.users.filter(([u]) => u.id !== node.owner.id) ?? [];
             if (others.length > 0) {
                 await this.shareNode(others.map(([user, permissions]) => ({
                     userId: user.id,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.73.2-fix-save-in-cloud-sharing.1",
+  "version": "1.73.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"