@secrecy/lib 1.59.0 → 1.59.1

package/dist/lib/base-client.js

@@ -16,11 +16,13 @@ async function getPublicUser(client, id) {
 export class BaseClient {
     static getBaseClient = (opts = {}) => createTRPCClient(opts);
     client;
-    baseUrl;
+    authUrl;
+    apiUrl;
     sessionId;
     constructor(opts) {
         this.sessionId = opts.session;
-        this.baseUrl = opts.baseUrl ?? 'https://www.secrecy.tech';
+        this.apiUrl = opts.apiUrl ?? 'https://api.secrecy.tech';
+        this.authUrl = opts.authUrl ?? 'https://auth.secrecy.tech';
         this.client = BaseClient.getBaseClient({
             ...opts,
             onAccessDenied: async () => {
@@ -78,8 +80,7 @@ export class BaseClient {
     async getSponsorshipLink({ backUrl, }) {
         const me = await this.me();
         const hash = btoa(getPreferedEmail(me.account.emails)?.email);
-        const authUrl = this.baseUrl.replace('www', 'auth');
-        return `${authUrl}/sign-up/gf=${hash}&au=${btoa(backUrl)}`;
+        return `${this.authUrl}/sign-up/gf=${hash}&au=${btoa(backUrl)}`;
     }
     static getPaymentRequest = async ({ paymentRequestId, secrecyIdSeller, opts, }) => {
         const getPaymentRequestToPay = await BaseClient.getBaseClient(opts).stripe.paymentRequestToPay.query({

package/dist/lib/client/SecrecyPayClient.js

@@ -17,7 +17,7 @@ export class SecrecyPayClient {
             amount,
             currency,
         })).toString('base64');
-        const url = `${this.#client.baseUrl}/auth/account/iframe/pay-confirm#${hash}`;
+        const url = `${this.#client.authUrl}/account/iframe/pay-confirm#${hash}`;
         return await new Promise((resolve, reject) => popup(url, 'Secrecy Pay - Confirm Payment Intent', {
             width: 500,
         }, (err, data) => {

package/dist/lib/client/SecrecyWalletClient.js

@@ -14,7 +14,7 @@ export class SecrecyWalletClient {
             network,
             tx,
         })).toString('base64');
-        const url = `${this.#client.baseUrl}/auth/account/iframe/wallet-transaction#${hash}`;
+        const url = `${this.#client.authUrl}/account/iframe/wallet-transaction#${hash}`;
         return await new Promise((resolve, reject) => popup(url, 'Secrecy Wallet - Transaction', {
             width: 500,
         }, (err, data) => {
@@ -31,7 +31,7 @@ export class SecrecyWalletClient {
             network,
             message,
         })).toString('base64');
-        const url = `${this.#client.baseUrl}/auth/account/iframe/wallet-signature#${hash}`;
+        const url = `${this.#client.authUrl}/account/iframe/wallet-signature#${hash}`;
         return await new Promise((resolve, reject) => popup(url, 'Secrecy Wallet - Signature', {
             width: 500,
         }, (err, data) => {

package/dist/lib/client/helpers.js

@@ -17,8 +17,8 @@ export function parseInfos() {
         return null;
     }
 }
-export function getSecrecyClient(session) {
-    const storage = getStorage(session);
+export function getSecrecyClient(opts = {}) {
+    const storage = getStorage(opts.session);
     const uaSession = storage.userAppSession.load();
     const uaKeys = storage.userAppKeys.load();
     const uaJwt = storage.jwt.load();
@@ -28,16 +28,28 @@ export function getSecrecyClient(session) {
             storage.userAppKeys.save(infos.keys);
             storage.userAppSession.save(infos.uaSession);
             storage.jwt.save(infos.jwt);
-            return new SecrecyClient(infos.uaSession, infos.keys, infos.jwt);
+            return new SecrecyClient({
+                uaSession: infos.uaSession,
+                uaKeys: infos.keys,
+                uaJwt: infos.jwt,
+                authUrl: opts.authUrl,
+                apiUrl: opts.apiUrl,
+            });
         }
         return null;
     }
-    return new SecrecyClient(uaSession, uaKeys, uaJwt);
+    return new SecrecyClient({
+        uaSession: uaSession,
+        uaKeys: uaKeys,
+        uaJwt: uaJwt,
+        authUrl: opts.authUrl,
+        apiUrl: opts.apiUrl,
+    });
 }
-export async function login({ appId, path, redirect, scopes, backPath, session, authUrl = 'https://auth.secrecy.tech/login', }) {
+export async function login({ appId, path, redirect, scopes, backPath, session, apiUrl, authUrl, }) {
     return await new Promise((resolve, reject) => {
         const appUrl = window.location.origin;
-        const client = getSecrecyClient();
+        const client = getSecrecyClient({ authUrl, apiUrl });
         if (client === null) {
             const infos = {
                 appUrl,
@@ -54,7 +66,13 @@ export async function login({ appId, path, redirect, scopes, backPath, session,
                 storage.userAppSession.save(infos.uaSession);
                 storage.userAppKeys.save(infos.keys);
                 storage.jwt.save(infos.jwt);
-                resolve(new SecrecyClient(infos.uaSession, infos.keys, infos.jwt));
+                resolve(new SecrecyClient({
+                    uaSession: infos.uaSession,
+                    uaKeys: infos.keys,
+                    uaJwt: infos.jwt,
+                    authUrl: authUrl,
+                    apiUrl: apiUrl,
+                }));
             };
             if (redirect === true) {
                 const infos = parseInfos();

package/dist/lib/client/index.js

@@ -26,9 +26,11 @@ export class SecrecyClient extends BaseClient {
     pay;
     user;
     pseudonym;
-    constructor(uaSession, uaKeys, uaJwt) {
+    constructor(opts) {
         super({
-            session: uaSession,
+            session: opts.uaSession,
+            apiUrl: opts.apiUrl,
+            authUrl: opts.authUrl,
             onAccessDenied: async () => {
                 console.log('[CLIENT] - Access denied');
                 try {
@@ -39,10 +41,10 @@ export class SecrecyClient extends BaseClient {
                 }
             },
         });
-        this.#keys = uaKeys;
+        this.#keys = opts.uaKeys;
         this.cloud = new SecrecyCloudClient(this, this.#keys, this.client);
         this.mail = new SecrecyMailClient(this, this.#keys, this.client);
-        this.app = new SecrecyAppClient(uaJwt, this, this.#keys, this.client);
+        this.app = new SecrecyAppClient(opts.uaJwt, this, this.#keys, this.client);
         this.db = new SecrecyDbClient(this, this.#keys, this.client);
         this.wallet = new SecrecyWalletClient(this);
         this.pay = new SecrecyPayClient(this, this.#keys, this.client);

package/dist/types/base-client.d.ts

@@ -3,14 +3,16 @@ import { type InfuraNetwork, type PublicUser } from './index.js';
 import { type SelfUser } from './client/types/user.js';
 export type BaseClientOptions = {
     session: string;
-    baseUrl?: string | null | undefined;
+    authUrl?: string | null | undefined;
+    apiUrl?: string | null | undefined;
     onAccessDenied?: () => void | Promise<void>;
 };
 export declare class BaseClient {
     #private;
     static readonly getBaseClient: (opts?: CreateTrpcClientOptions) => ApiClient;
     protected client: ApiClient;
-    baseUrl: string;
+    authUrl: string;
+    apiUrl: string;
     sessionId: string;
     constructor(opts: BaseClientOptions);
     logout(sessionId?: string | null | undefined): Promise<void>;

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

@@ -4,7 +4,6 @@ export declare function parseInfos(): SecrecyUserApp | null;
 export interface HashInfos {
     appId: string;
     appUrl: string;
-    authUrl?: string;
     backPath?: string;
     path?: string | null | undefined;
     redirect?: boolean;
@@ -14,10 +13,16 @@ export interface HashInfos {
 }
 export type UseSecrecyParams = Omit<HashInfos, 'appUrl'> & {
     session?: boolean | undefined;
+    authUrl?: string | null | undefined;
+    apiUrl?: string | null | undefined;
 };
-export declare function getSecrecyClient(session?: boolean): SecrecyClient | null;
+export declare function getSecrecyClient(opts?: {
+    session?: boolean;
+    authUrl?: string | null | undefined;
+    apiUrl?: string | null | undefined;
+}): SecrecyClient | null;
 type LoginResponse<Params extends UseSecrecyParams> = Params extends {
     redirect: true;
 } ? SecrecyClient | null : SecrecyClient;
-export declare function login<Params extends UseSecrecyParams>({ appId, path, redirect, scopes, backPath, session, authUrl, }: Params): Promise<LoginResponse<Params>>;
+export declare function login<Params extends UseSecrecyParams>({ appId, path, redirect, scopes, backPath, session, apiUrl, authUrl, }: Params): Promise<LoginResponse<Params>>;
 export {};

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

@@ -13,6 +13,13 @@ import { SecrecyPseudonymClient } from './SecrecyPseudonymClient.js';
 export type NewMail = Pick<RouterInputs['mail']['createDraft'], 'body' | 'subject' | 'senderFiles' | 'recipients' | 'replyToId'>;
 export type ProgressCallback = (progress: Progress) => Promise<void>;
 export declare const encryptName: (name: string, nameKey: string) => Promise<string>;
+export interface SecrecyClientOptions {
+    uaSession: string;
+    uaKeys: KeyPair;
+    uaJwt: string;
+    authUrl?: string | null | undefined;
+    apiUrl?: string | null | undefined;
+}
 export declare class SecrecyClient extends BaseClient {
     #private;
     cloud: SecrecyCloudClient;
@@ -23,7 +30,7 @@ export declare class SecrecyClient extends BaseClient {
     pay: SecrecyPayClient;
     user: SecrecyUserClient;
     pseudonym: SecrecyPseudonymClient;
-    constructor(uaSession: string, uaKeys: KeyPair, uaJwt: string);
+    constructor(opts: SecrecyClientOptions);
     get publicKey(): string;
     decryptAnonymous(data: Uint8Array): Uint8Array;
     logout(sessionId?: string | null | undefined): Promise<void>;

package/package.json

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