@secrecy/lib 1.56.0 → 1.58.0

package/dist/lib/base-client.js

@@ -15,21 +15,26 @@ async function getPublicUser(client, id) {
     return user;
 }
 export class BaseClient {
-    static getBaseClient = (session, onAccessDenied) => createTRPCClient(session, onAccessDenied);
+    static getBaseClient = (opts = {}) => createTRPCClient(opts);
     client;
+    baseUrl;
     sessionId;
-    constructor(session, onAccessDenied) {
-        this.sessionId = session;
-        this.client = BaseClient.getBaseClient(session, async () => {
-            console.log('[BASE_CLIENT - BEFORE] - Access denied');
-            await onAccessDenied?.();
-            console.log('[BASE_CLIENT - AFTER] - Access denied');
-            try {
-                await this.logout();
-            }
-            finally {
-                location.reload();
-            }
+    constructor(opts) {
+        this.sessionId = opts.session;
+        this.baseUrl = opts.baseUrl ?? 'https://www.secrecy.tech';
+        this.client = BaseClient.getBaseClient({
+            ...opts,
+            onAccessDenied: async () => {
+                console.log('[BASE_CLIENT - BEFORE] - Access denied');
+                await opts.onAccessDenied?.();
+                console.log('[BASE_CLIENT - AFTER] - Access denied');
+                try {
+                    await this.logout();
+                }
+                finally {
+                    location.reload();
+                }
+            },
         });
     }
     async logout(sessionId) {
@@ -43,8 +48,8 @@ export class BaseClient {
     async me() {
         return await this.client.user.self.query({});
     }
-    static async getUser(userId, sessionId) {
-        const user = await getPublicUser(this.getBaseClient(sessionId), userId);
+    static async getUser(userId, opts) {
+        const user = await getPublicUser(this.getBaseClient(opts), userId);
         return user;
     }
     async getUser(userId) {
@@ -61,8 +66,8 @@ export class BaseClient {
         const updateProfile = await this.client.user.updateProfile.mutate(data);
         return updateProfile;
     }
-    static async isCryptoTransactionDone({ idOrHash, network = 'mainnet', }) {
-        const { isDone } = await this.getBaseClient().crypto.isTransactionDone.query({
+    static async isCryptoTransactionDone({ idOrHash, network = 'mainnet', opts, }) {
+        const { isDone } = await this.getBaseClient(opts).crypto.isTransactionDone.query({
             idOrHash,
             network,
         });
@@ -78,8 +83,8 @@ export class BaseClient {
             path: `/sign-up?gf=${btoa(getPreferedEmail(me.account.emails)?.email)}&au=${btoa(backUrl)}`,
         });
     }
-    static getPaymentRequest = async ({ paymentRequestId, secrecyIdSeller, }) => {
-        const getPaymentRequestToPay = await BaseClient.getBaseClient().stripe.paymentRequestToPay.query({
+    static getPaymentRequest = async ({ paymentRequestId, secrecyIdSeller, opts, }) => {
+        const getPaymentRequestToPay = await BaseClient.getBaseClient(opts).stripe.paymentRequestToPay.query({
             paymentRequestId,
             sellerId: secrecyIdSeller,
         });

package/dist/lib/client/SecrecyPayClient.js

@@ -1,4 +1,3 @@
-import { getUrl } from '../index.js';
 import { popup } from '../utils/popup-tools.js';
 export class SecrecyPayClient {
     #client;
@@ -10,17 +9,15 @@ export class SecrecyPayClient {
         // this.#apiClient = apiClient
     }
     async confirmPaymentIntent({ paymentIntentId, secrecyIdWhoCreatedPaymentIntent, secrecyIdWhoNeedToConfirmPaymentIntent, amount, currency, }) {
-        const url = getUrl({
-            hash: Buffer.from(JSON.stringify({
-                appSession: this.#client.sessionId,
-                paymentIntentId,
-                secrecyIdWhoCreatedPaymentIntent,
-                secrecyIdWhoNeedToConfirmPaymentIntent,
-                amount,
-                currency,
-            })).toString('base64'),
-            path: '/account/iframe/pay-confirm',
-        });
+        const hash = Buffer.from(JSON.stringify({
+            appSession: this.#client.sessionId,
+            paymentIntentId,
+            secrecyIdWhoCreatedPaymentIntent,
+            secrecyIdWhoNeedToConfirmPaymentIntent,
+            amount,
+            currency,
+        })).toString('base64');
+        const url = `${this.#client.baseUrl}/auth/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

@@ -1,4 +1,3 @@
-import { getUrl } from '../index.js';
 import { popup } from '../utils/popup-tools.js';
 export class SecrecyWalletClient {
     #client;
@@ -10,14 +9,12 @@ export class SecrecyWalletClient {
         // this.#thunder = thunder;
     }
     async createTransaction({ network = 'mainnet', tx, }) {
-        const url = getUrl({
-            hash: Buffer.from(JSON.stringify({
-                appSession: this.#client.sessionId,
-                network,
-                tx,
-            })).toString('base64'),
-            path: '/account/iframe/wallet-transaction',
-        });
+        const hash = Buffer.from(JSON.stringify({
+            appSession: this.#client.sessionId,
+            network,
+            tx,
+        })).toString('base64');
+        const url = `${this.#client.baseUrl}/auth/account/iframe/wallet-transaction#${hash}`;
         return await new Promise((resolve, reject) => popup(url, 'Secrecy Wallet - Transaction', {
             width: 500,
         }, (err, data) => {
@@ -29,14 +26,12 @@ export class SecrecyWalletClient {
         }));
     }
     async createSignature({ network = 'mainnet', message, }) {
-        const url = getUrl({
-            hash: Buffer.from(JSON.stringify({
-                appSession: this.#client.sessionId,
-                network,
-                message,
-            })).toString('base64'),
-            path: '/account/iframe/wallet-signature',
-        });
+        const hash = Buffer.from(JSON.stringify({
+            appSession: this.#client.sessionId,
+            network,
+            message,
+        })).toString('base64');
+        const url = `${this.#client.baseUrl}/auth/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,20 +17,6 @@ export function parseInfos() {
         return null;
     }
 }
-export const getUrl = ({ hash, path, }) => {
-    const lang = document.documentElement.lang;
-    path = path.startsWith('/') ? path : `/${path}`;
-    if (process.env.NEXT_PUBLIC_SECRECY_URL) {
-        return `${process.env.NEXT_PUBLIC_SECRECY_URL}/${lang}/auth${path}#${hash}`;
-    }
-    const protocol = process.env.NEXT_PUBLIC_VERCEL_ENV !== 'development' ? 'https' : 'http';
-    const url = process.env.NEXT_PUBLIC_VERCEL_ENV &&
-        process.env.NEXT_PUBLIC_VERCEL_ENV !== 'production' &&
-        process.env.NEXT_PUBLIC_IS_SECRECY_INTERNAL === 'true'
-        ? `${protocol}://${process.env.NEXT_PUBLIC_VERCEL_URL}/${lang}/auth`
-        : `https://www.secrecy.tech/${lang}/auth`;
-    return `${url}${path}#${hash}`;
-};
 export function getSecrecyClient(session) {
     const storage = getStorage(session);
     const uaSession = storage.userAppSession.load();
@@ -48,7 +34,7 @@ export function getSecrecyClient(session) {
     }
     return new SecrecyClient(uaSession, uaKeys, uaJwt);
 }
-export async function login({ appId, path, redirect, scopes, backPath, session, }) {
+export async function login({ appId, path, redirect, scopes, backPath, session, authUrl = 'https://www.secrecy.tech/auth/login', }) {
     return await new Promise((resolve, reject) => {
         const appUrl = window.location.origin;
         const client = getSecrecyClient();
@@ -62,10 +48,7 @@ export async function login({ appId, path, redirect, scopes, backPath, session,
                 backPath,
             };
             const data = btoa(JSON.stringify(infos)).replaceAll('=', '');
-            const url = getUrl({
-                hash: data,
-                path: 'login',
-            });
+            const url = `${authUrl}#${data}`;
             const validate = (infos) => {
                 const storage = getStorage(session);
                 storage.userAppSession.save(infos.uaSession);

package/dist/lib/client/index.js

@@ -27,14 +27,17 @@ export class SecrecyClient extends BaseClient {
     user;
     pseudonym;
     constructor(uaSession, uaKeys, uaJwt) {
-        super(uaSession, async () => {
-            console.log('[CLIENT] - Access denied');
-            try {
-                await this.logout();
-            }
-            catch {
-                // ignore
-            }
+        super({
+            session: uaSession,
+            onAccessDenied: async () => {
+                console.log('[CLIENT] - Access denied');
+                try {
+                    await this.logout();
+                }
+                catch {
+                    // ignore
+                }
+            },
         });
         this.#keys = uaKeys;
         this.cloud = new SecrecyCloudClient(this, this.#keys, this.client);

package/dist/lib/client.js

@@ -9,19 +9,7 @@ superjson.registerCustom({
     serialize: (v) => [...v],
     deserialize: (v) => Buffer.from(v),
 }, 'buffer');
-export const getUrl = () => {
-    if (process.env.NEXT_PUBLIC_SECRECY_URL) {
-        return `${process.env.NEXT_PUBLIC_SECRECY_URL}/api/trpc`;
-    }
-    const protocol = process.env.NEXT_PUBLIC_VERCEL_ENV !== 'development' ? 'https' : 'http';
-    const url = process.env.NEXT_PUBLIC_VERCEL_ENV &&
-        process.env.NEXT_PUBLIC_VERCEL_ENV !== 'production' &&
-        process.env.NEXT_PUBLIC_IS_SECRECY_INTERNAL === 'true'
-        ? `${protocol}://${process.env.NEXT_PUBLIC_VERCEL_URL}/api/trpc`
-        : `https://www.secrecy.tech/api/trpc`;
-    return url;
-};
-export const createTRPCClient = (session, onAccessDenied) => createTRPCProxyClient({
+export const createTRPCClient = (opts) => createTRPCProxyClient({
     transformer: superjson,
     links: [
         loggerLink({
@@ -29,14 +17,16 @@ export const createTRPCClient = (session, onAccessDenied) => createTRPCProxyClie
                 if (op.direction === 'down' &&
                     isTRPCClientError(op.result) &&
                     op.result.data?.code === 'UNAUTHORIZED') {
-                    void onAccessDenied?.();
+                    void opts.onAccessDenied?.();
                 }
                 return (process.env.NODE_ENV === 'development' ||
                     (op.direction === 'down' && op.result instanceof Error));
             },
         }),
         httpBatchLink({
-            url: getUrl(),
+            url: opts.baseUrl
+                ? `${opts.baseUrl}/api/trpc`
+                : 'https://www.secrecy.tech/api/trpc',
             maxURLLength: 2083,
             fetch: async (input, init) => {
                 const controller = new AbortController();
@@ -45,8 +35,8 @@ export const createTRPCClient = (session, onAccessDenied) => createTRPCProxyClie
                 }, 20000);
                 const headers = new Headers(init?.headers);
                 headers.set('secrecy-lib-version', SECRECY_LIB_VERSION);
-                if (typeof session === 'string') {
-                    headers.set('secrecy-session', session);
+                if (typeof opts.session === 'string') {
+                    headers.set('secrecy-session', opts.session);
                 }
                 const call = fetch(input, {
                     ...init,

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

@@ -1,28 +1,36 @@
-import { type ApiClient, type RouterOutputs, type RouterInputs } from './client.js';
+import { type ApiClient, type RouterOutputs, type RouterInputs, CreateTrpcClientOptions } from './client.js';
 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;
+    onAccessDenied?: () => void | Promise<void>;
+};
 export declare class BaseClient {
     #private;
-    static readonly getBaseClient: (session?: string | null | undefined, onAccessDenied?: () => void | Promise<void>) => ApiClient;
+    static readonly getBaseClient: (opts?: CreateTrpcClientOptions) => ApiClient;
     protected client: ApiClient;
+    baseUrl: string;
     sessionId: string;
-    constructor(session: string, onAccessDenied?: () => void | Promise<void>);
+    constructor(opts: BaseClientOptions);
     logout(sessionId?: string | null | undefined): Promise<void>;
     me(): Promise<SelfUser>;
-    static getUser(userId: string, sessionId?: string | null | undefined): Promise<PublicUser>;
+    static getUser(userId: string, opts?: CreateTrpcClientOptions): Promise<PublicUser>;
     getUser(userId: string): Promise<PublicUser>;
     searchUsers(search: string): Promise<PublicUser[]>;
     updateProfile(data: RouterInputs['user']['updateProfile']): Promise<Omit<SelfUser, 'account'>>;
-    static isCryptoTransactionDone({ idOrHash, network, }: {
+    static isCryptoTransactionDone({ idOrHash, network, opts, }: {
         idOrHash: string;
         network?: InfuraNetwork;
+        opts?: CreateTrpcClientOptions;
     }): Promise<boolean>;
     reportUser(data: RouterInputs['report']['create']): Promise<RouterOutputs['report']['create']>;
     getSponsorshipLink({ backUrl, }: {
         backUrl: string;
     }): Promise<string | null>;
-    static getPaymentRequest: ({ paymentRequestId, secrecyIdSeller, }: {
+    static getPaymentRequest: ({ paymentRequestId, secrecyIdSeller, opts, }: {
         paymentRequestId: string;
         secrecyIdSeller: string;
+        opts?: CreateTrpcClientOptions;
     }) => Promise<RouterOutputs["stripe"]["paymentRequestToPay"]>;
 }

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

@@ -1,13 +1,10 @@
 import { SecrecyClient } from './index.js';
 import { type SecrecyUserApp } from './types/index.js';
 export declare function parseInfos(): SecrecyUserApp | null;
-export declare const getUrl: ({ hash, path, }: {
-    hash: string;
-    path: string;
-}) => string;
 export interface HashInfos {
     appId: string;
     appUrl: string;
+    authUrl?: string;
     backPath?: string;
     path?: string | null | undefined;
     redirect?: boolean;
@@ -22,5 +19,5 @@ export declare function getSecrecyClient(session?: boolean): SecrecyClient | nul
 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, }: Params): Promise<LoginResponse<Params>>;
+export declare function login<Params extends UseSecrecyParams>({ appId, path, redirect, scopes, backPath, session, authUrl, }: Params): Promise<LoginResponse<Params>>;
 export {};

package/dist/types/client.d.ts

@@ -5,8 +5,12 @@ import superjson from 'superjson';
 export type RouterInputs = inferRouterInputs<AppRouter>;
 export type RouterOutputs = inferRouterOutputs<AppRouter>;
 export declare function isTRPCClientError(cause: unknown): cause is TRPCClientError<AppRouter>;
-export declare const getUrl: () => string;
-export declare const createTRPCClient: (session?: string | null | undefined, onAccessDenied?: () => void | Promise<void>) => {
+export interface CreateTrpcClientOptions {
+    session?: string | null | undefined;
+    baseUrl?: string | null | undefined;
+    onAccessDenied?: () => void | Promise<void> | null | undefined;
+}
+export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => {
     account: {
         createUser: {
             mutate: import("@trpc/client").Resolver<import("@trpc/server").BuildProcedure<"mutation", {

package/package.json

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