From dfdad9882835d6c322293c71fa47274ab47c05b7 Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Wed, 15 Oct 2025 14:26:31 +0800 Subject: [PATCH 1/2] use t3-env for WORKFLOWS_RPC_URL --- apps/web/lib/server.ts | 9 ++------- packages/env/server.ts | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/apps/web/lib/server.ts b/apps/web/lib/server.ts index c4badc574b..e085bbde49 100644 --- a/apps/web/lib/server.ts +++ b/apps/web/lib/server.ts @@ -1,6 +1,7 @@ import "server-only"; import { decrypt } from "@cap/database/crypto"; +import { serverEnv } from "@cap/env"; import { AwsCredentials, Database, @@ -36,7 +37,6 @@ import { Redacted, } from "effect"; import { cookies } from "next/headers"; - import { allowedOrigins } from "@/utils/cors"; import { layerTracer } from "./tracing"; @@ -55,12 +55,7 @@ const CookiePasswordAttachmentLive = Layer.effect( class WorkflowRpcSecret extends Effect.Service()( "WorkflowRpcSecret", - { - effect: Effect.map( - Config.redacted(Config.string("WORKFLOWS_RPC_SECRET")), - (v) => ({ authSecret: v }), - ), - }, + { sync: () => ({ authSecret: serverEnv().WORKFLOWS_RPC_SECRET }) }, ) {} const WorkflowRpcLive = Layer.scoped( diff --git a/packages/env/server.ts b/packages/env/server.ts index 242b95d377..f580818472 100644 --- a/packages/env/server.ts +++ b/packages/env/server.ts @@ -67,8 +67,8 @@ function createServerEnv() { S3_PUBLIC_ENDPOINT: z.string().optional(), S3_INTERNAL_ENDPOINT: z.string().optional(), VERCEL_AWS_ROLE_ARN: z.string().optional(), - REMOTE_WORKFLOW_URL: z.string().optional(), - REMOTE_WORKFLOW_SECRET: z.string().optional(), + WORKFLOWS_RPC_URL: z.string().optional(), + WORKFLOWS_RPC_SECRET: z.string(), }, experimental__runtimeEnv: { ...process.env, From 7b2bf3eb852285fa4530511183b838e302643223 Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Wed, 15 Oct 2025 14:36:22 +0800 Subject: [PATCH 2/2] fix types --- apps/web/lib/server.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/web/lib/server.ts b/apps/web/lib/server.ts index e085bbde49..c263de730f 100644 --- a/apps/web/lib/server.ts +++ b/apps/web/lib/server.ts @@ -55,7 +55,11 @@ const CookiePasswordAttachmentLive = Layer.effect( class WorkflowRpcSecret extends Effect.Service()( "WorkflowRpcSecret", - { sync: () => ({ authSecret: serverEnv().WORKFLOWS_RPC_SECRET }) }, + { + sync: () => ({ + authSecret: Redacted.make(serverEnv().WORKFLOWS_RPC_SECRET), + }), + }, ) {} const WorkflowRpcLive = Layer.scoped(