fix: multipart form proxy (#1987)

fern-api · Jan 11, 2025 · 3be5ab0 · 3be5ab0
1 parent 224530a
commit 3be5ab0
Show file tree

Hide file tree

Showing 22 changed files with 180 additions and 679 deletions.
diff --git a/packages/fern-docs/bundle/src/app/api/fern-docs/proxy/file/route.ts b/packages/fern-docs/bundle/src/app/api/fern-docs/proxy/file/route.ts
diff --git a/packages/fern-docs/bundle/src/app/api/fern-docs/proxy/rest/route.ts b/packages/fern-docs/bundle/src/app/api/fern-docs/proxy/rest/route.ts
diff --git a/packages/fern-docs/bundle/src/app/api/fern-docs/proxy/stream/route.ts b/packages/fern-docs/bundle/src/app/api/fern-docs/proxy/stream/route.ts
diff --git a/packages/fern-docs/ui/src/hooks/useStandardProxyEnvironment.ts b/packages/fern-docs/ui/src/hooks/useStandardProxyEnvironment.ts
@@ -1,7 +1,5 @@
 import { withDefaultProtocol } from "@fern-api/ui-core-utils";
 import { once } from "es-toolkit/function";
-import { useBasePath, useEdgeFlags } from "../atoms";
-import { useApiRoute } from "./useApiRoute";
 
 const APP_BUILDWITHFERN_COM = "app.buildwithfern.com";
 
@@ -23,12 +21,3 @@ export const getAppBuildwithfernCom = once((): string => {
 
   return withDefaultProtocol(APP_BUILDWITHFERN_COM);
 });
-
-export function useStandardProxyEnvironment(): string {
-  const basePath = useBasePath();
-  const { proxyShouldUseAppBuildwithfernCom } = useEdgeFlags();
-  const proxyBasePath = proxyShouldUseAppBuildwithfernCom
-    ? getAppBuildwithfernCom()
-    : basePath;
-  return useApiRoute("/api/fern-docs/proxy", { basepath: proxyBasePath });
-}
diff --git a/packages/fern-docs/ui/src/index.ts b/packages/fern-docs/ui/src/index.ts
@@ -5,7 +5,6 @@ export * from "./docs/DocsPage";
 export * from "./docs/NextApp";
 export { getApiRouteSupplier } from "./hooks/useApiRoute";
 export * from "./mdx/types";
-export { Stream } from "./playground/Stream";
 export { ProxyRequestSchema } from "./playground/types";
 export type {
   ProxyRequest,

diff --git a/packages/fern-docs/ui/src/playground/PlaygroundRequestPreview.tsx b/packages/fern-docs/ui/src/playground/PlaygroundRequestPreview.tsx
@@ -7,7 +7,6 @@ import {
   PLAYGROUND_AUTH_STATE_OAUTH_ATOM,
   useEdgeFlags,
 } from "../atoms";
-import { useStandardProxyEnvironment } from "../hooks/useStandardProxyEnvironment";
 import { PlaygroundCodeSnippetResolverBuilder } from "./code-snippets/resolver";
 import { useSnippet } from "./code-snippets/useSnippet";
 import { PlaygroundEndpointRequestFormState } from "./types";
@@ -39,27 +38,12 @@ export const PlaygroundRequestPreview: FC<PlaygroundRequestPreviewProps> = ({
       ),
     [context, isSnippetTemplatesEnabled, isFileForgeHackEnabled]
   );
-  const proxyEnvironment = useStandardProxyEnvironment();
 
   const resolver = useMemo(
     () =>
       oAuthValue &&
-      builder.createRedacted(
-        authState,
-        formState,
-        proxyEnvironment,
-        baseUrl,
-        setOAuthValue
-      ),
-    [
-      authState,
-      builder,
-      formState,
-      proxyEnvironment,
-      oAuthValue,
-      baseUrl,
-      setOAuthValue,
-    ]
+      builder.createRedacted(authState, formState, baseUrl, setOAuthValue),
+    [authState, builder, formState, oAuthValue, baseUrl, setOAuthValue]
   );
   const code = useSnippet(resolver, requestType);
 

diff --git a/packages/fern-docs/ui/src/playground/PlaygroundResponsePreview.tsx b/packages/fern-docs/ui/src/playground/PlaygroundResponsePreview.tsx
@@ -14,13 +14,9 @@ export const PlaygroundResponsePreview: FC<PlaygroundResponsePreviewProps> = ({
 }) => {
   const responseJson = useMemo(
     () =>
-      response.type === "stream"
+      typeof response.response.body === "string"
         ? response.response.body
-        : response.type === "file"
-          ? ""
-          : typeof response.response.body === "string"
-            ? response.response.body
-            : JSON.stringify(response.response.body, null, 2),
+        : JSON.stringify(response.response.body, null, 2),
     [response]
   );
   const viewportRef = useRef<ScrollToHandle>(null);

diff --git a/packages/fern-docs/ui/src/playground/Stream.ts b/packages/fern-docs/ui/src/playground/Stream.ts
diff --git a/packages/fern-docs/ui/src/playground/auth/PlaygroundOAuthForm.tsx b/packages/fern-docs/ui/src/playground/auth/PlaygroundOAuthForm.tsx
@@ -15,7 +15,6 @@ import {
   PLAYGROUND_AUTH_STATE_OAUTH_ATOM,
   usePlaygroundEndpointFormState,
 } from "../../atoms";
-import { useStandardProxyEnvironment } from "../../hooks/useStandardProxyEnvironment";
 import { Callout } from "../../mdx/components/callout";
 import { PasswordInputGroup } from "../PasswordInputGroup";
 import { PlaygroundEndpointForm } from "../endpoint";
@@ -39,7 +38,6 @@ function FoundOAuthReferencedEndpointForm({
   disabled?: boolean;
 }): ReactElement {
   const [value, setValue] = useAtom(PLAYGROUND_AUTH_STATE_OAUTH_ATOM);
-  const proxyEnvironment = useStandardProxyEnvironment();
   const [formState, setFormState] = usePlaygroundEndpointFormState(context);
   const [baseUrl] = usePlaygroundBaseUrl(context.endpoint);
 
@@ -53,7 +51,6 @@ function FoundOAuthReferencedEndpointForm({
     await oAuthClientCredentialReferencedEndpointLoginFlow({
       formState,
       endpoint: context.endpoint,
-      proxyEnvironment,
       referencedEndpoint,
       baseUrl,
       setValue,