@secrecy/lib 1.75.0-feat-groups-identity.4 → 1.75.0-feat-groups-identity.6

package/dist/lib/cache.js

@@ -3,6 +3,15 @@ import { gigaToBytes } from './utils.js';
 export const dataCache = new Map();
 export const nodesCache = new Map();
 export const nodesEncryptionCache = new Map();
+export const getNodeForEncryptionFromCache = (id) => {
+    if (nodesEncryptionCache.has(id)) {
+        return nodesEncryptionCache.get(id);
+    }
+    if (nodesCache.has(id)) {
+        return nodesCache.get(id);
+    }
+    return undefined;
+};
 export const usersCache = new Map();
 export const publicKeysCache = new Map();
 export const dataContentCache = new LRUCache({

package/dist/lib/client/SecrecyAppClient.js

@@ -15,6 +15,9 @@ export class SecrecyAppClient {
         if (!sub) {
             throw new Error('No sub in JWT');
         }
+        if (sub !== this.#client.uaIdentity.userId) {
+            throw new Error(`UserId mismatch: ${sub} !== ${this.#client.uaIdentity.userId}`);
+        }
         return sub;
     }
     get appId() {
@@ -24,6 +27,9 @@ export class SecrecyAppClient {
         if (!aud) {
             throw new Error('No aud in JWT');
         }
+        if (aud !== this.#client.uaIdentity.appId) {
+            throw new Error(`AppId mismatch: ${aud} !== ${this.#client.uaIdentity.appId}`);
+        }
         return aud;
     }
     async getJwt() {

package/dist/lib/client/SecrecyCloudClient.js

@@ -1,4 +1,4 @@
-import { nodesCache, dataCache, dataContentCache, nodesEncryptionCache, } from '../cache.js';
+import { nodesCache, dataCache, dataContentCache, getNodeForEncryptionFromCache, } from '../cache.js';
 import { decryptCryptoBox, encryptCryptoBox } from '../crypto/index.js';
 import { decompress } from '../minify/index.js';
 import { sodium } from '../sodium.js';
@@ -470,16 +470,23 @@ export class SecrecyCloudClient {
         const nodes = [];
         // Retrieve and format nodes.
         for (const nodeId of nodeIds) {
-            let node = nodesEncryptionCache.get(nodeId) ?? nodesCache.get(nodeId);
-            if (node &&
-                'history' in node &&
-                node.history.length > 0 &&
-                node.access.nameKey) {
+            const node = getNodeForEncryptionFromCache(nodeId);
+            // ! Only keep nodes FILE with history.
+            if (node && 'history' in node && node.history.length > 0) {
+                const access = 'accesses' in node
+                    ? node.accesses.find((a) => a.nameKey !== null)
+                    : node.access;
+                if (!access) {
+                    throw new Error(`No access found for node ${node.id} to share!`);
+                }
+                if (access.nameKey === null) {
+                    throw new Error(`No nameKey found for node ${node.id} to share!`);
+                }
                 nodes.push({
                     id: nodeId,
                     name: node.name,
                     type: node.type,
-                    access: { nameKey: node.access.nameKey },
+                    access: { nameKey: access.nameKey },
                     history: node.history.map((data) => {
                         if (!data.key) {
                             throw new Error('Unable to retrieve data key!');
@@ -516,20 +523,13 @@ export class SecrecyCloudClient {
                     (!('history' in node) || node.history.length === 0)) {
                     throw new Error(`Can't share a node without data (${node.id})!`);
                 }
-                const nameKey = node.access?.nameKey;
                 nodesMappedUsers[pubKey].push({
                     id: node.id,
-                    nameKey: nameKey !== null
-                        ? sodium.to_hex(encryptCryptoBox(sodium.from_hex(nameKey), pubKey, this.#client.uaPrivateKey))
-                        : null,
-                    data: 'history' in node
-                        ? node.history.map((f) => ({
-                            id: f.id,
-                            key: f.key
-                                ? sodium.to_hex(encryptCryptoBox(sodium.from_hex(f.key), pubKey, this.#client.uaPrivateKey))
-                                : null,
-                        }))
-                        : [],
+                    nameKey: sodium.to_hex(encryptCryptoBox(sodium.from_hex(node.access.nameKey), pubKey, this.#client.uaPrivateKey)),
+                    data: node.history.map((f) => ({
+                        id: f.id,
+                        key: sodium.to_hex(encryptCryptoBox(sodium.from_hex(f.key), pubKey, this.#client.uaPrivateKey)),
+                    })),
                 });
             }
         }

package/dist/lib/client/SecrecyGroupClient.js

@@ -0,0 +1,33 @@
+export class SecrecyGroupClient {
+    #client;
+    constructor(client) {
+        this.#client = client;
+    }
+    async addMember(input) {
+        return this.#client.apiClient.group.addMember.mutate(input);
+    }
+    async create(input) {
+        return this.#client.apiClient.group.create.mutate(input);
+    }
+    async deleteMember(input) {
+        return this.#client.apiClient.group.deleteMember.mutate(input);
+    }
+    async delete(input) {
+        return this.#client.apiClient.group.delete.mutate(input);
+    }
+    async get(input) {
+        return this.#client.apiClient.group.get.query(input);
+    }
+    async getMany(input) {
+        return this.#client.apiClient.group.getMany.query(input);
+    }
+    async transferOwnership(input) {
+        return this.#client.apiClient.group.transferOwnership.mutate(input);
+    }
+    async update(input) {
+        return this.#client.apiClient.group.update.mutate(input);
+    }
+    async updateMember(input) {
+        return this.#client.apiClient.group.updateMember.mutate(input);
+    }
+}

package/dist/lib/client/SecrecyIdentityClient.js

@@ -0,0 +1,15 @@
+export class SecrecyIdentityClient {
+    #client;
+    constructor(client) {
+        this.#client = client;
+    }
+    async get(input) {
+        return await this.#client.apiClient.identity.get.query(input);
+    }
+    async getMany(input) {
+        return await this.#client.apiClient.identity.getMany.query(input);
+    }
+    async list(input) {
+        return await this.#client.apiClient.identity.list.query(input);
+    }
+}

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

@@ -79,19 +79,20 @@ export async function apiNodeFullToInternalFull(apiNodeFull, keyPairs) {
 function internalNodeToNode(internal) {
     const node = {
         ...internal,
-        // breadcrumb: internal.breadcrumb.map((b) => ({
-        //   id: b.id,
-        //   name: b.name,
-        // })),
-        // access: {
-        //   isRoot: internal.access.isRoot,
-        //   sharedByPubKey: internal.access.sharedByPubKey,
-        //   rights: internal.access.rights,
-        //   addAccess: internal.access.addAccess,
-        //   delAccess: internal.access.delAccess,
-        //   sharingAddAccess: internal.access.sharingAddAccess,
-        //   sharingDelAccess: internal.access.sharingDelAccess,
-        // },
+        breadcrumb: internal.breadcrumb.map((b) => ({
+            id: b.id,
+            name: b.name,
+        })),
+        accesses: internal.accesses.map((a) => ({
+            isRoot: a.isRoot,
+            identityPubKey: a.identityPubKey,
+            sharedByPubKey: a.sharedByPubKey,
+            rights: a.rights,
+            addAccess: a.addAccess,
+            delAccess: a.delAccess,
+            sharingAddAccess: a.sharingAddAccess,
+            sharingDelAccess: a.sharingDelAccess,
+        })),
     };
     return node;
 }

package/dist/lib/client/index.js

@@ -10,6 +10,8 @@ import { SecrecyUserClient } from './SecrecyUserClient.js';
 import { SecrecyPseudonymClient } from './SecrecyPseudonymClient.js';
 import { decryptAnonymous } from '../crypto/index.js';
 import { SecrecyOrganizationClient } from './SecrecyOrganizationClient.js';
+import { SecrecyGroupClient } from './SecrecyGroupClient.js';
+import { SecrecyIdentityClient } from './SecrecyIdentityClient.js';
 export class SecrecyClient extends BaseClient {
     #groupIdentities;
     #uaIdentity;
@@ -23,6 +25,8 @@ export class SecrecyClient extends BaseClient {
     pay;
     user;
     pseudonym;
+    group;
+    identity;
     constructor(opts) {
         super({
             session: opts.uaSession,
@@ -54,6 +58,8 @@ export class SecrecyClient extends BaseClient {
         this.pay = new SecrecyPayClient(this);
         this.user = new SecrecyUserClient(this);
         this.pseudonym = new SecrecyPseudonymClient(this);
+        this.group = new SecrecyGroupClient(this);
+        this.identity = new SecrecyIdentityClient(this);
     }
     get publicKey() {
         return this.#uaIdentity.identityPubKey;
@@ -92,7 +98,4 @@ export class SecrecyClient extends BaseClient {
         publicKeysCache.clear();
         await super.logout(sessionId);
     }
-    async getIdentities(input) {
-        return await this.client.identity.getMany.query(input);
-    }
 }

package/dist/types/cache.d.ts

@@ -1,8 +1,10 @@
 import type { InternalNode, InternalData, InternalNodeFull, LocalData, InternalMinimalNodeForEncryption } from './client/types/index.js';
 import { LRUCache } from 'lru-cache';
+type NodeForEncryptionCached = InternalNode | InternalNodeFull | InternalMinimalNodeForEncryption;
 export declare const dataCache: Map<string, InternalData>;
 export declare const nodesCache: Map<string, InternalNode | InternalNodeFull>;
 export declare const nodesEncryptionCache: Map<string, InternalMinimalNodeForEncryption>;
+export declare const getNodeForEncryptionFromCache: (id: string) => NodeForEncryptionCached | undefined;
 export declare const usersCache: Map<string, {
     firstname: string;
     lastname: string;
@@ -12,3 +14,4 @@ export declare const usersCache: Map<string, {
 }>;
 export declare const publicKeysCache: Map<string, string>;
 export declare const dataContentCache: LRUCache<string, LocalData, unknown>;
+export {};

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

@@ -0,0 +1,15 @@
+import type { RouterInputs, RouterOutputs } from '../client.js';
+import type { SecrecyClient } from '../index.js';
+export declare class SecrecyGroupClient {
+    #private;
+    constructor(client: SecrecyClient);
+    addMember(input: RouterInputs['group']['addMember']): Promise<RouterOutputs['group']['addMember']>;
+    create(input: RouterInputs['group']['create']): Promise<RouterOutputs['group']['create']>;
+    deleteMember(input: RouterInputs['group']['deleteMember']): Promise<RouterOutputs['group']['deleteMember']>;
+    delete(input: RouterInputs['group']['delete']): Promise<RouterOutputs['group']['delete']>;
+    get(input: RouterInputs['group']['get']): Promise<RouterOutputs['group']['get']>;
+    getMany(input: RouterInputs['group']['getMany']): Promise<RouterOutputs['group']['getMany']>;
+    transferOwnership(input: RouterInputs['group']['transferOwnership']): Promise<RouterOutputs['group']['transferOwnership']>;
+    update(input: RouterInputs['group']['update']): Promise<RouterOutputs['group']['update']>;
+    updateMember(input: RouterInputs['group']['updateMember']): Promise<RouterOutputs['group']['updateMember']>;
+}

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

@@ -0,0 +1,9 @@
+import type { RouterInputs, RouterOutputs } from '../client.js';
+import type { SecrecyClient } from '../index.js';
+export declare class SecrecyIdentityClient {
+    #private;
+    constructor(client: SecrecyClient);
+    get(input: RouterInputs['identity']['get']): Promise<RouterOutputs['identity']['get']>;
+    getMany(input: RouterInputs['identity']['getMany']): Promise<RouterOutputs['identity']['getMany']>;
+    list(input: RouterInputs['identity']['list']): Promise<RouterOutputs['identity']['list']>;
+}

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

@@ -6,11 +6,13 @@ import { SecrecyAppClient } from './SecrecyAppClient.js';
 import { SecrecyDbClient } from './SecrecyDbClient.js';
 import { SecrecyWalletClient } from './SecrecyWalletClient.js';
 import { SecrecyPayClient } from './SecrecyPayClient.js';
-import { type ApiClient, type RouterInputs, type RouterOutputs } from '../client.js';
+import { type ApiClient, type RouterInputs } from '../client.js';
 import { SecrecyUserClient } from './SecrecyUserClient.js';
 import { SecrecyPseudonymClient } from './SecrecyPseudonymClient.js';
 import { SecrecyOrganizationClient } from './SecrecyOrganizationClient.js';
 import type { AccessIdentity, GroupIdentity, UserAppIdentity } from './types/identity.js';
+import { SecrecyGroupClient } from './SecrecyGroupClient.js';
+import { SecrecyIdentityClient } from './SecrecyIdentityClient.js';
 export type NewMail = Pick<RouterInputs['mail']['createDraft'], 'body' | 'subject' | 'senderFiles' | 'recipients' | 'replyToId'>;
 export type ProgressCallback = (progress: SecretStreamProgress) => Promise<void>;
 export interface SecrecyClientOptions {
@@ -32,6 +34,8 @@ export declare class SecrecyClient extends BaseClient {
     pay: SecrecyPayClient;
     user: SecrecyUserClient;
     pseudonym: SecrecyPseudonymClient;
+    group: SecrecyGroupClient;
+    identity: SecrecyIdentityClient;
     constructor(opts: SecrecyClientOptions);
     get publicKey(): string;
     get apiClient(): Readonly<ApiClient>;
@@ -42,5 +46,4 @@ export declare class SecrecyClient extends BaseClient {
     get uaIdentity(): Readonly<UserAppIdentity>;
     decryptAnonymous(data: Uint8Array): Uint8Array;
     logout(sessionId?: string | null | undefined): Promise<void>;
-    getIdentities(input: RouterInputs['identity']['getMany']): Promise<RouterOutputs['identity']['getMany']>;
 }

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

@@ -67,10 +67,10 @@ export type ApiNodeParent = NonNullable<RouterOutputs['cloud']['nodeFullById']['
 export type NodeType = ApiNode['type'];
 export type EncryptedNodeInfos = {
     id: string;
-    nameKey: string | null;
+    nameKey: string;
     data: {
         id: string;
-        key: string | null;
+        key: string;
     }[];
 };
 export type ShareNodeDetails = {

package/dist/types/client.d.ts

@@ -5866,6 +5866,178 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => import
             meta: any;
         }>;
     }>;
+    group: import("@trpc/server").TRPCDecorateCreateRouterOptions<{
+        addMember: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                fromPubKey: string;
+                id: string;
+                encPriv: string;
+                pubKey: string;
+                role?: "ADMIN" | "MEMBER" | undefined;
+            };
+            output: {
+                member: {
+                    createdAt: Date;
+                    role: "ADMIN" | "MEMBER";
+                    groupId: string;
+                    identityPubKey: string;
+                    sharedByPubKey: string;
+                    encPriv: string;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        create: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                fromPubKey: string;
+                name: string;
+                encPriv: string;
+                pubKey: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    createdAt: Date;
+                    name: string;
+                    updatedAt: Date;
+                    identityPubKey: string;
+                    ownerPubKey: string;
+                    organizationId: string | null;
+                    applicationId: string | null;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        deleteMember: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+                pubKey: string;
+            };
+            output: {
+                member: {
+                    createdAt: Date;
+                    role: "ADMIN" | "MEMBER";
+                    groupId: string;
+                    identityPubKey: string;
+                    sharedByPubKey: string;
+                    encPriv: string;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        delete: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    createdAt: Date;
+                    name: string;
+                    updatedAt: Date;
+                    identityPubKey: string;
+                    ownerPubKey: string;
+                    organizationId: string | null;
+                    applicationId: string | null;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        get: import("@trpc/server").TRPCQueryProcedure<{
+            input: {
+                id: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    name: string;
+                };
+            };
+            meta: any;
+        }>;
+        getMany: import("@trpc/server").TRPCQueryProcedure<{
+            input: {
+                ids: string[];
+            };
+            output: {
+                groups: {
+                    id: string;
+                    name: string;
+                }[];
+            };
+            meta: any;
+        }>;
+        transferOwnership: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+                pubKey: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    createdAt: Date;
+                    name: string;
+                    updatedAt: Date;
+                    identityPubKey: string;
+                    ownerPubKey: string;
+                    organizationId: string | null;
+                    applicationId: string | null;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        updateMember: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+                pubKey: string;
+                role: "ADMIN" | "MEMBER";
+            };
+            output: {
+                member: {
+                    createdAt: Date;
+                    role: "ADMIN" | "MEMBER";
+                    groupId: string;
+                    identityPubKey: string;
+                    sharedByPubKey: string;
+                    encPriv: string;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        update: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+                name: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    createdAt: Date;
+                    name: string;
+                    updatedAt: Date;
+                    identityPubKey: string;
+                    ownerPubKey: string;
+                    organizationId: string | null;
+                    applicationId: string | null;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+    }>;
 }>>;
 export declare const getTrpcGuestClient: ({ url }?: {
     url?: string;
@@ -11726,5 +11898,177 @@ export declare const getTrpcGuestClient: ({ url }?: {
             meta: any;
         }>;
     }>;
+    group: import("@trpc/server").TRPCDecorateCreateRouterOptions<{
+        addMember: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                fromPubKey: string;
+                id: string;
+                encPriv: string;
+                pubKey: string;
+                role?: "ADMIN" | "MEMBER" | undefined;
+            };
+            output: {
+                member: {
+                    createdAt: Date;
+                    role: "ADMIN" | "MEMBER";
+                    groupId: string;
+                    identityPubKey: string;
+                    sharedByPubKey: string;
+                    encPriv: string;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        create: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                fromPubKey: string;
+                name: string;
+                encPriv: string;
+                pubKey: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    createdAt: Date;
+                    name: string;
+                    updatedAt: Date;
+                    identityPubKey: string;
+                    ownerPubKey: string;
+                    organizationId: string | null;
+                    applicationId: string | null;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        deleteMember: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+                pubKey: string;
+            };
+            output: {
+                member: {
+                    createdAt: Date;
+                    role: "ADMIN" | "MEMBER";
+                    groupId: string;
+                    identityPubKey: string;
+                    sharedByPubKey: string;
+                    encPriv: string;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        delete: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    createdAt: Date;
+                    name: string;
+                    updatedAt: Date;
+                    identityPubKey: string;
+                    ownerPubKey: string;
+                    organizationId: string | null;
+                    applicationId: string | null;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        get: import("@trpc/server").TRPCQueryProcedure<{
+            input: {
+                id: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    name: string;
+                };
+            };
+            meta: any;
+        }>;
+        getMany: import("@trpc/server").TRPCQueryProcedure<{
+            input: {
+                ids: string[];
+            };
+            output: {
+                groups: {
+                    id: string;
+                    name: string;
+                }[];
+            };
+            meta: any;
+        }>;
+        transferOwnership: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+                pubKey: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    createdAt: Date;
+                    name: string;
+                    updatedAt: Date;
+                    identityPubKey: string;
+                    ownerPubKey: string;
+                    organizationId: string | null;
+                    applicationId: string | null;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        updateMember: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+                pubKey: string;
+                role: "ADMIN" | "MEMBER";
+            };
+            output: {
+                member: {
+                    createdAt: Date;
+                    role: "ADMIN" | "MEMBER";
+                    groupId: string;
+                    identityPubKey: string;
+                    sharedByPubKey: string;
+                    encPriv: string;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+        update: import("@trpc/server").TRPCMutationProcedure<{
+            input: {
+                id: string;
+                name: string;
+            };
+            output: {
+                group: {
+                    id: string;
+                    createdAt: Date;
+                    name: string;
+                    updatedAt: Date;
+                    identityPubKey: string;
+                    ownerPubKey: string;
+                    organizationId: string | null;
+                    applicationId: string | null;
+                    initiatorAppId: string;
+                    initiatorUserId: string;
+                };
+            };
+            meta: any;
+        }>;
+    }>;
 }>>;
 export type ApiClient = ReturnType<typeof createTRPCClient>;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.75.0-feat-groups-identity.4",
+  "version": "1.75.0-feat-groups-identity.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"
@@ -76,7 +76,7 @@
   },
   "dependencies": {
     "@js-temporal/polyfill": "^0.5.1",
-    "@secrecy/trpc-api-types": "1.33.0-feat-groups-identity.25",
+    "@secrecy/trpc-api-types": "1.33.0-feat-groups-identity.31",
     "@trpc/client": "11.6.0",
     "@trpc/server": "^11.6.0",
     "@types/libsodium-wrappers-sumo": "^0.7.8",