fix

vectara · Jan 14, 2025 · ce7fc22 · ce7fc22
1 parent 65c6c42
commit ce7fc22
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/.fernignore b/.fernignore
@@ -7,3 +7,4 @@ tests/integration
 src/wrapper
 src/index.ts
 src/api/resources/auth/client/Client.ts
+src/core/fetcher/getRequestBody.ts
diff --git a/src/api/resources/auth/client/Client.ts b/src/api/resources/auth/client/Client.ts
@@ -55,7 +55,7 @@ export class Auth {
             url: urlJoin(
                 ((await core.Supplier.get(this._options.environment)) ?? environments.VectaraEnvironment.Production)
                     .auth,
-                "oauth/token"
+                "oauth2/token"
             ),
             method: "POST",
             headers: {
@@ -74,11 +74,14 @@ export class Auth {
             },
             contentType: "application/x-www-form-urlencoded",
             requestType: "urlencoded",
-            body: undefined,
-            queryParameters: {
+            body: {
                 ...serializers.AuthGetTokenRequest.jsonOrThrow(request, { unrecognizedObjectKeys: "strip" }),
                 grant_type: "client_credentials",
             },
+            // queryParameters: {
+            //     ...serializers.AuthGetTokenRequest.jsonOrThrow(request, { unrecognizedObjectKeys: "strip" }),
+            //     grant_type: "client_credentials",
+            // },
             timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
             maxRetries: requestOptions?.maxRetries,
             abortSignal: requestOptions?.abortSignal,

diff --git a/src/core/fetcher/Fetcher.ts b/src/core/fetcher/Fetcher.ts
@@ -66,7 +66,7 @@ export async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIR
     const url = createRequestUrl(args.url, args.queryParameters);
     let requestBody: BodyInit | undefined = await getRequestBody({
         body: args.body,
-        type: args.requestType === "json" ? "json" : "other",
+        type: args.requestType === "json" ? "json" : args.requestType === "urlencoded" ? "urlencoded" : "other",
     });
     const fetchFn = await getFetchFn();
 

diff --git a/src/core/fetcher/getRequestBody.ts b/src/core/fetcher/getRequestBody.ts
@@ -1,13 +1,21 @@
 export declare namespace GetRequestBody {
     interface Args {
         body: unknown;
-        type: "json" | "file" | "bytes" | "other";
+        type: "json" | "file" | "bytes" | "urlencoded" | "other";
     }
 }
 
 export async function getRequestBody({ body, type }: GetRequestBody.Args): Promise<BodyInit | undefined> {
     if (type.includes("json")) {
         return JSON.stringify(body);
+    } else if (type === "urlencoded") {
+        const params = new URLSearchParams();
+        if (typeof body === "object" && body !== null) {
+            Object.entries(body).forEach(([key, value]) => {
+                params.append(key, String(value));
+            });
+        }
+        return params.toString();
     } else {
         return body as BodyInit;
     }