@gymspace/sdk 1.0.2 → 1.1.0

package/src/client.ts

@@ -3,6 +3,7 @@ import axios, {
   AxiosRequestConfig,
   AxiosError,
   InternalAxiosRequestConfig,
+  AxiosRequestHeaders,
 } from 'axios';
 import { GymSpaceConfig, RequestOptions } from './types';
 import {
@@ -17,11 +18,6 @@ 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;
 
   constructor(config: GymSpaceConfig) {
     this.config = config;
@@ -47,11 +43,6 @@ 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;
-        }
-
         return config;
       },
       (error) => {
@@ -59,86 +50,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
-              originalRequest.headers = originalRequest.headers || {};
-              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';
@@ -245,19 +168,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;
-  }
-
   setGymId(gymId: string): void {
     this.axiosInstance.defaults.headers.common['X-Gym-Id'] = gymId;
   }
 
   clearAuth(): void {
     delete this.config.apiKey;
-    delete this.config.refreshToken;
     delete this.axiosInstance.defaults.headers.common['Authorization'];
     delete this.axiosInstance.defaults.headers.common['X-Gym-Id'];
   }

package/src/models/auth.ts

@@ -1,3 +1,5 @@
+import { SubscriptionPlan } from './subscriptions';
+
 export interface RegisterOwnerDto {
   name: string;
   email: string;
@@ -79,7 +81,6 @@ export interface ResendResetCodeResponseDto {
   message: string;
 }
 
-
 export interface RegisterCollaboratorDto {
   invitationToken: string;
   name: string;
@@ -87,19 +88,6 @@ export interface RegisterCollaboratorDto {
   password: string;
 }
 
-export interface SubscriptionPlan {
-  id: string;
-  name: string;
-  price: number;
-  billingFrequency: string;
-  maxGyms: number;
-  maxClientsPerGym: number;
-  maxUsersPerGym: number;
-  features: any;
-  description?: string;
-}
-
-
 export interface InvitationValidationResponse {
   valid: boolean;
   invitation: {
@@ -117,6 +105,7 @@ export interface InvitationValidationResponse {
 }
 
 export interface CurrentSessionResponse {
+  accessToken: string;
   user: {
     id: string;
     email: string;

package/src/models/organizations.ts

@@ -19,4 +19,20 @@ export interface OrganizationStats {
   totalContracts: number;
   activeContracts: number;
   totalRevenue: number;
+}
+
+export interface OrganizationWithDetails {
+  id: string;
+  name: string;
+  owner: {
+    id: string;
+    email: string;
+    fullName: string;
+  };
+  gyms: Array<{
+    id: string;
+    name: string;
+    address: string;
+  }>;
+  createdAt: Date;
 }

package/src/resources/auth.ts

@@ -6,7 +6,6 @@ import {
   RegisterCollaboratorDto,
   RegisterOwnerDto,
   ResendVerificationDto,
-  SubscriptionPlan,
   VerifyEmailDto,
   ChangePasswordDto,
   ChangePasswordResponseDto,
@@ -19,6 +18,7 @@ import {
   ResendResetCodeDto,
   ResendResetCodeResponseDto,
 } from '../models/auth';
+import { SubscriptionPlan } from '../models/subscriptions';
 import { RequestOptions } from '../types';
 import { BaseResource } from './base';
 

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/organizations.ts

@@ -1,5 +1,5 @@
 import { BaseResource } from './base';
-import { Organization, UpdateOrganizationDto, OrganizationStats } from '../models/organizations';
+import { Organization, UpdateOrganizationDto, OrganizationStats, OrganizationWithDetails } from '../models/organizations';
 import { RequestOptions } from '../types';
 
 export class OrganizationsResource extends BaseResource {
@@ -20,4 +20,8 @@ export class OrganizationsResource extends BaseResource {
   async getOrganizationStats(id: string, options?: RequestOptions): Promise<OrganizationStats> {
     return this.client.get<OrganizationStats>(`${this.basePath}/${id}/stats`, undefined, options);
   }
+
+  async listOrganizations(options?: RequestOptions): Promise<OrganizationWithDetails[]> {
+    return this.client.get<OrganizationWithDetails[]>(`${this.basePath}/list`, undefined, options);
+  }
 }

package/src/sdk.ts

@@ -87,12 +87,6 @@ export class GymSpaceSdk {
     this.client.setAuthToken(token);
   }
 
-  /**
-   * Set both access and refresh tokens
-   */
-  setTokens(accessToken: string, refreshToken: string): void {
-    this.client.setTokens(accessToken, refreshToken);
-  }
 
   /**
    * Set the current gym context