@secrecy/lib 1.74.0-feat-groups-identity.4 → 1.74.0-feat-transfer-adaptations.1

package/dist/lib/base-client.js

@@ -13,20 +13,6 @@ async function getPublicUser(client, id) {
     usersCache.set(user.id, user);
     return user;
 }
-async function getPublicUsers(client, ids) {
-    let users = ids
-        .map((id) => usersCache.get(id))
-        .filter((u) => u !== undefined);
-    const missingIds = ids.filter((id) => !usersCache.has(id));
-    if (missingIds.length > 0) {
-        const fetchedUsers = await client.user.byIds.query({
-            ids: missingIds,
-        });
-        fetchedUsers.forEach((user) => usersCache.set(user.id, user));
-        users = users.concat(fetchedUsers);
-    }
-    return users;
-}
 export class BaseClient {
     static getBaseClient = (opts = {}) => createTRPCClient(opts);
     client;
@@ -39,6 +25,7 @@ export class BaseClient {
             auth: opts.secrecyUrls?.auth ?? 'https://auth.secrecy.tech',
             account: opts.secrecyUrls?.account ?? 'https://account.secrecy.tech',
             api: opts.secrecyUrls?.api ?? 'https://api.secrecy.tech',
+            data: opts.secrecyUrls?.data ?? 'https://data.secrecy.tech',
         };
         this.client =
             opts.apiClient ??
@@ -71,7 +58,7 @@ export class BaseClient {
             this.sessionId !== this.#me.sessionId ||
             Date.now() - this.#me.fetchedAt > 5 * 60 * 1000) {
             const data = await this.client.user.self.query({
-                t: Date.now(),
+            // t: Date.now(), // TODO needed or what?
             });
             this.#me = {
                 data,
@@ -89,14 +76,6 @@ export class BaseClient {
         const user = await getPublicUser(this.client, userId);
         return user;
     }
-    static async getUsers(userIds, opts) {
-        const users = await getPublicUsers(this.getBaseClient(opts), userIds);
-        return users;
-    }
-    async getUsers(userIds) {
-        const users = await getPublicUsers(this.client, userIds);
-        return users;
-    }
     async searchUsers(search) {
         const users = await this.client.user.searchMany.query({
             search,
@@ -133,12 +112,10 @@ export class BaseClient {
         const local = getStorage(false);
         const session = getStorage(true);
         local.jwt.clear();
-        local.identities.clear();
-        local.keyPairs.clear();
+        local.userAppKeys.clear();
         local.userAppSession.clear();
         session.jwt.clear();
-        session.identities.clear();
-        session.keyPairs.clear();
+        session.userAppKeys.clear();
         session.userAppSession.clear();
         usersCache.clear();
     };

package/dist/lib/client/SecrecyAppClient.js

@@ -4,11 +4,15 @@ import { publicKeysCache } from '../cache.js';
 export class SecrecyAppClient {
     jwt;
     jwtDecoded;
-    #client;
-    constructor(uaJwt, client) {
+    // #client: SecrecyClient
+    // #keys: KeyPair;
+    #apiClient;
+    constructor(uaJwt, _client, _keys, apiClient) {
         this.jwt = uaJwt;
         this.jwtDecoded = decode(uaJwt);
-        this.#client = client;
+        // this.#client = client
+        // this.#keys = keys;
+        this.#apiClient = apiClient;
     }
     get userId() {
         const sub = this.jwtDecoded.sub;
@@ -31,7 +35,7 @@ export class SecrecyAppClient {
         // if (this.jwtDecoded.exp && this.jwtDecoded.exp * 1000 < Date.now()) {
         //   return this.jwt;
         // }
-        const { jwt } = await this.#client.apiClient.auth.jwt.query({
+        const { jwt } = await this.#apiClient.auth.jwt.query({
             includeEmail: typeof this.jwtDecoded.email === 'string',
         });
         this.jwt = jwt;
@@ -49,19 +53,19 @@ export class SecrecyAppClient {
         return jwt;
     }
     async limits() {
-        return await this.#client.apiClient.application.limits.query({});
+        return await this.#apiClient.application.limits.query({});
     }
     async metrics() {
-        return await this.#client.apiClient.application.metrics.query({});
+        return await this.#apiClient.application.metrics.query({});
     }
     async quotas() {
-        return await this.#client.apiClient.application.quotas.query({});
+        return await this.#apiClient.application.quotas.query({});
     }
     async isApplicationUser(input) {
-        return await this.#client.apiClient.application.isApplicationUser.query(input);
+        return await this.#apiClient.application.isApplicationUser.query(input);
     }
     async updateNotifications(notifications) {
-        const updateAppNotifications = await this.#client.apiClient.application.updateNotification.mutate({
+        const updateAppNotifications = await this.#apiClient.application.updateNotification.mutate({
             cloud: notifications.cloud,
             disableAllUntil: notifications.disableAllUntil,
             enableAll: notifications.enableAll,
@@ -70,7 +74,7 @@ export class SecrecyAppClient {
         return updateAppNotifications;
     }
     async notifications() {
-        return await this.#client.apiClient.application.notification.query();
+        return await this.#apiClient.application.notification.query();
     }
     async userPublicKey(input, appId) {
         appId ??= this.appId;
@@ -88,7 +92,7 @@ export class SecrecyAppClient {
             ...new Set(userIds.filter((userId) => publicKeys[userId] === undefined)),
         ];
         if (missingKeys.length > 0) {
-            const userKeysMap = await this.#client.apiClient.application.userPublicKey.query({
+            const userKeysMap = await this.#apiClient.application.userPublicKey.query({
                 userIds: missingKeys,
                 appId,
             });
@@ -109,11 +113,11 @@ export class SecrecyAppClient {
         return Array.isArray(input) ? publicKeys : publicKeys[input];
     }
     async settings() {
-        const settings = await this.#client.apiClient.application.settings.query({});
+        const settings = await this.#apiClient.application.settings.query({});
         return settings;
     }
     async updateSettings(settings) {
-        const updateAppSettings = await this.#client.apiClient.application.updateSettings.mutate({
+        const updateAppSettings = await this.#apiClient.application.updateSettings.mutate({
             cloudNodeDaysForDelete: settings.cloudNodeDaysForDelete,
             historyDataDaysForDelete: settings.historyDataDaysForDelete,
             historyDataMaxCount: settings.historyDataMaxCount,