mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-28 01:52:16 +00:00
# Which Problems Are Solved - The previous monorepo in monorepo structure for the login app and its related packages was fragmented, complicated and buggy. - The process for building and testing the login container was inconsistent between local development and CI. - Lack of clear documentation as well as easy and reliable ways for non-frontend developers to reproduce and fix failing PR checks locally. # How the Problems Are Solved - Consolidated the login app and its related npm packages by moving the main package to `apps/login/apps/login` and merging `apps/login/packages/integration` and `apps/login/packages/acceptance` into the main `apps/login` package. - Migrated from Docker Compose-based test setups to dev container-based setups, adding support for multiple dev container configurations: - `.devcontainer/base` - `.devcontainer/turbo-lint-unit` - `.devcontainer/turbo-lint-unit-debug` - `.devcontainer/login-integration` - `.devcontainer/login-integration-debug` - Added npm scripts to run the new dev container setups, enabling exact reproduction of GitHub PR checks locally, and updated the pipeline to use these containers. - Cleaned up Dockerfiles and docker-bake.hcl files to only build the production image for the login app. - Cleaned up compose files to focus on dev environments in dev containers. - Updated `CONTRIBUTING.md` with guidance on running and debugging PR checks locally using the new dev container approach. - Introduced separate Dockerfiles for the login app to distinguish between using published client packages and building clients from local protos. - Ensured the login container is always built in the pipeline for use in integration and acceptance tests. - Updated Makefile and GitHub Actions workflows to use `--frozen-lockfile` for installing pnpm packages, ensuring reproducible installs. - Disabled GitHub release creation by the changeset action. - Refactored the `/build` directory structure for clarity and maintainability. - Added a `clean` command to `docks/package.json`. - Experimentally added `knip` to the `zitadel-client` package for improved linting of dependencies and exports. # Additional Changes - Fixed Makefile commands for consistency and reliability. - Improved the structure and clarity of the `/build` directory to support seamless integration of the login build. - Enhanced documentation and developer experience for running and debugging CI checks locally. # Additional Context - See updated `CONTRIBUTING.md` for new local development and debugging instructions. - These changes are a prerequisite for further improvements to the CI pipeline and local development workflow. - Closes #10276
110 lines
3.1 KiB
TypeScript
110 lines
3.1 KiB
TypeScript
import { SecuritySettings } from "@zitadel/proto/zitadel/settings/v2/security_settings_pb";
|
|
|
|
import { headers } from "next/headers";
|
|
import { NextRequest, NextResponse } from "next/server";
|
|
import { DEFAULT_CSP } from "../constants/csp";
|
|
import { getServiceUrlFromHeaders } from "./lib/service-url";
|
|
export const config = {
|
|
matcher: [
|
|
"/.well-known/:path*",
|
|
"/oauth/:path*",
|
|
"/oidc/:path*",
|
|
"/idps/callback/:path*",
|
|
"/saml/:path*",
|
|
"/:path*",
|
|
],
|
|
};
|
|
|
|
async function loadSecuritySettings(
|
|
request: NextRequest,
|
|
): Promise<SecuritySettings | null> {
|
|
const securityResponse = await fetch(`${request.nextUrl.origin}/security`);
|
|
|
|
if (!securityResponse.ok) {
|
|
console.error(
|
|
"Failed to fetch security settings:",
|
|
securityResponse.statusText,
|
|
);
|
|
return null;
|
|
}
|
|
|
|
const response = await securityResponse.json();
|
|
|
|
if (!response || !response.settings) {
|
|
console.error("No security settings found in the response.");
|
|
return null;
|
|
}
|
|
|
|
return response.settings;
|
|
}
|
|
|
|
export async function middleware(request: NextRequest) {
|
|
// Add the original URL as a header to all requests
|
|
const requestHeaders = new Headers(request.headers);
|
|
|
|
// Extract "organization" search param from the URL and set it as a header if available
|
|
const organization = request.nextUrl.searchParams.get("organization");
|
|
if (organization) {
|
|
requestHeaders.set("x-zitadel-i18n-organization", organization);
|
|
}
|
|
|
|
// Only run the rest of the logic for the original matcher paths
|
|
const proxyPaths = [
|
|
"/.well-known/",
|
|
"/oauth/",
|
|
"/oidc/",
|
|
"/idps/callback/",
|
|
"/saml/",
|
|
];
|
|
|
|
const isMatched = proxyPaths.some((prefix) =>
|
|
request.nextUrl.pathname.startsWith(prefix),
|
|
);
|
|
|
|
// escape proxy if the environment is setup for multitenancy
|
|
if (
|
|
!isMatched ||
|
|
!process.env.ZITADEL_API_URL ||
|
|
!process.env.ZITADEL_SERVICE_USER_TOKEN
|
|
) {
|
|
// For all other routes, just add the header and continue
|
|
return NextResponse.next({
|
|
request: { headers: requestHeaders },
|
|
});
|
|
}
|
|
|
|
const _headers = await headers();
|
|
const { serviceUrl } = getServiceUrlFromHeaders(_headers);
|
|
|
|
const instanceHost = `${serviceUrl}`
|
|
.replace("https://", "")
|
|
.replace("http://", "");
|
|
|
|
// Add additional headers as before
|
|
requestHeaders.set("x-zitadel-public-host", `${request.nextUrl.host}`);
|
|
requestHeaders.set("x-zitadel-instance-host", instanceHost);
|
|
|
|
const responseHeaders = new Headers();
|
|
responseHeaders.set("Access-Control-Allow-Origin", "*");
|
|
responseHeaders.set("Access-Control-Allow-Headers", "*");
|
|
|
|
const securitySettings = await loadSecuritySettings(request);
|
|
|
|
if (securitySettings?.embeddedIframe?.enabled) {
|
|
responseHeaders.set(
|
|
"Content-Security-Policy",
|
|
`${DEFAULT_CSP} frame-ancestors ${securitySettings.embeddedIframe.allowedOrigins.join(" ")};`,
|
|
);
|
|
responseHeaders.delete("X-Frame-Options");
|
|
}
|
|
|
|
request.nextUrl.href = `${serviceUrl}${request.nextUrl.pathname}${request.nextUrl.search}`;
|
|
|
|
return NextResponse.rewrite(request.nextUrl, {
|
|
request: {
|
|
headers: requestHeaders,
|
|
},
|
|
headers: responseHeaders,
|
|
});
|
|
}
|