diff --git a/.env b/.env index 6b77e0d678..b22bccb839 100644 --- a/.env +++ b/.env @@ -111,7 +111,7 @@ OAUTH2_PROXY_HTTP_ADDRESS=${SERVER_HOST}:${AUTHPROXY_PORT} OAUTH2_PROXY_PROVIDER=oidc OAUTH2_PROXY_SKIP_PROVIDER_BUTTON=true OAUTH2_PROXY_EMAIL_DOMAINS="*" -OAUTH2_PROXY_SCOPE=openid offline_access email profile +OAUTH2_PROXY_SCOPE="openid offline_access email profile" OAUTH2_PROXY_PASS_AUTHORIZATION_HEADER=true OAUTH2_PROXY_COOKIE_SECRET=1234567890123456 OAUTH2_PROXY_COOKIE_REFRESH=55m diff --git a/dev-pm.config.ts b/dev-pm.config.ts index 3e28ad8776..f8f05862fa 100644 --- a/dev-pm.config.ts +++ b/dev-pm.config.ts @@ -210,7 +210,7 @@ export default defineConfig({ //group demo api { name: "demo-docker", - script: "pnpm run dev:docker-compose up", + script: "set -a; . .env; . .env.local; set +a; docker compose up", group: ["demo-api", "demo"], }, { diff --git a/package.json b/package.json index 36804db496..6b7d6a5ac1 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ "dev:oauth2-proxy": "dotenv -- ./node_modules/.bin/oauth2-proxy", "dev:demo-api-mitmproxy": "dotenv -- sh -c './node_modules/.bin/mitmweb --mode reverse:http://localhost:$API_PORT --listen-port $API_MITMPROXY_PORT --web-host localhost --web-port $MITMPROXY_WEB_INTERFACE_PORT --no-web-open-browser --set web_password=$MITMPROXY_WEB_PASSWORD'", "dev:oidc-provider": "dotenv -- dev-oidc-provider", - "dev:docker-compose": "dotenv -e .env.secrets -e .env.local -e .env -- docker compose", "intl:extract": "formatjs extract './packages/admin/**/*.{ts,tsx}' --out-file 'lang/en.json' --ignore '**/*.{test,spec}.{ts,tsx}' --ignore './**.d.ts' --ignore './**.d.ts.map' --format simple --throws", "lint": "pnpm lint:root && pnpm --recursive run lint && pnpm lint:knip", "lint:ci": "pnpm lint:root && pnpm --recursive run lint:ci && pnpm lint:knip",