File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ export default async function Page(props: {
8080
8181 < div className = "flex flex-col w-full space-y-2" >
8282 < SessionsList sessions = { sessions } requestId = { requestId } />
83- < Link href = { `/loginname ?` + params } >
83+ < Link href = { `/login ?` + params } >
8484 < div className = "flex flex-row items-center py-3 px-4 hover:bg-black/10 dark:hover:bg-white/10 rounded-md transition-all" >
8585 < div className = "w-8 h-8 mr-4 flex flex-row justify-center items-center rounded-full bg-black/5 dark:bg-white/5" >
8686 < UserPlusIcon className = "h-5 w-5" />
Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ export default async function Page(props: {
9191 deviceAuthorizationRequestId = { deviceAuthorizationRequest ?. id }
9292 scope = { deviceAuthorizationRequest . scope }
9393 appName = { deviceAuthorizationRequest ?. appName }
94- nextUrl = { `/loginname ?` + params }
94+ nextUrl = { `/login ?` + params }
9595 />
9696 </ div >
9797 </ DynamicTheme >
Original file line number Diff line number Diff line change @@ -41,6 +41,8 @@ export default async function Page(props: {
4141 organization : organization ?? defaultOrganization ,
4242 } ) ;
4343
44+ console . log ( { loginSettings } ) ;
45+
4446 const contextLoginSettings = await getLoginSettings ( {
4547 serviceUrl,
4648 organization,
Original file line number Diff line number Diff line change @@ -114,7 +114,7 @@ export default async function Page(props: {
114114 if ( requestId ) {
115115 paramsToContinue . append ( "authRequest" , requestId ) ;
116116 }
117- urlToContinue = `/login?` + paramsToContinue ;
117+ urlToContinue = `/api/ login?` + paramsToContinue ;
118118 } else if ( loginName ) {
119119 if ( requestId ) {
120120 paramsToContinue . append ( "requestId" , requestId ) ;
Original file line number Diff line number Diff line change @@ -3,6 +3,6 @@ import { redirect } from "next/navigation";
33export default function Page ( ) {
44 // automatically redirect to loginname
55 if ( process . env . DEBUG !== "true" ) {
6- redirect ( "/loginname " ) ;
6+ redirect ( "/login " ) ;
77 }
88}
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb";
2727import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb" ;
2828import { headers } from "next/headers" ;
2929import { NextRequest , NextResponse } from "next/server" ;
30- import { DEFAULT_CSP } from "../../../constants/csp" ;
30+ import { DEFAULT_CSP } from "../../../../ constants/csp" ;
3131
3232export const dynamic = "force-dynamic" ;
3333export const revalidate = false ;
@@ -296,7 +296,7 @@ export async function GET(request: NextRequest) {
296296 }
297297 }
298298
299- const loginNameUrl = constructUrl ( request , "/loginname " ) ;
299+ const loginNameUrl = constructUrl ( request , "/login " ) ;
300300 if ( authRequest . id ) {
301301 loginNameUrl . searchParams . set ( "requestId" , `oidc_${ authRequest . id } ` ) ;
302302 }
@@ -446,7 +446,7 @@ export async function GET(request: NextRequest) {
446446 }
447447 }
448448 } else {
449- const loginNameUrl = constructUrl ( request , "/loginname " ) ;
449+ const loginNameUrl = constructUrl ( request , "/login " ) ;
450450
451451 loginNameUrl . searchParams . set ( "requestId" , requestId ) ;
452452 if ( authRequest ?. loginHint ) {
File renamed without changes.
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ export async function getNextUrl(
6969 params . append ( "organization" , command . organization ) ;
7070 }
7171
72- return `/login?` + params ;
72+ return `/api/ login?` + params ;
7373 }
7474
7575 if ( defaultRedirectUri ) {
Original file line number Diff line number Diff line change @@ -18,7 +18,9 @@ export const config = {
1818async function loadSecuritySettings (
1919 request : NextRequest ,
2020) : Promise < SecuritySettings | null > {
21- const securityResponse = await fetch ( `${ request . nextUrl . origin } /security` ) ;
21+ const securityResponse = await fetch (
22+ `${ request . nextUrl . origin } /api/security` ,
23+ ) ;
2224
2325 if ( ! securityResponse . ok ) {
2426 console . error (
You can’t perform that action at this time.
0 commit comments