TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-12 06:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix types

Browse Source
This commit is contained in:
Yordis Prieto
2024-08-27 22:50:50 -04:00
parent 855e61725f
commit 331ae84ac5
2 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/login/src/app/(login)/signedin/page.tsx
View File

@@ -1,20 +1,30 @@
import { createCallback, getBrandingSettings, getSession } from "@/lib/zitadel"; import { createCallback, getBrandingSettings, getSession } from "@/lib/zitadel";
import DynamicTheme from "@/ui/DynamicTheme"; import DynamicTheme from "@/ui/DynamicTheme";
import UserAvatar from "@/ui/UserAvatar"; import UserAvatar from "@/ui/UserAvatar";
import { createMessage } from "@zitadel/client";
import { getMostRecentCookieWithLoginname } from "@zitadel/next"; import { getMostRecentCookieWithLoginname } from "@zitadel/next";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
import {
CreateCallbackRequestSchema,
SessionSchema,
} from "@zitadel/proto/zitadel/oidc/v2/oidc_service_pb";
async function loadSession(loginName: string, authRequestId?: string) { async function loadSession(loginName: string, authRequestId?: string) {
const recent = await getMostRecentCookieWithLoginname({ loginName }); const recent = await getMostRecentCookieWithLoginname({ loginName });
if (authRequestId) { if (authRequestId) {
return createCallback({ return createCallback(
authRequestId, createMessage(CreateCallbackRequestSchema, {
callbackKind: { authRequestId,
case: "session", callbackKind: {
value: { sessionId: recent.id, sessionToken: recent.token }, case: "session",
}, value: createMessage(SessionSchema, {
}).then(({ callbackUrl }) => { sessionId: recent.id,
sessionToken: recent.token,
}),
},
}),
).then(({ callbackUrl }) => {
return redirect(callbackUrl); return redirect(callbackUrl);
}); });
} }
@@ -42,7 +52,7 @@ export default async function Page({ searchParams }: { searchParams: any }) {
displayName={sessionFactors?.factors?.user?.displayName} displayName={sessionFactors?.factors?.user?.displayName}
showDropdown showDropdown
searchParams={searchParams} searchParams={searchParams}
></UserAvatar> />
</div> </div>
</DynamicTheme> </DynamicTheme>
); );

54
apps/login/src/app/login/route.ts
View File

@@ -1,3 +1,8 @@
import {
CreateCallbackRequestSchema,
SessionSchema,
} from "@zitadel/proto/zitadel/oidc/v2/oidc_service_pb";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
export const revalidate = false; export const revalidate = false;
export const fetchCache = "default-no-store"; export const fetchCache = "default-no-store";
@@ -19,6 +24,7 @@ import {
} from "@zitadel/proto/zitadel/oidc/v2/authorization_pb"; } from "@zitadel/proto/zitadel/oidc/v2/authorization_pb";
import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb"; import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
import { idpTypeToSlug } from "@/lib/idp"; import { idpTypeToSlug } from "@/lib/idp";
import { createMessage } from "@zitadel/client";
async function loadSessions(ids: string[]): Promise<Session[]> { async function loadSessions(ids: string[]): Promise<Session[]> {
const response = await listSessions( const response = await listSessions(
@@ -98,13 +104,15 @@ export async function GET(request: NextRequest) {
// works not with _rsc request // works not with _rsc request
try { try {
const { callbackUrl } = await createCallback({ const { callbackUrl } = await createCallback(
authRequestId, createMessage(CreateCallbackRequestSchema, {
callbackKind: { authRequestId,
case: "session", callbackKind: {
value: session, case: "session",
}, value: createMessage(SessionSchema, session),
}); },
}),
);
if (callbackUrl) { if (callbackUrl) {
return NextResponse.redirect(callbackUrl); return NextResponse.redirect(callbackUrl);
} else { } else {
@@ -260,13 +268,15 @@ export async function GET(request: NextRequest) {
sessionId: cookie?.id, sessionId: cookie?.id,
sessionToken: cookie?.token, sessionToken: cookie?.token,
}; };
const { callbackUrl } = await createCallback({ const { callbackUrl } = await createCallback(
authRequestId, createMessage(CreateCallbackRequestSchema, {
callbackKind: { authRequestId,
case: "session", callbackKind: {
value: session, case: "session",
}, value: createMessage(SessionSchema, session),
}); },
}),
);
return NextResponse.redirect(callbackUrl); return NextResponse.redirect(callbackUrl);
} else { } else {
return NextResponse.json( return NextResponse.json(
@@ -295,13 +305,15 @@ export async function GET(request: NextRequest) {
sessionToken: cookie?.token, sessionToken: cookie?.token,
}; };
try { try {
const { callbackUrl } = await createCallback({ const { callbackUrl } = await createCallback(
authRequestId, createMessage(CreateCallbackRequestSchema, {
callbackKind: { authRequestId,
case: "session", callbackKind: {
value: session, case: "session",
}, value: createMessage(SessionSchema, session),
}); },
}),
);
if (callbackUrl) { if (callbackUrl) {
return NextResponse.redirect(callbackUrl); return NextResponse.redirect(callbackUrl);
} else { } else {