allow overriding accessToken and userAgent

Author: thecodrr

twitter-openapi-typescript/src/api.ts

@@ -15,17 +15,17 @@ import { DefaultFlag } from '@/models';
 export type TwitterOpenApiParams = {
   lang?: string;
   fetchApi?: i.FetchAPI;
+
+  flag?: DefaultFlag;
+  accessToken?: string;
+  userAgent?: string;
 };
 
 export type TwitterOpenApiCookie = {
   name: string;
   value: string;
 };
 
-export type TwitterOpenApiClientOptions = {
-  flag?: DefaultFlag;
-};
-
 export class TwitterOpenApi {
   static hash = 'd5ccc25869b68cbb39c68fa81a1fa77967a667da';
   static url = `https://raw.githubusercontent.com/fa0311/twitter-openapi/${this.hash}/src/config/placeholder.json`;
@@ -94,33 +94,29 @@ export class TwitterOpenApi {
     return context;
   }
 
-  async getClient(options?: TwitterOpenApiClientOptions): Promise<TwitterOpenApiClient> {
+  async getClient(): Promise<TwitterOpenApiClient> {
     const cookies: TwitterOpenApiCookie[] = await this.getGuestSession();
     const config: i.ConfigurationParameters = {
       fetchApi: this.fetchApi,
       middleware: [{ pre: async (context) => this.setCookies(context, cookies) }],
       apiKey: (key) => {
         return {
-          'user-agent': TwitterOpenApi.userAgent,
+          'user-agent': this.param.userAgent || TwitterOpenApi.userAgent,
           'x-twitter-client-language': this.param.lang ?? 'en',
           'x-twitter-active-user': 'yes',
           'x-csrf-token': cookies.find((cookie) => cookie.name === 'ct0')?.value,
           'x-guest-token': cookies.find((cookie) => cookie.name === 'gt')?.value,
         }[key]!;
       },
-      accessToken: TwitterOpenApi.bearer,
+      accessToken: this.param.accessToken || TwitterOpenApi.bearer,
     };
     const flag =
-      options?.flag ||
+      this.param.flag ||
       ((await this.fetchApi(TwitterOpenApi.url, { method: 'GET' }).then((res) => res.json())) as DefaultFlag);
     return new TwitterOpenApiClient(new i.Configuration(config), flag);
   }
 
-  async getClientFromCookies(
-    ct0: string,
-    authToken: string,
-    options?: TwitterOpenApiClientOptions,
-  ): Promise<TwitterOpenApiClient> {
+  async getClientFromCookies(ct0: string, authToken: string): Promise<TwitterOpenApiClient> {
     const cookies: TwitterOpenApiCookie[] = await this.getGuestSession();
     [
       { name: 'auth_token', value: authToken },
@@ -134,17 +130,17 @@ export class TwitterOpenApi {
       middleware: [{ pre: async (context) => this.setCookies(context, cookies) }],
       apiKey: (key) => {
         return {
-          'user-agent': TwitterOpenApi.userAgent,
+          'user-agent': this.param.userAgent || TwitterOpenApi.userAgent,
           'x-twitter-client-language': this.param.lang ?? 'en',
           'x-twitter-active-user': 'yes',
           'x-twitter-auth-type': 'OAuth2Session',
           'x-csrf-token': cookies.find((cookie) => cookie.name === 'ct0')?.value,
         }[key]!;
       },
-      accessToken: TwitterOpenApi.bearer,
+      accessToken: this.param.accessToken || TwitterOpenApi.bearer,
     };
     const flag =
-      options?.flag ||
+      this.param.flag ||
       ((await this.fetchApi(TwitterOpenApi.url, { method: 'GET' }).then((res) => res.json())) as DefaultFlag);
     return new TwitterOpenApiClient(new i.Configuration(config), flag);
   }