Fixed API Manager

Author: joaotonaco

src/APIManager.ts

@@ -1,5 +1,4 @@
 import { APIResponse, RawUserData } from './typings';
-import axios, { AxiosRequestConfig } from 'axios';
 
 export class SquareCloudAPIError extends Error {
   constructor(code: string, message?: string) {
@@ -25,22 +24,23 @@ export class APIManager {
     try {
       await this.fetch('user');
     } catch {
-      throw new SquareCloudAPIError('INVALID_API_KEY')
+      throw new SquareCloudAPIError('INVALID_API_KEY');
     }
   }
 
-  private async fetch(path: string, options: AxiosRequestConfig = {}) {
+  private async fetch(path: string, options: RequestInit = {}) {
     options.headers = {
       ...(options.headers || {}),
       Authorization: this.apiKey,
     };
 
     options.method = options.method || 'GET';
 
-    const { data } = await axios(
+    const data = await fetch(
       'https://api.squarecloud.app/v1/public/' + path,
       options
-    ).catch((r) => r.response);
+    )
+      .then((r) => r.json());
 
     if (data.status === 'error') {
       throw new SquareCloudAPIError(data.code);
@@ -49,7 +49,7 @@ export class APIManager {
     return data;
   }
 
-  user(id?: string, options: AxiosRequestConfig = {}): Promise<RawUserData> {
+  user(id?: string, options: RequestInit = {}): Promise<RawUserData> {
     return this.fetch('user' + (id ? `/${id}` : ''), options).then(
       (e) => e.response
     );
@@ -58,7 +58,7 @@ export class APIManager {
   application(
     path: string,
     id: string,
-    options: AxiosRequestConfig | boolean = {}
+    options: RequestInit | boolean = {}
   ): Promise<APIResponse> {
     return this.fetch(
       `${path}/${id}`,

src/structures/Application.ts

@@ -134,7 +134,11 @@ export class Application {
    * - This action is irreversible.
    */
   async delete(): Promise<boolean> {
-    const { code } = await this.#apiManager.application('delete', this.id, true);
+    const { code } = await this.#apiManager.application(
+      'delete',
+      this.id,
+      true
+    );
 
     return code === 'APP_DELETED';
   }
@@ -149,28 +153,23 @@ export class Application {
    * ```
    * - Tip2: use zip file to commit more than one file
    *
-   * @param file - The absolute file path or a ReadStream
+   * @param file - The absolute file path, a Buffer or a ReadStream
+   * @param fileName - If a Buffer is provided you must provide the file name and extension too
    */
   async commit(file: string | ReadStream): Promise<boolean>;
-  async commit(
-    file: Buffer,
-    fileName: string,
-    fileExtension: `.${string}`
-  ): Promise<boolean>;
+  async commit(file: Buffer, fileName: string): Promise<boolean>;
   async commit(
     file: string | ReadStream | Buffer,
-    fileName?: string,
-    fileExtension?: `.${string}`
+    fileName?: string
   ): Promise<boolean> {
     validateCommitLike(file, 'COMMIT_DATA');
 
     const formData = new FormData();
 
     if (file instanceof Buffer) {
       validateString(fileName, 'FILE_NAME');
-      validateString(fileExtension, 'FILE_EXTENSION');
 
-      formData.append('file', file, { filename: fileName + fileExtension });
+      formData.append('file', file, { filename: fileName });
     } else {
       formData.append(
         'file',
@@ -180,8 +179,8 @@ export class Application {
 
     const { code } = await this.#apiManager.application('commit', this.id, {
       method: 'POST',
-      data: formData,
-      headers: { ...formData.getHeaders() },
+      body: formData.getBuffer(),
+      headers: formData.getHeaders(),
     });
 
     return code === 'SUCCESS';