⚡ Fixing circular auth hook call

Author: Artem Shteltser

src/plugins/auth/OAuth/auth.ts

@@ -1,16 +1,11 @@
 import { getOAuthAccessToken } from './get-oauth-access-token'
 
-type APIClient = import('./types').APIClient
 type Authentication = import('./types').Authentication
 type AuthState = import('./types').AuthPluginState
 
-// eslint-disable-next-line @typescript-eslint/require-await
-export async function auth(
-  client: APIClient,
-  authState: AuthState
-): Promise<Authentication | {}> {
+export async function auth(authState: AuthState): Promise<Authentication | {}> {
   if (!authState.token) {
-    const newToken = await getOAuthAccessToken(client, authState)
+    const newToken = await getOAuthAccessToken(authState)
     authState.token = newToken
   }
 

src/plugins/auth/OAuth/get-oauth-access-token.ts

@@ -1,45 +1,47 @@
 import btoa from 'btoa-lite'
 import oAuth2Spec from './spec.json'
 import getOAuthRoutes from './routes'
+import { request as Request } from '../../../request'
 
-type APIClient = import('./types').APIClient
 type AuthState = import('./types').AuthPluginState
 
 const routes = getOAuthRoutes(oAuth2Spec).getToken
-export const getOAuthAccessToken = async (
-  client: APIClient,
-  state: AuthState
-): Promise<any> => {
+export const getOAuthAccessToken = async (state: AuthState): Promise<any> => {
   const { auth: authState } = state
   const grantType = authState.grant_type
 
-  let request
+  let headers
   if (authState.grant_type === 'bitbucketCloudJWTGrant') {
-    request = client.oauth[grantType].defaults({
-      headers: {
-        accept: 'application/x-www-form-urlencoded',
-        authorization: `JWT ${btoa(`${authState.jwt_token}`)}`,
-      },
-    })
+    headers = {
+      authorization: `JWT ${btoa(`${authState.jwt_token}`)}`,
+    }
   } else {
-    request = client.oauth[grantType].defaults({
-      headers: {
-        // accept: 'application/x-www-form-urlencoded',
-        authorization: `Basic ${btoa(
-          `${authState.client_id}:${authState.client_secret}`
-        )}`,
-      },
-    })
+    headers = {
+      authorization: `Basic ${btoa(
+        `${authState.client_id}:${authState.client_secret}`
+      )}`,
+    }
   }
 
-  authState.grant_type = routes[grantType].grant_type
-  const response = await request(authState)
+  const requestOptions = Object.assign(routes[grantType], {
+    headers,
+    request: {},
+  })
+
+  const request = Request.defaults(requestOptions)
+  const response = await request(
+    requestOptions,
+    Object.assign(authState, {
+      grant_type: routes[grantType].grant_type,
+    })
+  )
+
   const { data } = response
 
   const newToken = {
     access_token: data.access_token,
-    refresh_token: data.refresh_tokenaccess_token,
-    scopes: data.scope.split(/,\s*/).filter(Boolean),
+    refresh_token: data.refresh_token,
+    scopes: data.scopes.split(/\s/).filter(Boolean),
   }
 
   return newToken

src/plugins/auth/OAuth/hook.ts

@@ -1,18 +1,14 @@
 import { auth } from './auth'
 
-type APIClient = import('./types').APIClient
-type Authentication = import('./types').Authentication
 type AuthState = import('./types').AuthPluginState
 type RequestOptions = import('./types').RequestOptions
 
-// eslint-disable-next-line @typescript-eslint/require-await
 export async function beforeHook(
-  client: APIClient,
   authState: AuthState,
   requestOptions: RequestOptions
 ): Promise<void> {
   if (!authState.token) {
-    await auth(client, authState)
+    await auth(authState)
   } else if (authState.token.access_token) {
     requestOptions.headers.authorization = `Bearer ${authState.token.access_token}`
   }

src/plugins/auth/OAuth/index.ts

@@ -16,10 +16,9 @@ const OAuth = (client: APIClient, clientOptions: Options): void => {
     auth: clientOptions.auth,
   }
 
-  // eslint-disable-next-line @typescript-eslint/require-await
-  client.auth = auth.bind(null, client, state)
+  client.auth = auth.bind(null, state)
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  client.requestHook.before(beforeHook.bind(null, client, state))
+  client.requestHook.before(beforeHook.bind(null, state))
 }
 
 export default OAuth

src/plugins/auth/index.ts

@@ -1,16 +1,12 @@
 import basicAuth from './basicAuth'
 import OAuth from './OAuth'
-import oAuth2Spec from './OAuth/spec.json'
-import getOAuthRoutes from './OAuth/routes'
 
 type APIClient = import('./types').APIClient
 type Options = import('./types').Options
 
-const routes = getOAuthRoutes(oAuth2Spec)
 function authPlugin(client: APIClient, clientOptions: Options): void {
-  client.registerEndpoints({ oauth: routes.getToken })
-
   if (!clientOptions.auth) return
+
   switch (clientOptions.authStrategy) {
     case 'OAuth':
       OAuth(client, clientOptions)