History

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
@@ -8,8 +8,12 @@ import * as Effect from "effect/Effect"; · 7 unmodified lines
88 import * as Layer from "effect/Layer";
99
1010 import {
11+ applyCookiePlacementsToHeaders,
12+ applyHttpQueryPlacementsToUrl,
13+ applyJsonBodyPlacements,
1114 standardSchemaFromJsonSchema,
1215 toTool,
16+ type HttpRequestPlacements,
1317 type ToolMap,
1418 unknownInputSchema,
1519 } from "@executor/codemode-core";
@@ -288,6 +292,7 @@ export type CreateOpenApiToolsFromManifestInput = { · 272 unmodified lines
288292 sourceKey?: string;
289293 defaultHeaders?: Readonly<Record<string, string>>;
290294 credentialHeaders?: Readonly<Record<string, string>>;
295+ credentialPlacements?: HttpRequestPlacements;
291296 httpClientLayer?: Layer.Layer<HttpClient.HttpClient, never, never>;
292297 };
293298
@@ -317,7 +322,7 @@ const buildFetchRequest = (input: { · 23 unmodified lines
317322 args: OpenApiToolArgs;
318323 baseUrl: string;
319324 defaultHeaders: Readonly<Record<string, string>>;
320− credentialHeaders: Readonly<Record<string, string>>;
325+ credentialPlacements: HttpRequestPlacements;
321326 }): {
322327 url: URL;
323328 method: string;
@@ -369,9 +374,11 @@ const buildFetchRequest = (input: { · 45 unmodified lines
369374 }
370375
371376 let body: string | undefined;
377+ const bodyValues = input.credentialPlacements.bodyValues ?? {};
378+ const hasCredentialBodyValues = Object.keys(bodyValues).length > 0;
372379
373380 if (input.payload.requestBody !== null) {
374− if (!hasRequestBody(input.args)) {
381+ if (!hasRequestBody(input.args) && !hasCredentialBodyValues) {
375382 if (input.payload.requestBody.required) {
376383 throw new OpenApiToolInvocationError({
377384 operation: "validate_args",
@@ -380,7 +387,13 @@ const buildFetchRequest = (input: { · 2 unmodified lines
380387 });
381388 }
382389 } else {
383− body = JSON.stringify(input.args.body);
390+ body = JSON.stringify(
391+ applyJsonBodyPlacements({
392+ body: hasRequestBody(input.args) ? input.args.body : {},
393+ bodyValues,
394+ label: `${input.payload.method.toUpperCase()} ${input.payload.pathTemplate}`,
395+ }),
396+ );
384397
385398 const preferredContentType = input.payload.requestBody.contentTypes[0];
386399 if (preferredContentType) {
@@ -391,14 +404,23 @@ const buildFetchRequest = (input: { · 4 unmodified lines
391404 }
392405 }
393406
394− for (const [key, value] of Object.entries(input.credentialHeaders)) {
395− headers[key] = value;
407+ const urlWithAuth = applyHttpQueryPlacementsToUrl({
408+ url,
409+ queryParams: input.credentialPlacements.queryParams,
410+ });
411+ const headersWithAuthCookies = applyCookiePlacementsToHeaders({
412+ headers,
413+ cookies: input.credentialPlacements.cookies,
414+ });
415+
416+ for (const [key, value] of Object.entries(input.credentialPlacements.headers ?? {})) {
417+ headersWithAuthCookies[key] = value;
396418 }
397419
398420 return {
399− url,
421+ url: urlWithAuth,
400422 method: input.payload.method.toUpperCase(),
401− headers,
423+ headers: headersWithAuthCookies,
402424 body,
403425 };
404426 };
@@ -413,15 +435,32 @@ export type CreateOpenApiToolFromDefinitionInput = { · 8 unmodified lines
413435 baseUrl: string;
414436 defaultHeaders?: Readonly<Record<string, string>>;
415437 credentialHeaders?: Readonly<Record<string, string>>;
438+ credentialPlacements?: HttpRequestPlacements;
416439 refHintTable?: Readonly<OpenApiRefHintTable>;
417440 httpClientLayer?: Layer.Layer<HttpClient.HttpClient, never, never>;
418441 };
419442
443+const normalizeCredentialPlacements = (input: {
444+ credentialHeaders?: Readonly<Record<string, string>>;
445+ credentialPlacements?: HttpRequestPlacements;
446+}): HttpRequestPlacements => ({
447+ headers: {
448+ ...(input.credentialHeaders ?? {}),
449+ ...(input.credentialPlacements?.headers ?? {}),
450+ },
451+ queryParams: input.credentialPlacements?.queryParams,
452+ cookies: input.credentialPlacements?.cookies,
453+ bodyValues: input.credentialPlacements?.bodyValues,
454+});
455+
420456 export const createOpenApiToolFromDefinition = (
421457 input: CreateOpenApiToolFromDefinitionInput,
422458 ) => {
423459 const defaultHeaders = input.defaultHeaders ?? {};
424− const credentialHeaders = input.credentialHeaders ?? {};
460+ const credentialPlacements = normalizeCredentialPlacements({
461+ credentialHeaders: input.credentialHeaders,
462+ credentialPlacements: input.credentialPlacements,
463+ });
425464 const httpClientLayer = input.httpClientLayer ?? FetchHttpClient.layer;
426465 const presentation = buildOpenApiToolPresentation({
427466 definition: input.definition,
@@ -441,7 +480,7 @@ export const createOpenApiToolFromDefinition = ( · 13 unmodified lines
441480 args: decodedArgs,
442481 baseUrl: input.baseUrl,
443482 defaultHeaders,
444− credentialHeaders,
483+ credentialPlacements,
445484 });
446485
447486 return Effect.runPromise(
@@ -503,7 +542,6 @@ export const createOpenApiToolsFromManifest = ( · 55 unmodified lines
503542 const baseUrl = normalizeHttpUrl(input.baseUrl);
504543 const sourceKey = input.sourceKey ?? "openapi.generated";
505544 const defaultHeaders = input.defaultHeaders ?? {};
506− const credentialHeaders = input.credentialHeaders ?? {};
507545 const httpClientLayer = input.httpClientLayer ?? FetchHttpClient.layer;
508546
509547 const definitions = compileOpenApiToolDefinitions(input.manifest);
@@ -517,7 +555,8 @@ export const createOpenApiToolsFromManifest = ( · 7 unmodified lines
517555 sourceKey,
518556 baseUrl,
519557 defaultHeaders,
520− credentialHeaders,
558+ credentialHeaders: input.credentialHeaders,
559+ credentialPlacements: input.credentialPlacements,
521560 refHintTable: input.manifest.refHintTable,
522561 httpClientLayer,
523562 });
@@ -534,6 +573,7 @@ export const createOpenApiToolsFromSpec = (input: { · 10 unmodified lines
534573 sourceKey?: string;
535574 defaultHeaders?: Readonly<Record<string, string>>;
536575 credentialHeaders?: Readonly<Record<string, string>>;
576+ credentialPlacements?: HttpRequestPlacements;
537577 httpClientLayer?: Layer.Layer<HttpClient.HttpClient, never, never>;
538578 }): Effect.Effect<
539579 { manifest: OpenApiToolManifest; definitions: Array<OpenApiToolDefinition>; tools: ToolMap },
@@ -551,6 +591,7 @@ export const createOpenApiToolsFromSpec = (input: { · 11 unmodified lines
551591 sourceKey: input.sourceKey,
552592 defaultHeaders: input.defaultHeaders,
553593 credentialHeaders: input.credentialHeaders,
594+ credentialPlacements: input.credentialPlacements,
554595 httpClientLayer: input.httpClientLayer,
555596 }),
556597 }),