remove fuzzy, indent-string, axios dependency and implement fetch-based token handling

Author: Dnouv

package-lock.json

@@ -16,15 +16,12 @@
     "@oclif/core": "^4.0.24",
     "@rocket.chat/apps-compiler": "^0.5.1",
     "@rocket.chat/apps-engine": "^1.55.0",
-    "axios": "^1.12.2",
     "chalk": "^5.6.2",
     "chokidar": "^4.0.3",
     "conf": "^14.0.0",
     "fetch-with-proxy": "^3.0.1",
     "figures": "^6.1.0",
     "form-data": "^4.0.4",
-    "fuzzy": "^0.1.3",
-    "indent-string": "^5.0.0",
     "@inquirer/prompts": "^7.8.6",
     "open": "^10.2.0",
     "pascal-case": "^3.1.2",
@@ -115,4 +112,4 @@
     "view-coverage": "npm run test && http-server coverage -p 9083 -c-1"
   },
   "types": "lib/index.d.ts"
-}
+}

package.json

@@ -1,5 +1,4 @@
 import {Request, Server} from '@hapi/hapi'
-import axios, {isAxiosError} from 'axios'
 import chalk from 'chalk'
 import Conf from 'conf'
 import {createHash, randomUUID} from 'crypto'
@@ -33,6 +32,16 @@ type CloudConfig = {
   'rcc.expiresAt'?: Date
 }
 
+class CloudAuthRequestError extends Error {
+  constructor(
+    public readonly status: number,
+    public readonly body: unknown,
+    message?: string,
+  ) {
+    super(message ?? `Request failed with status ${status}`)
+  }
+}
+
 export class CloudAuth {
   private config?: Conf<CloudConfig>
   private codeVerifier: string
@@ -134,14 +143,7 @@ export class CloudAuth {
         code_verifier: this.codeVerifier,
       }
 
-      const res = await axios.post<ICloudToken>(
-        `${cloudUrl}/api/oauth/token`,
-        new URLSearchParams(request).toString(),
-        {
-          headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-        },
-      )
-      const tokenInfo = res.data
+      const tokenInfo = await this.postForm<ICloudToken>('/api/oauth/token', request)
 
       const expiresAt = new Date()
       expiresAt.setSeconds(expiresAt.getSeconds() + tokenInfo.expires_in)
@@ -155,12 +157,8 @@ export class CloudAuth {
 
       return tokenInfo
     } catch (err) {
-      if (isAxiosError(err) && err.response) {
-        const {status, data} = err.response
-        const errorMessage = (data as {error?: string; requestId?: string}) || {}
-        this.logError(
-          `[${status}] error getting token: ${errorMessage.error ?? 'unknown'} (${errorMessage.requestId ?? 'n/a'})`,
-        )
+      if (err instanceof CloudAuthRequestError) {
+        this.logHttpError('error getting token', err)
       } else {
         this.logError(`Error getting token: ${this.formatError(err)}`)
       }
@@ -181,14 +179,7 @@ export class CloudAuth {
     }
 
     try {
-      const res = await axios.post<ICloudToken>(
-        `${cloudUrl}/api/oauth/token`,
-        new URLSearchParams(request).toString(),
-        {
-          headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-        },
-      )
-      const tokenInfo = res.data
+      const tokenInfo = await this.postForm<ICloudToken>('/api/oauth/token', request)
 
       const expiresAt = new Date()
       expiresAt.setSeconds(expiresAt.getSeconds() + tokenInfo.expires_in)
@@ -200,12 +191,8 @@ export class CloudAuth {
       config.set('rcc.token.token_type', tokenInfo.token_type)
       config.set('rcc.expiresAt', expiresAt)
     } catch (err) {
-      if (isAxiosError(err) && err.response) {
-        const {status, data} = err.response
-        const errorMessage = (data as {error?: string; requestId?: string}) || {}
-        this.logError(
-          `[${status}] error refreshing token: ${errorMessage.error ?? 'unknown'} (${errorMessage.requestId ?? 'n/a'})`,
-        )
+      if (err instanceof CloudAuthRequestError) {
+        this.logHttpError('error refreshing token', err)
       } else {
         this.logError(`Error refreshing token: ${this.formatError(err)}`)
       }
@@ -224,22 +211,16 @@ export class CloudAuth {
     }
 
     try {
-      await axios.post(`${cloudUrl}/api/oauth/revoke`, new URLSearchParams(request).toString(), {
-        headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-      })
+      await this.postForm('/api/oauth/revoke', request)
       this.getConfig().delete('rcc')
     } catch (err) {
-      if (isAxiosError(err) && err.response) {
-        const {status, data} = err.response
-        if (status === 401) {
+      if (err instanceof CloudAuthRequestError) {
+        if (err.status === 401) {
           this.getConfig().delete('rcc')
           return
         }
 
-        const errorMessage = (data as {error?: string; requestId?: string}) || {}
-        this.logError(
-          `[${status}] error revoking the token: ${errorMessage.error ?? 'unknown'} (${errorMessage.requestId ?? 'n/a'})`,
-        )
+        this.logHttpError('error revoking the token', err)
       } else {
         this.logError(`Error revoking token: ${this.formatError(err)}`)
       }
@@ -302,6 +283,60 @@ export class CloudAuth {
     return url.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
   }
 
+  private async postForm<T>(path: string, payload: Record<string, string>): Promise<T> {
+    const response = await fetch(`${cloudUrl}${path}`, {
+      method: 'POST',
+      headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+      body: new URLSearchParams(payload).toString(),
+    })
+
+    const rawBody = await response.text()
+    let parsedBody: unknown = undefined
+
+    if (rawBody) {
+      try {
+        parsedBody = JSON.parse(rawBody)
+      } catch {
+        parsedBody = rawBody
+      }
+    }
+
+    if (!response.ok) {
+      throw new CloudAuthRequestError(response.status, parsedBody ?? rawBody)
+    }
+
+    return parsedBody as T
+  }
+
+  private logHttpError(prefix: string, err: CloudAuthRequestError): void {
+    const {error, requestId} = this.extractErrorDetails(err.body)
+    this.logError(`[${err.status}] ${prefix}: ${error ?? 'unknown'} (${requestId ?? 'n/a'})`)
+  }
+
+  private extractErrorDetails(body: unknown): {error?: string; requestId?: string} {
+    if (body && typeof body === 'object') {
+      const info = body as Record<string, unknown>
+      return {
+        error: typeof info.error === 'string' ? info.error : undefined,
+        requestId: typeof info.requestId === 'string' ? info.requestId : undefined,
+      }
+    }
+
+    if (typeof body === 'string') {
+      try {
+        const parsed = JSON.parse(body) as Record<string, unknown>
+        return {
+          error: typeof parsed.error === 'string' ? parsed.error : undefined,
+          requestId: typeof parsed.requestId === 'string' ? parsed.requestId : undefined,
+        }
+      } catch {
+        return {error: body}
+      }
+    }
+
+    return {}
+  }
+
   private getConfig(): Conf<CloudConfig> {
     if (!this.config) {
       throw new Error('Cloud configuration not initialized')