@temboplus/afloat 0.1.11 → 0.1.13

package/script/src/features/wallet/repository.js

@@ -4,7 +4,6 @@ exports.WalletRepo = void 0;
 const base_repository_js_1 = require("../../shared/base_repository.js");
 const contract_js_1 = require("./contract.js");
 const repository_js_1 = require("../files-gen/repository.js");
-const manager_js_1 = require("../auth/manager.js");
 const permission_js_1 = require("../../models/permission.js");
 const index_js_1 = require("../../errors/index.js");
 /**
@@ -15,9 +14,15 @@ const index_js_1 = require("../../errors/index.js");
 class WalletRepo extends base_repository_js_1.BaseRepository {
     /**
      * Creates an instance of WalletRepo initialized with the wallet contract.
+     * @param {Object} [options] - Optional configuration
+     * @param {string} [options.root] - Custom API root URL
+     * @param {AfloatAuth} [options.auth] - Auth instance to use
      */
-    constructor() {
-        super("wallet", contract_js_1.contract);
+    constructor(props) {
+        super("wallet", contract_js_1.contract, {
+            root: props?.root,
+            auth: props?.auth,
+        });
     }
     /**
      * Gets an instance of the file generation repository.
@@ -25,7 +30,7 @@ class WalletRepo extends base_repository_js_1.BaseRepository {
      * @returns {AfloatFilesRepo} A new instance of AfloatFilesRepo
      */
     get fileGenRepo() {
-        return new repository_js_1.AfloatFilesRepo();
+        return new repository_js_1.AfloatFilesRepo({ auth: this.auth });
     }
     /**
      * Retrieves the current available balance for the wallet.
@@ -34,8 +39,9 @@ class WalletRepo extends base_repository_js_1.BaseRepository {
      * @returns {Promise<number>} The available balance amount
      */
     async getBalance() {
+        const auth = this.getAuthForPermissionCheck();
         const requirePerm = permission_js_1.Permissions.Wallet.ViewBalance;
-        if (!manager_js_1.AfloatAuth.instance.checkPermission(requirePerm)) {
+        if (!auth.checkPermission(requirePerm)) {
             throw new index_js_1.PermissionError({
                 message: "You are not authorized to view the account balance.",
                 requiredPermissions: [requirePerm],
@@ -72,8 +78,9 @@ class WalletRepo extends base_repository_js_1.BaseRepository {
      * @returns {Promise<WalletStatementItem[]>} Array of statement items for the specified period
      */
     async getStatement(props) {
+        const auth = this.getAuthForPermissionCheck();
         const requirePerm = permission_js_1.Permissions.Wallet.ViewStatement;
-        if (!manager_js_1.AfloatAuth.instance.checkPermission(requirePerm)) {
+        if (!auth.checkPermission(requirePerm)) {
             throw new index_js_1.PermissionError({
                 message: "You are not authorized to view the statement.",
                 requiredPermissions: [requirePerm],
@@ -103,8 +110,9 @@ class WalletRepo extends base_repository_js_1.BaseRepository {
      * @returns {Promise<StatementFile>} The generated statement file
      */
     async genStatement(fileType, props) {
+        const auth = this.getAuthForPermissionCheck();
         const requirePerm = permission_js_1.Permissions.Wallet.ViewStatement;
-        if (!manager_js_1.AfloatAuth.instance.checkPermission(requirePerm)) {
+        if (!auth.checkPermission(requirePerm)) {
             throw new index_js_1.PermissionError({
                 message: "You are not authorized to view the statement.",
                 requiredPermissions: [requirePerm],
@@ -123,8 +131,9 @@ class WalletRepo extends base_repository_js_1.BaseRepository {
      * @returns {Promise<StatementFile>} The generated PDF file containing wallet details
      */
     async genWalletDetailsPDF() {
+        const auth = this.getAuthForPermissionCheck();
         const requirePerm = permission_js_1.Permissions.Wallet.ViewBalance;
-        if (!manager_js_1.AfloatAuth.instance.checkPermission(requirePerm)) {
+        if (!auth.checkPermission(requirePerm)) {
             throw new index_js_1.PermissionError({
                 message: "You are not authorized to view the account details.",
                 requiredPermissions: [requirePerm],

package/script/src/shared/base_repository.d.ts

@@ -1,5 +1,6 @@
 import { type AppRouter } from "@ts-rest/core";
 import type { InitClientArgs } from "@ts-rest/core";
+import { AfloatAuth } from "../features/auth/manager.js";
 /**
  * BaseRepository
  *
@@ -28,15 +29,38 @@ export declare class BaseRepository<TContract extends AppRouter> {
      * @protected
      */
     protected root: string | undefined;
+    /**
+     * The auth instance to use for authentication
+     *
+     * @protected
+     */
+    protected auth: AfloatAuth | undefined;
     /**
      * Constructs a new instance of `BaseRepository`.
      *
-     * @param contract - The "ts-rest" contract
      * @param endpoint - API endpoint
+     * @param contract - The "ts-rest" contract
+     * @param args - Optional constructor arguments
+     * @param args.root - Optional API root URL
+     * @param args.auth - Optional auth instance to use
      */
     constructor(endpoint: string, contract: TContract, args?: {
         root?: string;
+        auth?: AfloatAuth;
     });
+    /**
+     * Gets an auth instance that can be used for permission checks.
+     * Follows a fallback strategy to find a valid auth instance.
+     *
+     * @protected
+     * @returns {AfloatAuth} A valid auth instance
+     * @throws {Error} If no valid auth instance is available
+     */
+    protected getAuthForPermissionCheck(): AfloatAuth;
+    /**
+     * Gets the initialized client for making API requests.
+     * Uses authentication token if available.
+     */
     get client(): { [TKey in keyof TContract]: TContract[TKey] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey], InitClientArgs>> : TContract[TKey] extends AppRouter ? TContract[TKey] extends infer T extends AppRouter ? { [TKey_1 in keyof T]: TContract[TKey][TKey_1] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1], InitClientArgs>> : TContract[TKey][TKey_1] extends AppRouter ? TContract[TKey][TKey_1] extends infer T_1 extends AppRouter ? { [TKey_2 in keyof T_1]: TContract[TKey][TKey_1][TKey_2] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2] extends AppRouter ? TContract[TKey][TKey_1][TKey_2] extends infer T_2 extends AppRouter ? { [TKey_3 in keyof T_2]: TContract[TKey][TKey_1][TKey_2][TKey_3] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3] extends infer T_3 extends AppRouter ? { [TKey_4 in keyof T_3]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4] extends infer T_4 extends AppRouter ? { [TKey_5 in keyof T_4]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5] extends infer T_5 extends AppRouter ? { [TKey_6 in keyof T_5]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6] extends infer T_6 extends AppRouter ? { [TKey_7 in keyof T_6]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7] extends infer T_7 extends AppRouter ? { [TKey_8 in keyof T_7]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8] extends infer T_8 extends AppRouter ? { [TKey_9 in keyof T_8]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9] extends infer T_9 extends AppRouter ? { [TKey_10 in keyof T_9]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9][TKey_10] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9][TKey_10], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9][TKey_10], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9][TKey_10] extends AppRouter ? any : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; };
     /**
      * Handles the API response by checking the HTTP status code and returning the response body

package/script/src/shared/base_repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base_repository.d.ts","sourceRoot":"","sources":["../../../src/src/shared/base_repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAc,MAAM,eAAe,CAAC;AAG3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAc,CAAC,SAAS,SAAS,SAAS;IACrD;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC;IAE9B;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B;;;;OAIG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC;;;;;OAKG;gBACS,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE;IAM3E,IAAI,MAAM,k0LAqBT;IAED;;;;;;;;;OASG;IACH,cAAc,CAAC,CAAC,EACd,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,EACzC,iBAAiB,EAAE,MAAM,GACxB,CAAC;CAgBL"}
+{"version":3,"file":"base_repository.d.ts","sourceRoot":"","sources":["../../../src/src/shared/base_repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAc,MAAM,eAAe,CAAC;AAG3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAe,MAAM,6BAA6B,CAAC;AAEtE;;;;;;;;GAQG;AACH,qBAAa,cAAc,CAAC,SAAS,SAAS,SAAS;IACrD;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC;IAE9B;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B;;;;OAIG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC;;;;OAIG;IACH,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IAEvC;;;;;;;;OAQG;gBACS,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE;QACxD,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,UAAU,CAAC;KACnB;IASD;;;;;;;OAOG;IACH,SAAS,CAAC,yBAAyB,IAAI,UAAU;IAgBjD;;;OAGG;IACH,IAAI,MAAM,k0LA+BT;IAED;;;;;;;;;OASG;IACH,cAAc,CAAC,CAAC,EACd,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,EACzC,iBAAiB,EAAE,MAAM,GACxB,CAAC;CAgBL"}

package/script/src/shared/base_repository.js

@@ -4,7 +4,7 @@ exports.BaseRepository = void 0;
 const core_1 = require("@ts-rest/core");
 const api_error_js_1 = require("../errors/api_error.js");
 const uuid_1 = require("uuid");
-const index_js_1 = require("../features/auth/index.js");
+const manager_js_1 = require("../features/auth/manager.js");
 /**
  * BaseRepository
  *
@@ -18,8 +18,11 @@ class BaseRepository {
     /**
      * Constructs a new instance of `BaseRepository`.
      *
-     * @param contract - The "ts-rest" contract
      * @param endpoint - API endpoint
+     * @param contract - The "ts-rest" contract
+     * @param args - Optional constructor arguments
+     * @param args.root - Optional API root URL
+     * @param args.auth - Optional auth instance to use
      */
     constructor(endpoint, contract, args) {
         /**
@@ -55,20 +58,68 @@ class BaseRepository {
             writable: true,
             value: void 0
         });
+        /**
+         * The auth instance to use for authentication
+         *
+         * @protected
+         */
+        Object.defineProperty(this, "auth", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.contract = contract;
         this.endpoint = endpoint;
         this.root = args?.root;
+        // Use provided auth or try to get the current context
+        this.auth = args?.auth || manager_js_1.AuthContext.current;
     }
+    /**
+     * Gets an auth instance that can be used for permission checks.
+     * Follows a fallback strategy to find a valid auth instance.
+     *
+     * @protected
+     * @returns {AfloatAuth} A valid auth instance
+     * @throws {Error} If no valid auth instance is available
+     */
+    getAuthForPermissionCheck() {
+        // Use the instance provided in constructor, or fallback to context
+        const auth = this.auth || manager_js_1.AuthContext.current;
+        if (!auth) {
+            try {
+                // Last resort: try to get the client singleton
+                return manager_js_1.AfloatAuth.instance;
+            }
+            catch (_) {
+                throw new Error(`No valid auth instance available for ${this.endpoint} repository`);
+            }
+        }
+        return auth;
+    }
+    /**
+     * Gets the initialized client for making API requests.
+     * Uses authentication token if available.
+     */
     get client() {
         const baseUrl = this.root
             ? `${this.root}/${this.endpoint}`
             : `https://api.afloat.money/v1/${this.endpoint}`;
         let token = "";
-        try {
-            token = index_js_1.AfloatAuth.instance.getUserToken() ?? "";
+        // Try to get token from the provided auth instance
+        if (this.auth) {
+            token = this.auth.getUserToken() ?? "";
         }
-        catch (_) {
-            // should fail when called within the server
+        // Fall back to singleton if no auth was provided, but handle exceptions
+        // that occur in server environments
+        else {
+            try {
+                token = manager_js_1.AfloatAuth.instance.getUserToken() ?? "";
+            }
+            catch (_) {
+                // This will fail when called within the server without initialization
+                // We'll proceed with an empty token
+            }
         }
         const args = {
             baseUrl,