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

single-object

Browse Source
This commit is contained in:
peintnermax
2024-08-08 09:28:59 +02:00
parent cacd4e76a2
commit 113e19a957
15 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/login/src/app/(login)/mfa/page.tsx
View File

@@ -48,7 +48,7 @@ export default async function Page({
} }
async function loadSessionById(sessionId: string, organization?: string) { async function loadSessionById(sessionId: string, organization?: string) {
const recent = await getSessionCookieById(sessionId, organization); const recent = await getSessionCookieById({ sessionId, organization });
return getSession(recent.id, recent.token).then((response) => { return getSession(recent.id, recent.token).then((response) => {
if (response?.session && response.session.factors?.user?.id) { if (response?.session && response.session.factors?.user?.id) {
return listAuthenticationMethodTypes( return listAuthenticationMethodTypes(

6
apps/login/src/app/(login)/mfa/set/page.tsx
View File

@@ -31,10 +31,10 @@ export default async function Page({
loginName?: string, loginName?: string,
organization?: string, organization?: string,
) { ) {
const recent = await getMostRecentCookieWithLoginname( const recent = await getMostRecentCookieWithLoginname({
loginName, loginName,
organization, organization,
); });
return getSession(recent.id, recent.token).then((response) => { return getSession(recent.id, recent.token).then((response) => {
if (response?.session && response.session.factors?.user?.id) { if (response?.session && response.session.factors?.user?.id) {
const userId = response.session.factors.user.id; const userId = response.session.factors.user.id;
@@ -58,7 +58,7 @@ export default async function Page({
} }
async function loadSessionById(sessionId: string, organization?: string) { async function loadSessionById(sessionId: string, organization?: string) {
const recent = await getSessionCookieById(sessionId, organization); const recent = await getSessionCookieById({ sessionId, organization });
return getSession(recent.id, recent.token).then((response) => { return getSession(recent.id, recent.token).then((response) => {
if (response?.session && response.session.factors?.user?.id) { if (response?.session && response.session.factors?.user?.id) {
const userId = response.session.factors.user.id; const userId = response.session.factors.user.id;

1
apps/login/src/app/(login)/passkey/add/page.tsx
View File

@@ -3,7 +3,6 @@ import Alert, { AlertType } from "@/ui/Alert";
import DynamicTheme from "@/ui/DynamicTheme"; import DynamicTheme from "@/ui/DynamicTheme";
import RegisterPasskey from "@/ui/RegisterPasskey"; import RegisterPasskey from "@/ui/RegisterPasskey";
import UserAvatar from "@/ui/UserAvatar"; import UserAvatar from "@/ui/UserAvatar";
import { getMostRecentCookieWithLoginname } from "@zitadel/next";
import { loadMostRecentSession } from "@zitadel/next"; import { loadMostRecentSession } from "@zitadel/next";
export default async function Page({ export default async function Page({

6
apps/login/src/app/(login)/passkey/login/page.tsx
View File

@@ -28,10 +28,10 @@ export default async function Page({
loginName?: string, loginName?: string,
organization?: string, organization?: string,
) { ) {
const recent = await getMostRecentCookieWithLoginname( const recent = await getMostRecentCookieWithLoginname({
loginName, loginName,
organization, organization,
); });
return getSession(recent.id, recent.token).then((response) => { return getSession(recent.id, recent.token).then((response) => {
if (response?.session) { if (response?.session) {
return response.session; return response.session;
@@ -40,7 +40,7 @@ export default async function Page({
} }
async function loadSessionById(sessionId: string, organization?: string) { async function loadSessionById(sessionId: string, organization?: string) {
const recent = await getSessionCookieById(sessionId, organization); const recent = await getSessionCookieById({ sessionId, organization });
return getSession(recent.id, recent.token).then((response) => { return getSession(recent.id, recent.token).then((response) => {
if (response?.session) { if (response?.session) {
return response.session; return response.session;

1
apps/login/src/app/(login)/password/page.tsx
View File

@@ -7,7 +7,6 @@ import Alert from "@/ui/Alert";
import DynamicTheme from "@/ui/DynamicTheme"; import DynamicTheme from "@/ui/DynamicTheme";
import PasswordForm from "@/ui/PasswordForm"; import PasswordForm from "@/ui/PasswordForm";
import UserAvatar from "@/ui/UserAvatar"; import UserAvatar from "@/ui/UserAvatar";
import { getMostRecentCookieWithLoginname } from "@zitadel/next";
import { loadMostRecentSession } from "@zitadel/next"; import { loadMostRecentSession } from "@zitadel/next";
export default async function Page({ export default async function Page({

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

@@ -5,7 +5,7 @@ import { getMostRecentCookieWithLoginname } from "@zitadel/next";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
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({

6
apps/login/src/app/(login)/u2f/page.tsx
View File

@@ -31,10 +31,10 @@ export default async function Page({
loginName?: string, loginName?: string,
organization?: string, organization?: string,
) { ) {
const recent = await getMostRecentCookieWithLoginname( const recent = await getMostRecentCookieWithLoginname({
loginName, loginName,
organization, organization,
); });
return getSession(recent.id, recent.token).then((response) => { return getSession(recent.id, recent.token).then((response) => {
if (response?.session) { if (response?.session) {
return response.session; return response.session;
@@ -43,7 +43,7 @@ export default async function Page({
} }
async function loadSessionById(sessionId: string, organization?: string) { async function loadSessionById(sessionId: string, organization?: string) {
const recent = await getSessionCookieById(sessionId, organization); const recent = await getSessionCookieById({ sessionId, organization });
return getSession(recent.id, recent.token).then((response) => { return getSession(recent.id, recent.token).then((response) => {
if (response?.session) { if (response?.session) {
return response.session; return response.session;

2
apps/login/src/app/api/otp/set/route.ts
View File

@@ -16,7 +16,7 @@ export async function POST(request: NextRequest) {
body; body;
const recentPromise = sessionId const recentPromise = sessionId
? getSessionCookieById(sessionId).catch((error) => { ? getSessionCookieById({ sessionId }).catch((error) => {
return Promise.reject(error); return Promise.reject(error);
}) })
: loginName : loginName

2
apps/login/src/app/api/passkeys/route.ts
View File

@@ -11,7 +11,7 @@ export async function POST(request: NextRequest) {
if (body) { if (body) {
const { sessionId } = body; const { sessionId } = body;
const sessionCookie = await getSessionCookieById(sessionId); const sessionCookie = await getSessionCookieById({ sessionId });
const session = await getSession(sessionCookie.id, sessionCookie.token); const session = await getSession(sessionCookie.id, sessionCookie.token);

2
apps/login/src/app/api/passkeys/verify/route.ts
View File

@@ -13,7 +13,7 @@ export async function POST(request: NextRequest) {
device.vendor || device.model ? ", " : "" device.vendor || device.model ? ", " : ""
}${os.name}${os.name ? ", " : ""}${browser.name}`; }${os.name}${os.name ? ", " : ""}${browser.name}`;
} }
const sessionCookie = await getSessionCookieById(sessionId); const sessionCookie = await getSessionCookieById({ sessionId });
const session = await getSession(sessionCookie.id, sessionCookie.token); const session = await getSession(sessionCookie.id, sessionCookie.token);

6
apps/login/src/app/api/session/route.ts
View File

@@ -165,9 +165,9 @@ export async function PUT(request: NextRequest) {
*/ */
export async function DELETE(request: NextRequest) { export async function DELETE(request: NextRequest) {
const { searchParams } = new URL(request.url); const { searchParams } = new URL(request.url);
const id = searchParams.get("id"); const sessionId = searchParams.get("id");
if (id) { if (sessionId) {
const session = await getSessionCookieById(id); const session = await getSessionCookieById({ sessionId });
return deleteSession(session.id, session.token) return deleteSession(session.id, session.token)
.then(() => { .then(() => {

2
apps/login/src/app/api/u2f/route.ts
View File

@@ -12,7 +12,7 @@ export async function POST(request: NextRequest) {
if (body) { if (body) {
const { sessionId } = body; const { sessionId } = body;
const sessionCookie = await getSessionCookieById(sessionId); const sessionCookie = await getSessionCookieById({ sessionId });
const session = await getSession(sessionCookie.id, sessionCookie.token); const session = await getSession(sessionCookie.id, sessionCookie.token);

2
apps/login/src/app/api/u2f/verify/route.ts
View File

@@ -15,7 +15,7 @@ export async function POST(request: NextRequest) {
device.vendor || device.model ? ", " : "" device.vendor || device.model ? ", " : ""
}${os.name}${os.name ? ", " : ""}${browser.name}`; }${os.name}${os.name ? ", " : ""}${browser.name}`;
} }
const sessionCookie = await getSessionCookieById(sessionId); const sessionCookie = await getSessionCookieById({ sessionId });
const session = await getSession(sessionCookie.id, sessionCookie.token); const session = await getSession(sessionCookie.id, sessionCookie.token);

2
apps/login/src/lib/server-actions.ts
View File

@@ -8,7 +8,7 @@ export async function verifyTOTP(
loginName?: string, loginName?: string,
organization?: string, organization?: string,
) { ) {
return getMostRecentCookieWithLoginname(loginName, organization) return getMostRecentCookieWithLoginname({ loginName, organization })
.then((recent) => { .then((recent) => {
return getSession(recent.id, recent.token).then((response) => { return getSession(recent.id, recent.token).then((response) => {
return { session: response?.session, token: recent.token }; return { session: response?.session, token: recent.token };

8
packages/zitadel-next/src/utils/cookies.ts
View File

@@ -111,10 +111,10 @@ export async function getMostRecentSessionCookie<T>(): Promise<any> {
} }
export async function getSessionCookieById<T>({ export async function getSessionCookieById<T>({
id, sessionId,
organization, organization,
}: { }: {
id: string; sessionId: string;
organization?: string; organization?: string;
}): Promise<SessionCookie<T>> { }): Promise<SessionCookie<T>> {
const cookiesList = cookies(); const cookiesList = cookies();
@@ -123,7 +123,9 @@ export async function getSessionCookieById<T>({
if (stringifiedCookie?.value) { if (stringifiedCookie?.value) {
const sessions: SessionCookie<T>[] = JSON.parse(stringifiedCookie?.value); const sessions: SessionCookie<T>[] = JSON.parse(stringifiedCookie?.value);
const found = sessions.find((s) => (organization ? s.organization === organization && s.id === id : s.id === id)); const found = sessions.find((s) =>
organization ? s.organization === organization && s.id === sessionId : s.id === sessionId,
);
if (found) { if (found) {
return found; return found;
} else { } else {