Remove renamings

Author: Artem Shteltser

Diff for: README.md

@@ -149,7 +149,7 @@ const bitbucket = new Bitbucket(clientOptions)
 const clientOptions = {
   authStrategy: 'OAuth',
   auth: {
-    grant_type: 'urn:bitbucket:oauth2:jwt',
+    grant_type: 'bitbucketCloudJWTGrant',
     jwt_token: 'jwt_token',
   },
 }

Diff for: package.json

@@ -29,7 +29,7 @@
     "build:core": "bili",
     "prebuild:plugins": "rimraf lib/plugins/*.js lib/plugins/*.js.map",
     "build:plugins": "npm-run-all -s build:plugin:*",
-    "build:plugin:authenticate": "cross-env PLUGIN=auth bili",
+    "build:plugin:auth": "cross-env PLUGIN=auth bili",
     "predocs:build": "mkdirp docs && rimraf docs/*",
     "docs:build": "npm run generate:api-docs",
     "postdocs:build": "apidoc -i docs -o docs",
@@ -48,7 +48,7 @@
     "validate:types:bitbucket": "tsc --noEmit lib/bitbucket.d.ts",
     "validate:types:index": "tsc --noEmit lib/index.d.ts",
     "validate:types:minimal": "tsc --noEmit lib/minimal.d.ts",
-    "validate:types:plugin:authenticate": "tsc --noEmit lib/plugins/authenticate.d.ts",
+    "validate:types:plugin:auth": "tsc --noEmit lib/plugins/auth.d.ts",
     "test": "jest"
   },
   "dependencies": {

Diff for: src/client/constructor.ts

@@ -3,13 +3,13 @@ import { request } from '../request'
 import { getEndpointOptions } from './get-endpoint-options'
 
 type APIClient = import('./types').APIClient
-type BitbucketOptions = import('./types').BitbucketOptions
+type Options = import('./types').Options
 type Plugin = import('./types').Plugin
 type RequestHook = import('./types').RequestHook
 
 export function constructor(
   plugins: Plugin[],
-  clientOptions: BitbucketOptions = {}
+  clientOptions: Options = {}
 ): APIClient {
   const requestHook: RequestHook = new Singular()
   const requestDefaults = getEndpointOptions(clientOptions, requestHook)

Diff for: src/client/get-endpoint-options.ts

@@ -4,7 +4,7 @@ import { lowerCaseHeaderFields } from '../utils/lower-case-header-fields'
 import { pick } from './utils/pick'
 
 type EndpointParams = import('./types').EndpointParams
-type Options = import('./types').BitbucketOptions
+type Options = import('./types').Options
 type RequestHook = import('./types').RequestHook
 
 export function getEndpointOptions(

Diff for: src/client/types.ts

@@ -5,8 +5,7 @@ type HTTPError = import('../error/types').HTTPError
 type Request = import('../request/types').Request
 type Response<T> = import('../request/types').Response<T>
 
-export interface BitbucketOptions {
-  type?: any
+export interface Options {
   auth?: any
   authStrategy?: string
   baseUrl?: string
@@ -23,11 +22,11 @@ export interface APIClient {
   [key: string]: any
 }
 
-export type Plugin = (client: APIClient, options: BitbucketOptions) => void
+export type Plugin = (client: APIClient, options: Options) => void
 
 export interface APIClientFactory {
-  new (options?: BitbucketOptions): APIClient
-  (options?: BitbucketOptions): APIClient
+  new (options?: Options): APIClient
+  (options?: Options): APIClient
 
   plugins(plugins: Plugin[]): APIClientFactory
 }

Diff for: src/plugins/auth/OAuth/types.ts

@@ -1,5 +1,5 @@
 export type APIClient = import('../../../client/types').APIClient
-export type Options = import('../../../client/types').BitbucketOptions
+export type Options = import('../../../client/types').Options
 export type RequestOptions = import('../../../endpoint/types').RequestOptions
 export type AuthOptions = import('../types').OAuthOptions
 

Diff for: src/plugins/auth/basicAuth/types.ts

@@ -1,5 +1,5 @@
 export type APIClient = import('../../../client/types').APIClient
-export type Options = import('../../../client/types').BitbucketOptions
+export type Options = import('../../../client/types').Options
 export type RequestOptions = import('../../../endpoint/types').RequestOptions
 
 type AuthHeaders = {

Diff for: src/plugins/auth/index.ts

@@ -7,14 +7,9 @@ type APIClient = import('./types').APIClient
 type Options = import('./types').Options
 
 const routes = getOAuthRoutes(oAuth2Spec)
-function authenticatePlugin(client: APIClient, clientOptions: Options): void {
+function authPlugin(client: APIClient, clientOptions: Options): void {
   client.registerEndpoints({ oauth: routes.getToken })
 
-  // (1) If neither `options.authStrategy` nor `options.auth` are set, the `octokit` instance
-  //     is unauthenticated. The `this.auth()` method is a no-op and no request hook is registered.
-  // (2) If only `options.auth` is set, use the default token authentication strategy.
-  // (3) If `options.authStrategy` is set then use it and pass in `options.auth`. Always pass own request as many strategies accept a custom request instance.
-
   if (!clientOptions.auth) return
   switch (clientOptions.authStrategy) {
     case 'OAuth':
@@ -27,4 +22,4 @@ function authenticatePlugin(client: APIClient, clientOptions: Options): void {
   }
 }
 
-export default authenticatePlugin
+export default authPlugin

Diff for: src/plugins/auth/types.ts

@@ -1,5 +1,5 @@
 export type APIClient = import('../../client/types').APIClient
-export type Options = import('../../client/types').BitbucketOptions
+export type Options = import('../../client/types').Options
 export type RequestOptions = import('../../endpoint/types').RequestOptions
 
 export type AuthBasic = {