History

Clean cloud auth and Autumn boundaries

Rhys Sullivan committed 6 months ago

Commit d401d651 parent b039b6e4 files · +36 −22Browse files

Showing the changes to apps/cloud/src/api (1 of 4 files). Show all

Unified · Split

apps/cloud/src/api/autumn.ts+12−16
@@ -1,5 +1,5 @@
11 import { env } from "cloudflare:workers";
2−import { Effect } from "effect";
2+import { Cause, Effect } from "effect";
33 import {
44 HttpRouter,
55 HttpServerRequest,
@@ -30,13 +30,11 @@ const handler = Effect.gen(function* () { · 24 unmodified lines
3030 const session = yield* workos.authenticateRequest(webRequest);
3131
3232 if (!session || !session.organizationId) {
33− return yield* Effect.fail(
34− new HttpResponseError({
35− status: 401,
36− code: "unauthorized",
37− message: "Unauthorized",
38− }),
39− );
33+ return yield* new HttpResponseError({
34+ status: 401,
35+ code: "unauthorized",
36+ message: "Unauthorized",
37+ });
4038 }
4139
4240 const url = new URL(webRequest.url);
@@ -74,20 +72,18 @@ const handler = Effect.gen(function* () { · 31 unmodified lines
7472
7573 if (statusCode >= 400) {
7674 console.error("[autumn] upstream error:", statusCode, response);
77− return yield* Effect.fail(
78− new HttpResponseError({
79− status: statusCode,
80− code: "billing_request_failed",
81− message: "Billing request failed",
82− }),
83− );
75+ return yield* new HttpResponseError({
76+ status: statusCode,
77+ code: "billing_request_failed",
78+ message: "Billing request failed",
79+ });
8480 }
8581
8682 return HttpServerResponse.jsonUnsafe(response, { status: statusCode });
8783 }).pipe(
8884 Effect.catchCause((err) => {
8985 if (isServerError(err)) {
90− console.error("[autumn] request failed:", err instanceof Error ? err.stack : err);
86+ console.error("[autumn] request failed:", Cause.pretty(err));
9187 }
9288 return Effect.succeed(toErrorServerResponse(err));
9389 }),