From b2c8a2ccaf3216455e36eb84da0608b021c5efa5 Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Sun, 19 May 2024 09:17:52 +0200 Subject: [PATCH] chore(debug): envs in api functions --- .env | 3 +- .../web/envtest-dynamic-load-file/route.ts | 10 +++-- app/api/web/envtest-dynamic-load/route.ts | 10 +++-- app/api/web/envtest-dynamic-override/route.ts | 39 +++++++++++++++++++ app/api/web/envtest-dynamic/route.ts | 10 +++-- app/api/web/envtest-static-load-file/route.ts | 10 +++-- app/api/web/envtest-static-load/route.ts | 10 +++-- app/api/web/envtest-static-override/route.ts | 37 ++++++++++++++++++ app/api/web/envtest-static/route.ts | 10 +++-- env/server.ts | 6 ++- 10 files changed, 124 insertions(+), 21 deletions(-) create mode 100644 app/api/web/envtest-dynamic-override/route.ts create mode 100644 app/api/web/envtest-static-override/route.ts diff --git a/.env b/.env index 9652249da..a84ee47ab 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ # See update-dotenv.mjs ENVTEST="value from .env.api" -URL="REPLACEME-ON-BUILD-ON-NETLIFY" +PUBLIC_URL="REPLACEME-ON-BUILD-ON-NETLIFY" NEXTAUTH_URL="REPLACEME-ON-BUILD-ON-NETLIFY" +NEXTAUTH_URL2="REPLACEME-ON-BUILD-ON-NETLIFY" diff --git a/app/api/web/envtest-dynamic-load-file/route.ts b/app/api/web/envtest-dynamic-load-file/route.ts index fb03d4e9e..1efd16b34 100644 --- a/app/api/web/envtest-dynamic-load-file/route.ts +++ b/app/api/web/envtest-dynamic-load-file/route.ts @@ -11,13 +11,14 @@ export async function GET(request: NextRequest) { const e = process.env console.log({ process_env: process.env }) - const urlVar = "URL" + const urlVar = "PUBLIC_URL" const nextAuthUrlVar = "NEXTAUTH_URL" + const nextAuthUrlVar2 = "NEXTAUTH_URL2" const envTestVar = "ENVTEST" const values = { - env_url: env.URL, - static_url: process.env.URL, + env_url: env.PUBLIC_URL, + static_url: process.env.PUBLIC_URL, dynamic_url: e[urlVar], env_envtest: env.ENVTEST, static_envtest: process.env.ENVTEST, @@ -25,6 +26,9 @@ export async function GET(request: NextRequest) { env_nextauth: env.NEXTAUTH_URL, static_nextauth: process.env.NEXTAUTH_URL, dynamic_nextauth: e[nextAuthUrlVar], + env_nextauth2: env.NEXTAUTH_URL2, + static_nextauth2: process.env.NEXTAUTH_URL2, + dynamic_nextauth2: e[nextAuthUrlVar2], } console.log(values) diff --git a/app/api/web/envtest-dynamic-load/route.ts b/app/api/web/envtest-dynamic-load/route.ts index 8bcf3506a..927afa515 100644 --- a/app/api/web/envtest-dynamic-load/route.ts +++ b/app/api/web/envtest-dynamic-load/route.ts @@ -10,13 +10,14 @@ export async function GET(request: NextRequest) { const e = process.env console.log({ process_env: process.env }) - const urlVar = "URL" + const urlVar = "PUBLC_URL" const nextAuthUrlVar = "NEXTAUTH_URL" + const nextAuthUrlVar2 = "NEXTAUTH_URL2" const envTestVar = "ENVTEST" const values = { - env_url: env.URL, - static_url: process.env.URL, + env_url: env.PUBLIC_URL, + static_url: process.env.PUBLIC_URL, dynamic_url: e[urlVar], env_envtest: env.ENVTEST, static_envtest: process.env.ENVTEST, @@ -24,6 +25,9 @@ export async function GET(request: NextRequest) { env_nextauth: env.NEXTAUTH_URL, static_nextauth: process.env.NEXTAUTH_URL, dynamic_nextauth: e[nextAuthUrlVar], + env_nextauth2: env.NEXTAUTH_URL2, + static_nextauth2: process.env.NEXTAUTH_URL2, + dynamic_nextauth2: e[nextAuthUrlVar2], } console.log(values) diff --git a/app/api/web/envtest-dynamic-override/route.ts b/app/api/web/envtest-dynamic-override/route.ts new file mode 100644 index 000000000..7dbf84509 --- /dev/null +++ b/app/api/web/envtest-dynamic-override/route.ts @@ -0,0 +1,39 @@ +import { config } from "dotenv" +import { NextResponse } from "next/server" + +import { env } from "@/env/server" + +import type { NextRequest } from "next/server" + +config({ debug: true, override: true }) + +export async function GET(request: NextRequest) { + const e = process.env + console.log({ process_env: process.env }) + + const urlVar = "PUBLC_URL" + const nextAuthUrlVar = "NEXTAUTH_URL" + const nextAuthUrlVar2 = "NEXTAUTH_URL2" + const envTestVar = "ENVTEST" + + const values = { + env_url: env.PUBLIC_URL, + static_url: process.env.PUBLIC_URL, + dynamic_url: e[urlVar], + env_envtest: env.ENVTEST, + static_envtest: process.env.ENVTEST, + dynamic_envtest: e[envTestVar], + env_nextauth: env.NEXTAUTH_URL, + static_nextauth: process.env.NEXTAUTH_URL, + dynamic_nextauth: e[nextAuthUrlVar], + env_nextauth2: env.NEXTAUTH_URL2, + static_nextauth2: process.env.NEXTAUTH_URL2, + dynamic_nextauth2: e[nextAuthUrlVar2], + } + + console.log(values) + + return NextResponse.json(values) +} + +export const dynamic = "force-dynamic" diff --git a/app/api/web/envtest-dynamic/route.ts b/app/api/web/envtest-dynamic/route.ts index 666976dec..325c60882 100644 --- a/app/api/web/envtest-dynamic/route.ts +++ b/app/api/web/envtest-dynamic/route.ts @@ -8,13 +8,14 @@ export async function GET(request: NextRequest) { const e = process.env console.log({ process_env: process.env }) - const urlVar = "URL" + const urlVar = "PUBLIC_URL" const nextAuthUrlVar = "NEXTAUTH_URL" + const nextAuthUrlVar2 = "NEXTAUTH_URL2" const envTestVar = "ENVTEST" const values = { - env_url: env.URL, - static_url: process.env.URL, + env_url: env.PUBLIC_URL, + static_url: process.env.PUBLIC_URL, dynamic_url: e[urlVar], env_envtest: env.ENVTEST, static_envtest: process.env.ENVTEST, @@ -22,6 +23,9 @@ export async function GET(request: NextRequest) { env_nextauth: env.NEXTAUTH_URL, static_nextauth: process.env.NEXTAUTH_URL, dynamic_nextauth: e[nextAuthUrlVar], + env_nextauth2: env.NEXTAUTH_URL2, + static_nextauth2: process.env.NEXTAUTH_URL2, + dynamic_nextauth2: e[nextAuthUrlVar2], } console.log(values) diff --git a/app/api/web/envtest-static-load-file/route.ts b/app/api/web/envtest-static-load-file/route.ts index c12760469..b731951d1 100644 --- a/app/api/web/envtest-static-load-file/route.ts +++ b/app/api/web/envtest-static-load-file/route.ts @@ -11,13 +11,14 @@ export async function GET(request: NextRequest) { const e = process.env console.log({ process_env: process.env }) - const urlVar = "URL" + const urlVar = "PUBLIC_URL" const nextAuthUrlVar = "NEXTAUTH_URL" + const nextAuthUrlVar2 = "NEXTAUTH_URL2" const envTestVar = "ENVTEST" const values = { - env_url: env.URL, - static_url: process.env.URL, + env_url: env.PUBLIC_URL, + static_url: process.env.PUBLIC_URL, dynamic_url: e[urlVar], env_envtest: env.ENVTEST, static_envtest: process.env.ENVTEST, @@ -25,6 +26,9 @@ export async function GET(request: NextRequest) { env_nextauth: env.NEXTAUTH_URL, static_nextauth: process.env.NEXTAUTH_URL, dynamic_nextauth: e[nextAuthUrlVar], + env_nextauth2: env.NEXTAUTH_URL2, + static_nextauth2: process.env.NEXTAUTH_URL2, + dynamic_nextauth2: e[nextAuthUrlVar2], } console.log(values) diff --git a/app/api/web/envtest-static-load/route.ts b/app/api/web/envtest-static-load/route.ts index 701f5acaa..6b18776b2 100644 --- a/app/api/web/envtest-static-load/route.ts +++ b/app/api/web/envtest-static-load/route.ts @@ -10,13 +10,14 @@ export async function GET(request: NextRequest) { const e = process.env console.log({ process_env: process.env }) - const urlVar = "URL" + const urlVar = "PUBLIC_URL" const nextAuthUrlVar = "NEXTAUTH_URL" + const nextAuthUrlVar2 = "NEXTAUTH_URL2" const envTestVar = "ENVTEST" const values = { - env_url: env.URL, - static_url: process.env.URL, + env_url: env.PUBLIC_URL, + static_url: process.env.PUBLIC_URL, dynamic_url: e[urlVar], env_envtest: env.ENVTEST, static_envtest: process.env.ENVTEST, @@ -24,6 +25,9 @@ export async function GET(request: NextRequest) { env_nextauth: env.NEXTAUTH_URL, static_nextauth: process.env.NEXTAUTH_URL, dynamic_nextauth: e[nextAuthUrlVar], + env_nextauth2: env.NEXTAUTH_URL2, + static_nextauth2: process.env.NEXTAUTH_URL2, + dynamic_nextauth2: e[nextAuthUrlVar2], } console.log(values) diff --git a/app/api/web/envtest-static-override/route.ts b/app/api/web/envtest-static-override/route.ts new file mode 100644 index 000000000..178c2e28c --- /dev/null +++ b/app/api/web/envtest-static-override/route.ts @@ -0,0 +1,37 @@ +import { config } from "dotenv" +import { NextResponse } from "next/server" + +import { env } from "@/env/server" + +import type { NextRequest } from "next/server" + +config({ debug: true, override: true }) + +export async function GET(request: NextRequest) { + const e = process.env + console.log({ process_env: process.env }) + + const urlVar = "PUBLIC_URL" + const nextAuthUrlVar = "NEXTAUTH_URL" + const nextAuthUrlVar2 = "NEXTAUTH_URL2" + const envTestVar = "ENVTEST" + + const values = { + env_url: env.PUBLIC_URL, + static_url: process.env.PUBLIC_URL, + dynamic_url: e[urlVar], + env_envtest: env.ENVTEST, + static_envtest: process.env.ENVTEST, + dynamic_envtest: e[envTestVar], + env_nextauth: env.NEXTAUTH_URL, + static_nextauth: process.env.NEXTAUTH_URL, + dynamic_nextauth: e[nextAuthUrlVar], + env_nextauth2: env.NEXTAUTH_URL2, + static_nextauth2: process.env.NEXTAUTH_URL2, + dynamic_nextauth2: e[nextAuthUrlVar2], + } + + console.log(values) + + return NextResponse.json(values) +} diff --git a/app/api/web/envtest-static/route.ts b/app/api/web/envtest-static/route.ts index faa80dffc..8e9eeda91 100644 --- a/app/api/web/envtest-static/route.ts +++ b/app/api/web/envtest-static/route.ts @@ -8,13 +8,14 @@ export async function GET(request: NextRequest) { const e = process.env console.log({ process_env: process.env }) - const urlVar = "URL" + const urlVar = "PUBLIC_URL" const nextAuthUrlVar = "NEXTAUTH_URL" + const nextAuthUrlVar2 = "NEXTAUTH_URL2" const envTestVar = "ENVTEST" const values = { - env_url: env.URL, - static_url: process.env.URL, + env_url: env.PUBLIC_URL, + static_url: process.env.PUBLIC_URL, dynamic_url: e[urlVar], env_envtest: env.ENVTEST, static_envtest: process.env.ENVTEST, @@ -22,6 +23,9 @@ export async function GET(request: NextRequest) { env_nextauth: env.NEXTAUTH_URL, static_nextauth: process.env.NEXTAUTH_URL, dynamic_nextauth: e[nextAuthUrlVar], + env_nextauth2: env.NEXTAUTH_URL2, + static_nextauth2: process.env.NEXTAUTH_URL2, + dynamic_nextauth2: e[nextAuthUrlVar2], } console.log(values) diff --git a/env/server.ts b/env/server.ts index 0dfac259b..18fb22cb8 100644 --- a/env/server.ts +++ b/env/server.ts @@ -33,12 +33,14 @@ export const env = createEnv({ NEXTAUTH_REDIRECT_PROXY_URL: z.string().optional(), NEXTAUTH_SECRET: z.string(), NEXTAUTH_URL: z.string().optional(), + NEXTAUTH_URL2: z.string().optional(), NODE_ENV: z.enum(["development", "test", "production"]), PRINT_QUERY: z .string() .refine((s) => s === "true" || s === "false") .transform((s) => s === "true") .default("false"), + PUBLIC_URL: z.string().optional(), REVALIDATE_SECRET: z.string(), SEAMLESS_LOGIN_DA: z.string(), SEAMLESS_LOGIN_DE: z.string(), @@ -46,7 +48,6 @@ export const env = createEnv({ SEAMLESS_LOGIN_FI: z.string(), SEAMLESS_LOGIN_NO: z.string(), SEAMLESS_LOGIN_SV: z.string(), - URL: z.string().optional(), WEBVIEW_ENCRYPTION_KEY: z.string(), }, emptyStringAsUndefined: true, @@ -70,8 +71,10 @@ export const env = createEnv({ NEXTAUTH_REDIRECT_PROXY_URL: process.env.NEXTAUTH_REDIRECT_PROXY_URL, NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET, NEXTAUTH_URL: process.env.NEXTAUTH_URL, + NEXTAUTH_URL2: process.env.NEXTAUTH_URL2, NODE_ENV: process.env.NODE_ENV, PRINT_QUERY: process.env.PRINT_QUERY, + PUBLIC_URL: process.env.PUBLIC_URL, REVALIDATE_SECRET: process.env.REVALIDATE_SECRET, SEAMLESS_LOGIN_DA: process.env.SEAMLESS_LOGIN_DA, SEAMLESS_LOGIN_DE: process.env.SEAMLESS_LOGIN_DE, @@ -79,7 +82,6 @@ export const env = createEnv({ SEAMLESS_LOGIN_FI: process.env.SEAMLESS_LOGIN_FI, SEAMLESS_LOGIN_NO: process.env.SEAMLESS_LOGIN_NO, SEAMLESS_LOGIN_SV: process.env.SEAMLESS_LOGIN_SV, - URL: process.env.URL, WEBVIEW_ENCRYPTION_KEY: process.env.WEBVIEW_ENCRYPTION_KEY, }, })