diff --git a/web/src/app.d.ts b/web/src/app.d.ts index 8a5c4ae0..92cecc69 100644 --- a/web/src/app.d.ts +++ b/web/src/app.d.ts @@ -5,7 +5,6 @@ declare global { bobbinUrl: string; knotMirrorUrl: string; apiUrl: string; - knotResolverUrl: string; camoEnabled: boolean; }; } diff --git a/web/src/lib/server/config.ts b/web/src/lib/server/config.ts index a0b8e6b7..8214580d 100644 --- a/web/src/lib/server/config.ts +++ b/web/src/lib/server/config.ts @@ -9,7 +9,6 @@ export type WebConfig = { bobbinUrl: string; knotMirrorUrl: string; apiUrl: string; - knotResolverUrl: string; camoUrl: string; avatarUrl: string; /** the secrets camo and avatar sign with, so neither leaves the server */ @@ -19,7 +18,7 @@ export type WebConfig = { export type PublicWebConfig = Pick< WebConfig, - "bobbinUrl" | "knotMirrorUrl" | "apiUrl" | "knotResolverUrl" + "bobbinUrl" | "knotMirrorUrl" | "apiUrl" > & { /** camo has a secret, so markup can route images through it */ camoEnabled: boolean; @@ -41,7 +40,6 @@ export const resolveConfig = (values: WebConfigEnv): WebConfig => ({ bobbinUrl: cleanUrl(values.BOBBIN_URL, "http://127.0.0.1:8090"), knotMirrorUrl: cleanUrl(values.KNOTMIRROR_URL, ""), apiUrl: cleanUrl(values.TANGLED_API_URL ?? values.API_URL, "http://127.0.0.1:8080"), - knotResolverUrl: cleanUrl(values.KNOT_RESOLVER_URL, "https://knot1.tangled.sh"), camoUrl: cleanUrl(values.CAMO_URL, "https://camo.tangled.sh"), avatarUrl: cleanUrl(values.AVATAR_URL, "https://avatar.tangled.sh"), camoSecret: values.CAMO_SHARED_SECRET?.trim() ?? "", @@ -58,7 +56,6 @@ export const getPublicConfig = (): PublicWebConfig => { bobbinUrl: config.bobbinUrl, knotMirrorUrl: config.knotMirrorUrl, apiUrl: config.apiUrl, - knotResolverUrl: config.knotResolverUrl, camoEnabled: config.camoSecret !== "" }; };