@secrecy/lib 1.65.0-feat-next15.4 → 1.66.0-feat-next15.1

package/dist/lib/client/SecrecyCloudClient.js

@@ -389,7 +389,7 @@ export class SecrecyCloudClient {
                     .map((node) => {
                     const share = shares.find((share) => share.nodeId === node.nodeId && share.userId === userId);
                     if (!share) {
-                        throw new Error('Unable to retrieve rights!');
+                        throw new Error('Unable to retrieve permissions!');
                     }
                     return {
                         nodeId: node.nodeId,
@@ -401,12 +401,22 @@ export class SecrecyCloudClient {
             const withKeys = Object.fromEntries(Object.entries(infos).map('rights' in input
                 ? ([userId, nodes]) => [
                     userId,
-                    { userId, nodes, permissions: input },
+                    {
+                        userId,
+                        nodes,
+                        permissions: {
+                            rights: input.rights,
+                            addAccess: input.addAccess,
+                            delAccess: input.delAccess,
+                            sharingAddAccess: input.sharingAddAccess,
+                            sharingDelAccess: input.sharingDelAccess,
+                        },
+                    },
                 ]
                 : ([userId, nodes]) => {
                     const share = shares.find((share) => share.userId === userId && share.nodeId === nodes[0].id);
                     if (!share) {
-                        throw new Error('Unable to retrieve rights!');
+                        throw new Error('Unable to retrieve permissions!');
                     }
                     return [
                         userId,
@@ -419,9 +429,12 @@ export class SecrecyCloudClient {
                     userId,
                     nodes: nodes.nodes.map((node) => ({
                         id: node.id,
-                        ...nodes.permissions,
                         nameKey: node.nameKey,
-                        data: node.data.map((d) => ({ id: d.id, key: d.key })),
+                        data: node.data.map((d) => ({
+                            id: d.id,
+                            key: d.key,
+                        })),
+                        ...nodes.permissions,
                     })),
                 });
             }
@@ -648,13 +661,14 @@ export class SecrecyCloudClient {
         });
         const node = await apiNodeToExternalNodeFull(saveInCloud, this.#keys);
         const me = node.parent?.users.find(([u]) => u.id === this.#client.app.userId);
-        // TODO: Rights
-        if (me !== undefined && ['admin', 'write'].includes(me[1]['rights'])) {
+        // TODO: ??
+        if (me !== undefined && ['delete', 'write'].includes(me[1].rights)) {
             const others = node.parent?.users.filter(([u]) => u.id !== this.#client.app.userId) ??
                 [];
             if (others.length > 0) {
                 await this.shareNode(others.map(([user, permissions]) => ({
                     userId: user.id,
+                    permissions,
                     nodeId: node.id,
                     ...permissions,
                 })));
@@ -678,9 +692,7 @@ export class SecrecyCloudClient {
         }
         // Retrieve and format nodes.
         for (const nodeId of nodeIds) {
-            let node;
-            node ??= nodesEncryptionCache.get(nodeId);
-            node ??= nodesCache.get(nodeId);
+            let node = nodesEncryptionCache.get(nodeId) ?? nodesCache.get(nodeId);
             if (node &&
                 'history' in node &&
                 node.history.length > 0 &&

package/dist/lib/client/convert/node.js

@@ -66,8 +66,12 @@ function internalNodeToNode(internal) {
         })),
         access: {
             isRoot: internal.access.isRoot,
-            rights: internal.access.rights,
             sharedByPubKey: internal.access.sharedByPubKey,
+            rights: internal.access.rights,
+            addAccess: internal.access.addAccess,
+            delAccess: internal.access.delAccess,
+            sharingAddAccess: internal.access.sharingAddAccess,
+            sharingDelAccess: internal.access.sharingDelAccess,
         },
     };
     return node;

package/dist/types/client/types/node.d.ts

@@ -1,8 +1,8 @@
 import { type RouterOutputs } from '../../client.js';
 import type { DataMetadata, InternalData, PublicUser } from './index.js';
-export type NodePermissions = ApiNode['users'][number][1];
-export type Rights = NodePermissions['rights'];
-export type NodeAccess<T extends Record<string, unknown> = Record<string, unknown>> = T & NodePermissions & {
+export type Permissions = ApiNode['users'][number][1];
+export type Rights = Permissions['rights'];
+export type NodeAccess<T extends Record<string, unknown> = Record<string, unknown>> = T & Permissions & {
     isRoot: boolean;
     sharedByPubKey: string;
 };
@@ -33,7 +33,7 @@ export interface Node<T extends NodeBreadcrumbItem = NodeBreadcrumbItem, U exten
     breadcrumb: T[];
     owner: PublicUser;
     access: NodeAccess<U>;
-    users: Array<[PublicUser, NodePermissions]>;
+    users: Array<[PublicUser, Permissions]>;
     currentDataId: string | null;
     parentId: string | null;
 }
@@ -82,9 +82,9 @@ export type ShareNodeDetails = {
     }[];
     invalidRightsAccesses: {
         userId: string;
-        current: NodePermissions;
+        current: Permissions;
         nodeId: string;
-        expect: NodePermissions;
+        expect: Permissions;
     }[];
 };
 export {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.65.0-feat-next15.4",
+  "version": "1.66.0-feat-next15.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"