glitch-javascript-sdk 0.4.4 → 0.4.6

package/dist/esm/util/Requests.d.ts

@@ -1,52 +1,24 @@
+import { AxiosPromise } from 'axios';
 import Config from '../config/Config';
 import Route from '../routes/interface';
 import Response from './Response';
-import { AxiosPromise } from 'axios';
 declare class Requests {
-    config: Config;
+    private static axiosInstance;
+    private static config;
     private static baseUrl;
     private static authToken;
     private static community_id?;
     constructor(config: Config);
-    /**
-     * Sets the base url of the API.
-     *
-     * @param url The url to of the API.
-     */
     static setBaseUrl(url: string): void;
-    /**
-     * Sets the JSON Web token
-     *
-     * @param token
-     */
     static setAuthToken(token: string): void;
-    /**
-     * Sets the community id that will be associated with all requests
-     *
-     * @param token
-     */
     static setCommunityID(community_id: string | undefined): void;
     private static request;
-    /**
-     * Calls a GET request to the url endpoint.
-     *
-     * @param url
-     * @returns
-     */
     static get<T>(url: string, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static post<T>(url: string, data: any, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static put<T>(url: string, data: any, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static delete<T>(url: string, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static uploadFile<T>(url: string, filename: string, file: File, data?: any, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static uploadBlob<T>(url: string, filename: string, blob: Blob, data?: any, params?: Record<string, any>): AxiosPromise<Response<T>>;
-    /**
-     *  The Route class contains the method and url, thereforce items can be
-     *  automatically routed depending on the configuration.
-     *
-     * @param route
-     * @param data
-     * @returns
-     */
     static processRoute<T>(route: Route, data?: object, routeReplace?: {
         [key: string]: any;
     }, params?: Record<string, any>): AxiosPromise<Response<T>>;

package/dist/index.d.ts

@@ -1674,50 +1674,22 @@ interface Route {
 }
 
 declare class Requests {
-    config: Config;
+    private static axiosInstance;
+    private static config;
     private static baseUrl;
     private static authToken;
     private static community_id?;
     constructor(config: Config);
-    /**
-     * Sets the base url of the API.
-     *
-     * @param url The url to of the API.
-     */
     static setBaseUrl(url: string): void;
-    /**
-     * Sets the JSON Web token
-     *
-     * @param token
-     */
     static setAuthToken(token: string): void;
-    /**
-     * Sets the community id that will be associated with all requests
-     *
-     * @param token
-     */
     static setCommunityID(community_id: string | undefined): void;
     private static request;
-    /**
-     * Calls a GET request to the url endpoint.
-     *
-     * @param url
-     * @returns
-     */
     static get<T>(url: string, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static post<T>(url: string, data: any, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static put<T>(url: string, data: any, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static delete<T>(url: string, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static uploadFile<T>(url: string, filename: string, file: File, data?: any, params?: Record<string, any>): AxiosPromise<Response<T>>;
     static uploadBlob<T>(url: string, filename: string, blob: Blob, data?: any, params?: Record<string, any>): AxiosPromise<Response<T>>;
-    /**
-     *  The Route class contains the method and url, thereforce items can be
-     *  automatically routed depending on the configuration.
-     *
-     * @param route
-     * @param data
-     * @returns
-     */
     static processRoute<T>(route: Route, data?: object, routeReplace?: {
         [key: string]: any;
     }, params?: Record<string, any>): AxiosPromise<Response<T>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glitch-javascript-sdk",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Javascript SDK for Glitch",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/api/Auth.ts

@@ -80,7 +80,7 @@ class Auth {
      * @returns promise
      */
     public static resetPassword<T>(data : object) : AxiosPromise<Response<T>> {
-        return Requests.processRoute(AuthRoutes.routes.forgot_password, data);
+        return Requests.processRoute(AuthRoutes.routes.reset_password, data);
     }
 
 }

package/src/util/Requests.ts

@@ -1,86 +1,64 @@
-import axios from 'axios';
+import axios, { AxiosInstance, AxiosPromise } from 'axios';
 import Config from '../config/Config';
 import HTTP_METHODS from '../constants/HttpMethods';
 import Route from '../routes/interface';
 import Response from './Response';
-import { AxiosPromise } from 'axios';
 
 class Requests {
-
-  config: Config;
-
-  //The base url of the API.
+  private static axiosInstance: AxiosInstance;
+  private static config: Config;
   private static baseUrl = "";
-
-  //The Json Web Token to send in the header
   private static authToken = "";
-
-  //The ID of the community that will be added to request
-  private static community_id? = "";
+  private static community_id?: string = "";
 
   constructor(config: Config) {
-    this.config = config;
+    Requests.config = config;
+    Requests.axiosInstance = axios.create({
+      baseURL: Requests.baseUrl,
+      headers: { 'Content-Type': 'application/json' },
+    });
   }
 
-  /**
-   * Sets the base url of the API.
-   * 
-   * @param url The url to of the API.
-   */
-  public static setBaseUrl(url : string) {
-    this.baseUrl = url;
+  public static setBaseUrl(url: string) {
+    Requests.baseUrl = url;
+    Requests.axiosInstance.defaults.baseURL = url;
   }
 
-  /**
-   * Sets the JSON Web token
-   * 
-   * @param token 
-   */
-  public static setAuthToken(token : string) {
-    this.authToken = token;
+  public static setAuthToken(token: string) {
+    Requests.authToken = token;
   }
 
-  /**
-   * Sets the community id that will be associated with all requests
-   * 
-   * @param token 
-   */
-  public static setCommunityID(community_id : string | undefined) {
-    this.community_id = community_id;
+  public static setCommunityID(community_id: string | undefined) {
+    Requests.community_id = community_id;
   }
 
-
-  
   private static request<T>(
     method: 'GET' | 'POST' | 'PUT' | 'DELETE',
     url: string,
     data?: any,
     fileData?: any
   ): AxiosPromise<Response<T>> {
-
-    let headers : { [key: string]: string } = {
+    let headers: { [key: string]: string } = {
       'Content-Type': 'application/json',
     };
 
-     if(this.authToken) {
-      headers['Authorization'] = `Bearer ${this.authToken}`;
-     }
+    if (Requests.authToken) {
+      headers['Authorization'] = `Bearer ${Requests.authToken}`;
+    }
 
     if (fileData) {
       headers['Content-Type'] = 'multipart/form-data';
     }
 
-    //Remove double slashes
     url = url.replace(/\/\//g, '/');
 
-    const uri = `${this.baseUrl}${url}`;
+    const uri = `${Requests.baseUrl}${url}`;
 
     const validUri = uri.replace(/\/\//g, '/');
 
-    const axiosPromise = axios({
+    const axiosPromise = Requests.axiosInstance({
       method,
       url: uri,
-      baseURL: this.baseUrl,
       data: fileData || data,
       headers,
     });
@@ -88,16 +66,8 @@ class Requests {
     return axiosPromise;
   }
 
-  /**
-   * Calls a GET request to the url endpoint.
-   * 
-   * @param url 
-   * @returns 
-   */
   public static get<T>(url: string, params?: Record<string, any>): AxiosPromise<Response<T>> {
-
     if (params && Object.keys(params).length > 0) {
-      
       const queryString = Object.entries(params)
         .map(([key, value]) => {
           if (Array.isArray(value)) {
@@ -108,19 +78,16 @@ class Requests {
         .join('&');
       url = `${url}?${queryString}`;
     }
-    
-    if (this.community_id) {
-      // Check if the URL already contains query parameters
+
+    if (Requests.community_id) {
       const separator = url.includes('?') ? '&' : '?';
-      // Append the community_id query parameter
-      url = `${url}${separator}community_id=${this.community_id}`;
+      url = `${url}${separator}community_id=${Requests.community_id}`;
     }
 
-    return this.request<T>('GET', url);
+    return Requests.request<T>('GET', url);
   }
 
   public static post<T>(url: string, data: any, params?: Record<string, any>): AxiosPromise<Response<T>> {
-
     if (params && Object.keys(params).length > 0) {
       const queryString = Object.entries(params)
         .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
@@ -128,19 +95,17 @@ class Requests {
       url = `${url}?${queryString}`;
     }
 
-    if (this.community_id) {
-      // Add the community_id to the request body
+    if (Requests.community_id) {
       data = {
         ...data,
-        communities: [ this.community_id ]
+        communities: [Requests.community_id],
       };
     }
 
-    return this.request<T>('POST', url, data);
+    return Requests.request<T>('POST', url, data);
   }
 
   public static put<T>(url: string, data: any, params?: Record<string, any>): AxiosPromise<Response<T>> {
-
     if (params && Object.keys(params).length > 0) {
       const queryString = Object.entries(params)
         .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
@@ -148,19 +113,17 @@ class Requests {
       url = `${url}?${queryString}`;
     }
 
-    if (this.community_id) {
-      // Add the community_id to the request body
+    if (Requests.community_id) {
       data = {
         ...data,
-        community_id: this.community_id
+        community_id: Requests.community_id,
       };
     }
 
-    return this.request<T>('PUT', url, data);
+    return Requests.request<T>('PUT', url, data);
   }
 
   public static delete<T>(url: string, params?: Record<string, any>): AxiosPromise<Response<T>> {
-
     if (params && Object.keys(params).length > 0) {
       const queryString = Object.entries(params)
         .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
@@ -168,40 +131,36 @@ class Requests {
       url = `${url}?${queryString}`;
     }
 
-    if (this.community_id) {
-      // Check if the URL already contains query parameters
+    if (Requests.community_id) {
       const separator = url.includes('?') ? '&' : '?';
-      // Append the community_id query parameter
-      url = `${url}${separator}community_id=${this.community_id}`;
+      url = `${url}${separator}community_id=${Requests.community_id}`;
     }
 
-    return this.request<T>('DELETE', url);
+    return Requests.request<T>('DELETE', url);
   }
 
   public static uploadFile<T>(
     url: string,
-    filename : string,
+    filename: string,
     file: File,
     data?: any,
     params?: Record<string, any>
   ): AxiosPromise<Response<T>> {
-
     if (params && Object.keys(params).length > 0) {
       const queryString = Object.entries(params)
         .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
         .join('&');
       url = `${url}?${queryString}`;
     }
-    
+
     const formData = new FormData();
 
     formData.append(filename, file);
 
-    if (this.community_id) {
-      // Add the community_id to the request body
+    if (Requests.community_id) {
       data = {
         ...data,
-        communities: [ this.community_id ]
+        communities: [Requests.community_id],
       };
     }
 
@@ -209,17 +168,16 @@ class Requests {
       formData.append(key, data[key]);
     }
 
-    return this.request<T>('POST', url, data, formData);
+    return Requests.request<T>('POST', url, data, formData);
   }
 
   public static uploadBlob<T>(
     url: string,
-    filename : string,
+    filename: string,
     blob: Blob,
     data?: any,
     params?: Record<string, any>
   ): AxiosPromise<Response<T>> {
-
     if (params && Object.keys(params).length > 0) {
       const queryString = Object.entries(params)
         .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
@@ -231,61 +189,41 @@ class Requests {
 
     formData.append(filename, blob);
 
-    if (this.community_id) {
-      // Add the community_id to the request body
+    if (Requests.community_id) {
       data = {
         ...data,
-        communities: [ this.community_id ]
+        communities: [Requests.community_id],
       };
     }
 
-
     for (let key in data) {
       formData.append(key, data[key]);
     }
 
-    return this.request<T>('POST', url, data, formData);
+    return Requests.request<T>('POST', url, data, formData);
   }
 
-  /**
-   *  The Route class contains the method and url, thereforce items can be
-   *  automatically routed depending on the configuration.
-   * 
-   * @param route
-   * @param data 
-   * @returns 
-   */
-  public static processRoute<T>(route : Route, data? : object, routeReplace? : {[key: string]: any}, params?: Record<string, any>) : AxiosPromise<Response<T>> {
-
+  public static processRoute<T>(route: Route, data?: object, routeReplace?: { [key: string]: any }, params?: Record<string, any>): AxiosPromise<Response<T>> {
     let url = route.url;
 
-    if(routeReplace) {
-
+    if (routeReplace) {
       for (let key in routeReplace) {
         url = url.replace("{" + key + "}", routeReplace[key]);
       }
-
     }
 
-    if(route.method == HTTP_METHODS.GET) {
-      return this.get(url, params);
-    } else if(route.method == HTTP_METHODS.POST) {
-      return this.post(url, data, params);
-    } else if(route.method == HTTP_METHODS.PUT) {
-      return this.put(url, data, params);
-    } else if(route.method == HTTP_METHODS.DELETE) {
-      return this.delete(url, params);
+    if (route.method == HTTP_METHODS.GET) {
+      return Requests.get(url, params);
+    } else if (route.method == HTTP_METHODS.POST) {
+      return Requests.post(url, data, params);
+    } else if (route.method == HTTP_METHODS.PUT) {
+      return Requests.put(url, data, params);
+    } else if (route.method == HTTP_METHODS.DELETE) {
+      return Requests.delete(url, params);
     }
 
-    return this.get(url);
-
+    return Requests.get(url);
   }
-
 }
 
 export default Requests;
-
-
-
-
-