request body fixes

Author: anuraagnalluri

src/internal/utils/requestbody.ts

@@ -3,11 +3,9 @@ import FormData from "form-data";
 const requestMetadataKey = "request";
 const mpFormMetadataKey = "multipart_form";
 
-export function SerializeRequestBody(
-  request: any
-): [object, string | FormData] {
+export function SerializeRequestBody(request: any): [object, any] {
   const fieldNames: string[] = Object.getOwnPropertyNames(request);
-  let [requestHeaders, requestBody]: [object, string | FormData] = [{}, ""];
+  let [requestHeaders, requestBody]: [object, any] = [{}, {}];
   fieldNames.forEach((fname) => {
     const requestAnn: string = Reflect.getMetadata(
       requestMetadataKey,
@@ -27,7 +25,7 @@ export function SerializeRequestBody(
       case "text/json":
       default:
         [requestHeaders, requestBody] = [
-          { "Content-Type": `"${requestDecorator.MediaType}"` },
+          { "Content-Type": `${requestDecorator.MediaType}` },
           request[fname],
         ];
     }

src/internal/utils/utils.ts

@@ -19,7 +19,7 @@ export function ReplaceParameters(
   let res: string = stringWithParams;
   params.forEach((value, key) => {
     const match: string = "{" + key + "}";
-    res = stringWithParams.replaceAll(match, value);
+    res = res.replaceAll(match, value);
   });
   return res;
 }
@@ -29,7 +29,7 @@ export function GenerateURL(
   path: string,
   pathParams: any
 ): string {
-  const url: string = serverURL.replace(/\/$/, "");
+  const url: string = serverURL.replace(/\/$/, "") + path;
   const parsedParameters: Map<string, string> = new Map<string, string>();
   const fieldNames: string[] = Object.getOwnPropertyNames(pathParams);
   fieldNames.forEach((fname) => {

src/sdk/models/operations/getapis.ts

@@ -23,9 +23,9 @@ export class GetApisQueryParams {
 }
 
 export class GetApisRequest {
-  QueryParams?: GetApisQueryParams;
+  QueryParams: GetApisQueryParams;
 
-  constructor(QueryParams?: GetApisQueryParams) {
+  constructor(QueryParams: GetApisQueryParams) {
     this.QueryParams = QueryParams;
   }
 }

src/sdk/sdk.ts

@@ -1414,7 +1414,8 @@ export class SDK {
       props.PathParams
     );
 
-    let [reqHeaders, reqBody]: [object, string | FormData] = [{}, ""];
+    let [reqHeaders, reqBody]: [object, any] = [{}, {}];
+
     try {
       [reqHeaders, reqBody] = SerializeRequestBody(props);
     } catch (e: unknown) {
@@ -1432,11 +1433,14 @@ export class SDK {
       | AxiosResponse<operations.InsertVersionMetadataResponse>
       | undefined = undefined;
     try {
+      let body: unknown;
+      if (reqBody instanceof FormData) body = reqBody;
+      else body = { ...reqBody };
       httpRes = await client!.post<
         operations.InsertVersionMetadataResponse,
         AxiosResponse<operations.InsertVersionMetadataResponse>,
         unknown
-      >(url, reqBody, {
+      >(url, body, {
         headers: headers,
         ...config,
       });
@@ -1537,7 +1541,8 @@ export class SDK {
       props.PathParams
     );
 
-    let [reqHeaders, reqBody]: [object, string | FormData] = [{}, ""];
+    let [reqHeaders, reqBody]: [object, any] = [{}, {}];
+
     try {
       [reqHeaders, reqBody] = SerializeRequestBody(props);
     } catch (e: unknown) {
@@ -1554,11 +1559,15 @@ export class SDK {
     let httpRes: AxiosResponse<operations.RegisterSchemaResponse> | undefined =
       undefined;
     try {
+      let body: unknown;
+      if (reqBody instanceof FormData) body = reqBody;
+      else body = { ...reqBody };
+
       httpRes = await client!.post<
         operations.RegisterSchemaResponse,
         AxiosResponse<operations.RegisterSchemaResponse>,
         unknown
-      >(url, reqBody, {
+      >(url, body, {
         headers: headers,
         ...config,
       });
@@ -1651,7 +1660,8 @@ export class SDK {
       props.PathParams
     );
 
-    let [reqHeaders, reqBody]: [object, string | FormData] = [{}, ""];
+    let [reqHeaders, reqBody]: [object, any] = [{}, {}];
+
     try {
       [reqHeaders, reqBody] = SerializeRequestBody(props);
     } catch (e: unknown) {
@@ -1668,11 +1678,15 @@ export class SDK {
     let httpRes: AxiosResponse<operations.UpsertApiResponse> | undefined =
       undefined;
     try {
+      let body: unknown;
+      if (reqBody instanceof FormData) body = reqBody;
+      else body = { ...reqBody };
+
       httpRes = await client!.put<
         operations.UpsertApiResponse,
         AxiosResponse<operations.UpsertApiResponse>,
         unknown
-      >(url, reqBody, {
+      >(url, body, {
         headers: headers,
         ...config,
       });
@@ -1715,7 +1729,8 @@ export class SDK {
       props.PathParams
     );
 
-    let [reqHeaders, reqBody]: [object, string | FormData] = [{}, ""];
+    let [reqHeaders, reqBody]: [object, any] = [{}, {}];
+
     try {
       [reqHeaders, reqBody] = SerializeRequestBody(props);
     } catch (e: unknown) {
@@ -1733,11 +1748,15 @@ export class SDK {
       | AxiosResponse<operations.UpsertApiEndpointResponse>
       | undefined = undefined;
     try {
+      let body: unknown;
+      if (reqBody instanceof FormData) body = reqBody;
+      else body = { ...reqBody };
+
       httpRes = await client!.put<
         operations.UpsertApiEndpointResponse,
         AxiosResponse<operations.UpsertApiEndpointResponse>,
         unknown
-      >(url, reqBody, {
+      >(url, body, {
         headers: headers,
         ...config,
       });