Merge pull request #17 from getAlby/task-user-agent

feat: add user_agent to options
getAlby · Jun 7, 2023 · 3c30704 · 3c30704
2 parents f2733f3 + 340e2b5
commit 3c30704
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/OAuth2User.ts b/src/OAuth2User.ts
@@ -19,6 +19,7 @@ export interface OAuth2UserOptions {
   callback: string;
   scopes: OAuth2Scopes[];
   request_options?: Partial<RequestOptions>;
+  user_agent: string;
   token?: Token;
 }
 
@@ -48,7 +49,7 @@ export class OAuth2User implements OAuthClient {
    */
   async refreshAccessToken(): Promise<{ token: Token }> {
     const refresh_token = this.token?.refresh_token;
-    const { client_id, client_secret, request_options } = this.options;
+    const { client_id, client_secret, request_options, user_agent } = this.options;
     if (!client_id) {
       throw new Error("client_id is required");
     }
@@ -63,6 +64,7 @@ export class OAuth2User implements OAuthClient {
         grant_type: "refresh_token",
         refresh_token,
       },
+      user_agent,
       method: "POST",
       headers: {
         ...request_options?.headers,
@@ -91,7 +93,7 @@ export class OAuth2User implements OAuthClient {
    * Request an access token
    */
   async requestAccessToken(code?: string): Promise<{ token: Token }> {
-    const { client_id, client_secret, callback, request_options } =
+    const { client_id, client_secret, callback, request_options, user_agent } =
       this.options;
     const code_verifier = this.code_verifier;
     if (!client_id) {
@@ -111,6 +113,7 @@ export class OAuth2User implements OAuthClient {
       ...request_options,
       endpoint: `/oauth/token`,
       params,
+      user_agent,
       method: "POST",
       headers: {
         ...request_options?.headers,

diff --git a/src/client.ts b/src/client.ts
@@ -25,10 +25,7 @@ export class Client {
     this.auth = typeof auth === "string" ? new OAuth2Bearer(auth) : auth;
     this.defaultRequestOptions = {
       ...requestOptions,
-      headers: {
-        "User-Agent": "alby-js-api",
-        ...requestOptions?.headers,
-      },
+      user_agent: requestOptions?.user_agent
     };
   }
 

diff --git a/src/request.ts b/src/request.ts
@@ -9,6 +9,7 @@ export interface RequestOptions extends Omit<RequestInit, "body"> {
   auth?: AuthClient;
   endpoint: string;
   params?: Record<string, any>;
+  user_agent?: string;
   request_body?: Record<string, any>;
   method?: string;
   max_retries?: number;
@@ -61,6 +62,7 @@ export async function request({
   method,
   max_retries,
   base_url = BASE_URL,
+  user_agent,
   headers,
   ...options
 }: RequestOptions): Promise<Response> {
@@ -79,6 +81,10 @@ export async function request({
           : undefined),
         ...authHeader,
         ...headers,
+        ...{
+          "User-Agent": user_agent ?? "alby-js-api",
+          "X-User-Agent": user_agent ?? "alby-js-api"
+        },
       },
       method,
       body: isPost ? JSON.stringify(request_body) : undefined,