fix
This commit is contained in:
@@ -24,13 +24,20 @@ export default function LoginPage() {
|
||||
const t = useTranslations("LoginPage");
|
||||
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [redirectTo, setRedirectTo] = useState<string | null>(null);
|
||||
const { register, handleSubmit, formState: { errors, isSubmitting } } = useForm<FormData>();
|
||||
|
||||
useEffect(() => {
|
||||
if (!session) {
|
||||
window.location.href = "/api/auth/initiate";
|
||||
router.replace("/api/auth/initiate");
|
||||
}
|
||||
}, [session]);
|
||||
}, [session, router]);
|
||||
|
||||
useEffect(() => {
|
||||
if (redirectTo) {
|
||||
router.push(redirectTo);
|
||||
}
|
||||
}, [redirectTo, router]);
|
||||
|
||||
const onSubmit: SubmitHandler<FormData> = async (data) => {
|
||||
setError(null);
|
||||
@@ -39,16 +46,15 @@ export default function LoginPage() {
|
||||
|
||||
if (!result.success) {
|
||||
if (result.expired) {
|
||||
window.location.href = "/api/auth/initiate";
|
||||
setRedirectTo("/api/auth/initiate");
|
||||
return;
|
||||
}
|
||||
|
||||
setError(result.message ?? null);
|
||||
return;
|
||||
}
|
||||
|
||||
if (result.redirectURL) {
|
||||
window.location.href = result.redirectURL;
|
||||
setRedirectTo(result.redirectURL);
|
||||
} else {
|
||||
router.push(`/consent?session=${session}`);
|
||||
}
|
||||
@@ -113,9 +119,9 @@ export default function LoginPage() {
|
||||
</FieldGroup>
|
||||
</form>
|
||||
<FieldDescription className="px-6 text-center">
|
||||
{t.rich("noAccountNote", {
|
||||
register: (chunks) => <Link href="/register">{chunks}</Link>
|
||||
})}
|
||||
{t.rich("noAccountNote", {
|
||||
register: (chunks) => <Link href="/register">{chunks}</Link>
|
||||
})}
|
||||
</FieldDescription>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -7,31 +7,48 @@ import { Button } from "@/components/ui/button";
|
||||
import { localeMap } from "@/types";
|
||||
import { enUS } from "date-fns/locale";
|
||||
import { format } from "date-fns";
|
||||
import { revokeConsent } from "@/actions/consents";
|
||||
import { useState } from "react";
|
||||
|
||||
interface Props {
|
||||
consents: Consent[] | null;
|
||||
consents: Consent[] | [];
|
||||
setConsents: (consents: Consent[]) => void;
|
||||
}
|
||||
|
||||
export default function Applications({ consents, setConsents }: Props) {
|
||||
const t = useTranslations("MePage.items.applications");
|
||||
const [list, setList] = useState(consents);
|
||||
|
||||
const locale = useLocale();
|
||||
const dateLocale = localeMap[locale as keyof typeof localeMap] ?? enUS;
|
||||
|
||||
const handleRevoke = async (clientId: string) => {
|
||||
const result = await revokeConsent(clientId);
|
||||
if (result.success) {
|
||||
const updated = list.filter(c => c.client_id !== clientId);
|
||||
setList(updated);
|
||||
setConsents(updated);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="w-full lg:max-w-sm flex flex-col gap-4">
|
||||
<h1 className="text-xl">{t("title")}</h1>
|
||||
|
||||
<div className="space-y-4">
|
||||
{consents?.map((consent) => (
|
||||
{list.map((consent) => (
|
||||
<Item key={consent.client_id}>
|
||||
<ItemContent>
|
||||
<ItemTitle>{consent.client_name}</ItemTitle>
|
||||
<ItemDescription>{t("authorized")} {format(consent.authorized_at, "PPP", { locale: dateLocale }) }</ItemDescription>
|
||||
<ItemDescription>{t("authorized")} {format(consent.authorized_at, "PPP", { locale: dateLocale })}</ItemDescription>
|
||||
</ItemContent>
|
||||
<ItemActions>
|
||||
<Button disabled={!consent.isRevokable}>{t("revoke")}</Button>
|
||||
<Button
|
||||
disabled={!consent.isRevokable}
|
||||
onClick={() => handleRevoke(consent.client_id)}
|
||||
>
|
||||
{t("revoke")}
|
||||
</Button>
|
||||
</ItemActions>
|
||||
</Item>
|
||||
))}
|
||||
|
||||
@@ -42,7 +42,7 @@ export default function Profile({ user, setUser }: Props) {
|
||||
|
||||
if (response == null) setError(t("form.updateError"))
|
||||
else setUser(response)
|
||||
} catch (error) {
|
||||
} catch {
|
||||
setError(t("form.updateError"))
|
||||
}
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@ export default async function Me() {
|
||||
redirect("/api/auth/initiate");
|
||||
}
|
||||
|
||||
var consents = await getConsents();
|
||||
const consents = await getConsents();
|
||||
|
||||
return <MeComponent userData={user} consentsData={consents} />;
|
||||
}
|
||||
@@ -91,7 +91,7 @@ export default function RegisterPage() {
|
||||
</Field>
|
||||
|
||||
<Field>
|
||||
<Button onClick={(e) => setStep(1)} variant="default" disabled={isSubmitting}>
|
||||
<Button onClick={() => setStep(1)} variant="default" disabled={isSubmitting}>
|
||||
{t("next")}
|
||||
<ArrowRight />
|
||||
</Button>
|
||||
|
||||
Reference in New Issue
Block a user