Merge branch 'main' of https://github.com/sulusolutions/l402-ts

sulusolutions · May 13, 2024 · e08be22 · e08be22
2 parents ca1193c + f1f935c
commit e08be22
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/client/axios.ts b/src/client/axios.ts
@@ -11,8 +11,7 @@ import { Wallet, PaymentResult, Store } from '../index';
 export function setupL402Interceptor(instance: AxiosInstance, wallet: Wallet, store: Store): void {
   // Request interceptor to set an authorization header if a token is available
   instance.interceptors.request.use((config: InternalAxiosRequestConfig<any>) => {
-    // Combine baseURL and URL into a fully qualified URL if baseURL is specified
-    const url = config.baseURL ? new URL(config.url ?? '', config.baseURL).toString() : config.url;
+    const url = axios.getUri(config); // Get the fully qualified URL
     const method = config.method?.toUpperCase() || 'GET'; // Use 'GET' as the default method
 
     // Retrieve the token using the fully qualified URL and HTTP method
@@ -40,7 +39,7 @@ export function setupL402Interceptor(instance: AxiosInstance, wallet: Wallet, st
           if (paymentResult.success) {
             // Create a new L402 token and store it
             const l402Token = `${challenge.header_key} ${challenge.macaroon}:${paymentResult.preimage}`;
-            const url = config.baseURL ? new URL(config.url ?? '', config.baseURL).toString() : config.url;
+            const url = axios.getUri(config); // Get the fully qualified URL
             const method = config.method?.toUpperCase() || 'GET'; // Use 'GET' as the default method
 
             // Store the new token with the fully qualified URL and method