@gymspace/sdk 1.0.3 → 1.1.1

package/src/client.ts

@@ -18,11 +18,7 @@ import {
 export class ApiClient {
   private axiosInstance: AxiosInstance;
   private config: GymSpaceConfig;
-  private refreshPromise: Promise<any> | null = null; // To prevent concurrent refresh attempts
-  
-  // Callbacks for token updates and auth errors
-  public onTokensUpdated?: (accessToken: string, refreshToken: string) => void;
-  public onAuthError?: (error: any) => void;
+  private refreshToken: string | null = null;
 
   constructor(config: GymSpaceConfig) {
     this.config = config;
@@ -48,9 +44,9 @@ export class ApiClient {
           config.headers['Authorization'] = `Bearer ${this.config.apiKey}`;
         }
 
-        // Add refresh token header if available
-        if (this.config.refreshToken && config.headers) {
-          config.headers['X-Refresh-Token'] = this.config.refreshToken;
+        // Add refresh token header for current-session endpoint
+        if (this.refreshToken && config.url?.includes('current-session') && config.headers) {
+          config.headers['X-Refresh-Token'] = this.refreshToken;
         }
 
         return config;
@@ -60,88 +56,18 @@ export class ApiClient {
       },
     );
 
-    // Response interceptor with automatic token refresh
+    // Response interceptor - simplified without automatic token refresh
     this.axiosInstance.interceptors.response.use(
       (response) => {
-        // Check for new tokens in response headers
-        const newAccessToken = response.headers['x-new-access-token'];
-        const newRefreshToken = response.headers['x-new-refresh-token'];
-        
-        if (newAccessToken && newRefreshToken) {
-          this.setTokens(newAccessToken, newRefreshToken);
-          // Emit token update event if needed
-          this.onTokensUpdated?.(newAccessToken, newRefreshToken);
-        }
-        
         return response;
       },
       async (error: AxiosError) => {
-        const originalRequest = error.config as InternalAxiosRequestConfig & { _retry?: boolean };
-        
-        // If it's a 401 error and we haven't retried yet, try to refresh the token
-        if (error.response?.status === 401 && !originalRequest._retry && this.config.refreshToken) {
-          originalRequest._retry = true;
-          
-          try {
-            // Prevent concurrent refresh attempts
-            if (!this.refreshPromise) {
-              this.refreshPromise = this.refreshAccessToken();
-            }
-            
-            const newTokens = await this.refreshPromise;
-            this.refreshPromise = null;
-            
-            if (newTokens) {
-              // Update the original request with new token
-              if (!originalRequest.headers) {
-                originalRequest.headers = {} as AxiosRequestHeaders;
-              }
-              originalRequest.headers['Authorization'] = `Bearer ${newTokens.access_token}`;
-
-              // Retry the original request
-              return this.axiosInstance(originalRequest);
-            }
-          } catch (refreshError) {
-            this.refreshPromise = null;
-            // If refresh fails, clear tokens and emit error
-            this.clearAuth();
-            this.onAuthError?.(refreshError);
-          }
-        }
-        
+        // Simply throw the error - no automatic refresh attempts
         throw this.handleError(error);
       },
     );
   }
 
-  /**
-   * Refresh the access token using the stored refresh token
-   */
-  private async refreshAccessToken(): Promise<any> {
-    if (!this.config.refreshToken) {
-      throw new AuthenticationError('No refresh token available');
-    }
-
-    try {
-      const response = await axios.post(
-        `${this.config.baseURL}/auth/refresh`,
-        { refresh_token: this.config.refreshToken },
-        {
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          timeout: this.config.timeout || 30000,
-        }
-      );
-
-      const newTokens = response.data;
-      this.setTokens(newTokens.access_token, newTokens.refresh_token);
-      
-      return newTokens;
-    } catch (error) {
-      throw new AuthenticationError('Failed to refresh token');
-    }
-  }
 
   private handleError(error: AxiosError): GymSpaceError {
     const requestPath = error.config?.url || 'unknown';
@@ -248,10 +174,12 @@ export class ApiClient {
     this.config.apiKey = token;
   }
 
-  setTokens(accessToken: string, refreshToken: string): void {
-    this.config.apiKey = accessToken;
-    // Store refresh token if needed for token refresh logic
-    this.config.refreshToken = refreshToken;
+  setRefreshToken(token: string | null): void {
+    this.refreshToken = token;
+  }
+
+  getRefreshToken(): string | null {
+    return this.refreshToken;
   }
 
   setGymId(gymId: string): void {
@@ -260,7 +188,7 @@ export class ApiClient {
 
   clearAuth(): void {
     delete this.config.apiKey;
-    delete this.config.refreshToken;
+    this.refreshToken = null;
     delete this.axiosInstance.defaults.headers.common['Authorization'];
     delete this.axiosInstance.defaults.headers.common['X-Gym-Id'];
   }

package/src/models/auth.ts

@@ -105,6 +105,8 @@ export interface InvitationValidationResponse {
 }
 
 export interface CurrentSessionResponse {
+  accessToken: string;
+  refreshToken?: string;
   user: {
     id: string;
     email: string;

package/src/models/contracts.ts

@@ -43,7 +43,7 @@ export interface Contract {
   status: ContractStatus;
   price: number;
   discountPercentage?: number;
-  finalPrice: number;
+  finalAmount: number;
   freezeStartDate?: string;
   freezeEndDate?: string;
   receiptIds?: string[];

package/src/models/sales.ts

@@ -52,6 +52,12 @@ export interface UpdatePaymentStatusDto {
   paymentStatus: 'paid' | 'unpaid';
 }
 
+export interface PaySaleDto {
+  paymentMethodId: string;
+  notes?: string;
+  fileIds?: string[];
+}
+
 export interface Sale {
   id: string;
   gymId: string;

package/src/resources/onboarding.ts

@@ -18,8 +18,8 @@ export class OnboardingResource extends BaseResource {
     const response = await this.client.post<StartOnboardingResponse>('/onboarding/start', data);
     
     // Store tokens after successful onboarding start
-    if (response.access_token && response.refresh_token) {
-      this.client.setTokens(response.access_token, response.refresh_token);
+    if (response.access_token) {
+      this.client.setAuthToken(response.access_token);
     }
     
     return response;

package/src/resources/sales.ts

@@ -1,9 +1,10 @@
 import { BaseResource } from './base';
-import { 
+import {
   Sale,
-  CreateSaleDto, 
+  CreateSaleDto,
   UpdateSaleDto,
   UpdatePaymentStatusDto,
+  PaySaleDto,
   SearchSalesParams,
   SalesStats,
   TopSellingProduct,
@@ -45,6 +46,14 @@ export class SalesResource extends BaseResource {
     return this.client.put<Sale>(`${this.basePath}/${id}/payment-status`, { paymentStatus }, options);
   }
 
+  async paySale(
+    id: string,
+    data: PaySaleDto,
+    options?: RequestOptions
+  ): Promise<Sale> {
+    return this.client.post<Sale>(`${this.basePath}/${id}/payment`, data, options);
+  }
+
   async deleteSale(id: string, options?: RequestOptions): Promise<void> {
     return this.client.delete<void>(`${this.basePath}/${id}`, options);
   }

package/src/sdk.ts

@@ -88,10 +88,17 @@ export class GymSpaceSdk {
   }
 
   /**
-   * Set both access and refresh tokens
+   * Set the refresh token
    */
-  setTokens(accessToken: string, refreshToken: string): void {
-    this.client.setTokens(accessToken, refreshToken);
+  setRefreshToken(token: string | null): void {
+    this.client.setRefreshToken(token);
+  }
+
+  /**
+   * Get the current refresh token
+   */
+  getRefreshToken(): string | null {
+    return this.client.getRefreshToken();
   }
 
   /**