Merge remote-tracking branch 'origin/codex/effect-lint-core-api-oauth-sources' into codex/effect-lint-integration

Rhys Sullivan committed 6 months ago

Commit e03dd712 parents eb2f5a4 ff6dbd32 files · +45 −26Browse files

Unified · Split

2 files

apps/cloud/src/services/sources-api.node.test.ts +18 −17
packages/core/api/src/handlers/oauth.ts +27 −9

apps/cloud/src/services/sources-api.node.test.ts+18−17

 // single org.
 import { describe, expect, it } from "@effect/vitest";
-import { Effect } from "effect";
+import { Effect, Result, Schema } from "effect";
 import http from "node:http";
 import { readFileSync } from "node:fs";
 import type { AddressInfo } from "node:net";
   },
 };
+const GraphqlRequestSchema = Schema.Struct({
+  query: Schema.optional(Schema.String),
+  variables: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
+});
 const startGraphqlServer = () => {
   const requests: Array<{ readonly query: string; readonly variables: unknown }> = [];
   const server = http.createServer(async (req, res) => {
       return;
     }
-    const parsed = JSON.parse(await readBody(req)) as {
+    const parsed = await Schema.decodeUnknownPromise(Schema.fromJsonString(GraphqlRequestSchema))(
-      readonly query?: string;
+      await readBody(req),
-      readonly variables?: Record<string, unknown>;
+    );
-    };
     const query = parsed.query ?? "";
     requests.push({ query, variables: parsed.variables ?? null });
         }),
       );
-      if (execution.status !== "completed") {
+      expect(execution.status).toBe("completed");
-        throw new Error(`Expected completed execution, got ${execution.status}`);
+      if (execution.status !== "completed") return;
-      }
       expect(execution.isError).toBe(false);
       expect(execution.structured).toMatchObject({
         status: "completed",
           })
           .pipe(Effect.result),
       );
-      expect(addResult._tag).toBe("Failure");
+      expect(Result.isFailure(addResult)).toBe(true);
       const fetched = yield* asOrg(org, (client) =>
         client.mcp.getSource({ params: { scopeId, namespace } }),
         }),
       );
-      if (execution.status !== "completed") {
+      expect(execution.status).toBe("completed");
-        throw new Error(`Expected completed execution, got ${execution.status}`);
+      if (execution.status !== "completed") return;
-      }
       expect(execution.isError).toBe(false);
       expect(execution.structured).toMatchObject({
         status: "completed",
         }),
       );
-      if (execution.status !== "completed") {
+      expect(execution.status).toBe("completed");
-        throw new Error(`Expected completed execution, got ${execution.status}`);
+      if (execution.status !== "completed") return;
-      }
       expect(execution.isError).toBe(false);
       expect(execution.structured).toMatchObject({
         status: "completed",
           .remove({ params: { scopeId: ScopeId.make(org), sourceId: ghost } })
           .pipe(Effect.result),
       );
-      expect(result._tag).toBe("Success");
+      expect(Result.isSuccess(result)).toBe(true);
     }),
   );
           .remove({ params: { scopeId: ScopeId.make(org), sourceId: "openapi" } })
           .pipe(Effect.result),
       );
-      expect(result._tag).toBe("Failure");
+      expect(Result.isFailure(result)).toBe(true);
     }),
   );

packages/core/api/src/handlers/oauth.ts+27−9

@@ -6,7 +6,7 @@ · 5 unmodified lines
6		6
7	import { HttpApiBuilder } from "effect/unstable/httpapi";	7	import { HttpApiBuilder } from "effect/unstable/httpapi";
8	import { HttpServerResponse } from "effect/unstable/http";	8	import { HttpServerResponse } from "effect/unstable/http";
9	import { Effect } from "effect";	9	import { Effect, Option, Predicate, Schema } from "effect";
10		10
11	import { runOAuthCallback } from "../oauth-popup";	11	import { runOAuthCallback } from "../oauth-popup";
12	import {	12	import {
@@ -39,19 +39,35 @@ const resolveOAuthSecretBackedMap = <E extends OAuthProbeError \| OAuthStartError · 26 unmodified lines
39	onError: (_error, name) => makeError(`Secret not found for "${name}"`),	39	onError: (_error, name) => makeError(`Secret not found for "${name}"`),
40	}).pipe(	40	}).pipe(
41	Effect.mapError((error) =>	41	Effect.mapError((error) =>
42	error instanceof OAuthProbeError \|\| error instanceof OAuthStartError	42	Predicate.isTagged(error, "OAuthProbeError") \|\| Predicate.isTagged(error, "OAuthStartError")
43	? (error as E)	43	? (error as E)
44	: makeError("Secret resolution failed"),	44	: makeError("Secret resolution failed"),
45	),	45	),
46	);	46	);
47		47
		48	const decodeOAuthStartError = Schema.decodeUnknownOption(OAuthStartError);
		49	const decodeOAuthCompleteError = Schema.decodeUnknownOption(OAuthCompleteError);
		50	const decodeOAuthProbeError = Schema.decodeUnknownOption(OAuthProbeError);
		51	const decodeOAuthSessionNotFoundError = Schema.decodeUnknownOption(OAuthSessionNotFoundError);
		52
		53	const getOAuthErrorMessage = <A extends { readonly message: string }>(
		54	error: unknown,
		55	decode: (input: unknown) => Option.Option<A>,
		56	): string \| undefined =>
		57	Option.match(decode(error), {
		58	onNone: () => undefined,
		59	onSome: (oauthError) => oauthError.message,
		60	});
		61
48	const toPopupErrorMessage = (error: unknown): string => {	62	const toPopupErrorMessage = (error: unknown): string => {
49	if (error instanceof OAuthStartError) return error.message;	63	const message =
50	if (error instanceof OAuthCompleteError) return error.message;	64	getOAuthErrorMessage(error, decodeOAuthStartError) ??
51	if (error instanceof OAuthProbeError) return error.message;	65	getOAuthErrorMessage(error, decodeOAuthCompleteError) ??
52	if (error instanceof OAuthSessionNotFoundError) {	66	getOAuthErrorMessage(error, decodeOAuthProbeError);
53	return `OAuth session not found: ${error.sessionId}`;	67	if (message) return message;
54	}	68
		69	const sessionNotFound = decodeOAuthSessionNotFoundError(error);
		70	if (Option.isSome(sessionNotFound)) return `OAuth session not found: ${sessionNotFound.value.sessionId}`;
55	return "Authentication failed";	71	return "Authentication failed";
56	};	72	};
57		73
@@ -147,7 +163,9 @@ export const OAuthHandlers = HttpApiBuilder.group(ExecutorApi, "oauth", (handler · 89 unmodified lines
147	Effect.tapError((cause) =>	163	Effect.tapError((cause) =>
148	Effect.logError("OAuth callback completion failed", cause),	164	Effect.logError("OAuth callback completion failed", cause),
149	),	165	),
150	Effect.catchCause(() => Effect.fail(new Error("Authentication failed"))),	166	Effect.catchCause(() =>
		167	Effect.fail(new OAuthCompleteError({ message: "Authentication failed" })),
		168	),
151	),	169	),
152	urlParams,	170	urlParams,
153	toErrorMessage: toPopupErrorMessage,	171	toErrorMessage: toPopupErrorMessage,