mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-14 03:27:34 +00:00
Merge branch 'main' into dependabot/npm_and_yarn/axios-1.8.2
This commit is contained in:
3
.github/workflows/docker.yml
vendored
3
.github/workflows/docker.yml
vendored
@@ -57,6 +57,9 @@ jobs:
|
|||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install
|
run: pnpm install
|
||||||
|
|
||||||
|
- name: Generate stubs
|
||||||
|
run: pnpm generate
|
||||||
|
|
||||||
- name: Build for Docker
|
- name: Build for Docker
|
||||||
run: NEXT_PUBLIC_BASE_PATH=/ui/v2/login pnpm build:docker
|
run: NEXT_PUBLIC_BASE_PATH=/ui/v2/login pnpm build:docker
|
||||||
|
|
||||||
|
@@ -81,9 +81,12 @@ export async function GET(request: NextRequest) {
|
|||||||
|
|
||||||
// internal request id which combines authRequest and samlRequest with the prefix oidc_ or saml_
|
// internal request id which combines authRequest and samlRequest with the prefix oidc_ or saml_
|
||||||
let requestId =
|
let requestId =
|
||||||
searchParams.get("requestId") ||
|
searchParams.get("requestId") ??
|
||||||
`oidc_${oidcRequestId}` ||
|
(oidcRequestId
|
||||||
`saml_${samlRequestId}`;
|
? `oidc_${oidcRequestId}`
|
||||||
|
: samlRequestId
|
||||||
|
? `saml_${samlRequestId}`
|
||||||
|
: undefined);
|
||||||
|
|
||||||
const sessionId = searchParams.get("sessionId");
|
const sessionId = searchParams.get("sessionId");
|
||||||
|
|
||||||
@@ -470,9 +473,10 @@ export async function GET(request: NextRequest) {
|
|||||||
if (url && binding.case === "redirect") {
|
if (url && binding.case === "redirect") {
|
||||||
return NextResponse.redirect(url);
|
return NextResponse.redirect(url);
|
||||||
} else if (url && binding.case === "post") {
|
} else if (url && binding.case === "post") {
|
||||||
|
// Create form data after SAML standard
|
||||||
const formData = {
|
const formData = {
|
||||||
key1: "value1",
|
RelayState: binding.value.relayState,
|
||||||
key2: "value2",
|
SAMLResponse: binding.value.samlResponse,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Convert form data to URL-encoded string
|
// Convert form data to URL-encoded string
|
||||||
|
Reference in New Issue
Block a user