mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-09 07:35:13 +00:00
Merge commit from fork
* add mfa check to session validity check * change session check to check for already set up mfa methods * lint * improve naming * test changes * cleanup continueWithSession fcn
This commit is contained in:
@@ -8,7 +8,7 @@ import { useLocale } from "next-intl";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
import { Avatar } from "./avatar";
|
||||
import { isSessionValid } from "./session-item";
|
||||
import { isSessionPrimaryFactorAndLifetimeValid } from "./session-item";
|
||||
import { Translated } from "./translated";
|
||||
|
||||
export function SessionClearItem({ session, reload }: { session: Session; reload: () => void }) {
|
||||
@@ -33,7 +33,7 @@ export function SessionClearItem({ session, reload }: { session: Session; reload
|
||||
return response;
|
||||
}
|
||||
|
||||
const { valid, verifiedAt } = isSessionValid(session);
|
||||
const { valid, verifiedAt } = isSessionPrimaryFactorAndLifetimeValid(session);
|
||||
|
||||
const [_error, setError] = useState<string | null>(null);
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import { AutoSubmitForm } from "./auto-submit-form";
|
||||
import { Avatar } from "./avatar";
|
||||
import { Translated } from "./translated";
|
||||
|
||||
export function isSessionValid(session: Partial<Session>): {
|
||||
export function isSessionPrimaryFactorAndLifetimeValid(session: Partial<Session>): {
|
||||
valid: boolean;
|
||||
verifiedAt?: Timestamp;
|
||||
} {
|
||||
@@ -53,7 +53,7 @@ export function SessionItem({ session, reload, requestId }: { session: Session;
|
||||
return response;
|
||||
}
|
||||
|
||||
const { valid, verifiedAt } = isSessionValid(session);
|
||||
const { valid, verifiedAt } = isSessionPrimaryFactorAndLifetimeValid(session);
|
||||
const [samlData, setSamlData] = useState<{ url: string; fields: Record<string, string> } | null>(null);
|
||||
|
||||
const [_error, setError] = useState<string | null>(null);
|
||||
|
||||
Reference in New Issue
Block a user