google oauth works

Rhys Sullivan committed 8 months ago

Commit 2e328ab1 parent 38327c077 files · +7814 −866Browse files

Showing the changes to packages/codemode-openapi/src/openapi-tools.ts (1 of 77 files). Show all

Unified · Split

packages/codemode-openapi/src/openapi-tools.ts+52−11

 import * as Layer from "effect/Layer";
 import {
+  applyCookiePlacementsToHeaders,
+  applyHttpQueryPlacementsToUrl,
+  applyJsonBodyPlacements,
   standardSchemaFromJsonSchema,
   toTool,
+  type HttpRequestPlacements,
   type ToolMap,
   unknownInputSchema,
 } from "@executor/codemode-core";
   sourceKey?: string;
   defaultHeaders?: Readonly<Record<string, string>>;
   credentialHeaders?: Readonly<Record<string, string>>;
+  credentialPlacements?: HttpRequestPlacements;
   httpClientLayer?: Layer.Layer<HttpClient.HttpClient, never, never>;
 };
   args: OpenApiToolArgs;
   baseUrl: string;
   defaultHeaders: Readonly<Record<string, string>>;
-  credentialHeaders: Readonly<Record<string, string>>;
+  credentialPlacements: HttpRequestPlacements;
 }): {
   url: URL;
   method: string;
   }
   let body: string | undefined;
+  const bodyValues = input.credentialPlacements.bodyValues ?? {};
+  const hasCredentialBodyValues = Object.keys(bodyValues).length > 0;
   if (input.payload.requestBody !== null) {
-    if (!hasRequestBody(input.args)) {
+    if (!hasRequestBody(input.args) && !hasCredentialBodyValues) {
       if (input.payload.requestBody.required) {
         throw new OpenApiToolInvocationError({
           operation: "validate_args",
         });
       }
     } else {
-      body = JSON.stringify(input.args.body);
+      body = JSON.stringify(
+        applyJsonBodyPlacements({
+          body: hasRequestBody(input.args) ? input.args.body : {},
+          bodyValues,
+          label: `${input.payload.method.toUpperCase()} ${input.payload.pathTemplate}`,
+        }),
+      );
       const preferredContentType = input.payload.requestBody.contentTypes[0];
       if (preferredContentType) {
     }
   }
-  for (const [key, value] of Object.entries(input.credentialHeaders)) {
+  const urlWithAuth = applyHttpQueryPlacementsToUrl({
-    headers[key] = value;
+    url,
+    queryParams: input.credentialPlacements.queryParams,
+  });
+  const headersWithAuthCookies = applyCookiePlacementsToHeaders({
+    headers,
+    cookies: input.credentialPlacements.cookies,
+  });
+  for (const [key, value] of Object.entries(input.credentialPlacements.headers ?? {})) {
+    headersWithAuthCookies[key] = value;
   }
   return {
-    url,
+    url: urlWithAuth,
     method: input.payload.method.toUpperCase(),
-    headers,
+    headers: headersWithAuthCookies,
     body,
   };
 };
   baseUrl: string;
   defaultHeaders?: Readonly<Record<string, string>>;
   credentialHeaders?: Readonly<Record<string, string>>;
+  credentialPlacements?: HttpRequestPlacements;
   refHintTable?: Readonly<OpenApiRefHintTable>;
   httpClientLayer?: Layer.Layer<HttpClient.HttpClient, never, never>;
 };
+const normalizeCredentialPlacements = (input: {
+  credentialHeaders?: Readonly<Record<string, string>>;
+  credentialPlacements?: HttpRequestPlacements;
+}): HttpRequestPlacements => ({
+  headers: {
+    ...(input.credentialHeaders ?? {}),
+    ...(input.credentialPlacements?.headers ?? {}),
+  },
+  queryParams: input.credentialPlacements?.queryParams,
+  cookies: input.credentialPlacements?.cookies,
+  bodyValues: input.credentialPlacements?.bodyValues,
+});
 export const createOpenApiToolFromDefinition = (
   input: CreateOpenApiToolFromDefinitionInput,
 ) => {
   const defaultHeaders = input.defaultHeaders ?? {};
-  const credentialHeaders = input.credentialHeaders ?? {};
+  const credentialPlacements = normalizeCredentialPlacements({
+    credentialHeaders: input.credentialHeaders,
+    credentialPlacements: input.credentialPlacements,
+  });
   const httpClientLayer = input.httpClientLayer ?? FetchHttpClient.layer;
   const presentation = buildOpenApiToolPresentation({
     definition: input.definition,
           args: decodedArgs,
           baseUrl: input.baseUrl,
           defaultHeaders,
-          credentialHeaders,
+          credentialPlacements,
         });
         return Effect.runPromise(
   const baseUrl = normalizeHttpUrl(input.baseUrl);
   const sourceKey = input.sourceKey ?? "openapi.generated";
   const defaultHeaders = input.defaultHeaders ?? {};
-  const credentialHeaders = input.credentialHeaders ?? {};
   const httpClientLayer = input.httpClientLayer ?? FetchHttpClient.layer;
   const definitions = compileOpenApiToolDefinitions(input.manifest);
       sourceKey,
       baseUrl,
       defaultHeaders,
-      credentialHeaders,
+      credentialHeaders: input.credentialHeaders,
+      credentialPlacements: input.credentialPlacements,
       refHintTable: input.manifest.refHintTable,
       httpClientLayer,
     });
   sourceKey?: string;
   defaultHeaders?: Readonly<Record<string, string>>;
   credentialHeaders?: Readonly<Record<string, string>>;
+  credentialPlacements?: HttpRequestPlacements;
   httpClientLayer?: Layer.Layer<HttpClient.HttpClient, never, never>;
 }): Effect.Effect<
   { manifest: OpenApiToolManifest; definitions: Array<OpenApiToolDefinition>; tools: ToolMap },
         sourceKey: input.sourceKey,
         defaultHeaders: input.defaultHeaders,
         credentialHeaders: input.credentialHeaders,
+        credentialPlacements: input.credentialPlacements,
         httpClientLayer: input.httpClientLayer,
       }),
     }),