Fix homepage auth

This commit is contained in:
LukeGus
2025-09-25 00:09:17 -05:00
parent 1f0c741ced
commit 700aa9e07d
3 changed files with 6 additions and 3 deletions

View File

@@ -1,6 +1,7 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { HomepageAuth } from "@/ui/Desktop/Homepage/HomepageAuth.tsx"; import { HomepageAuth } from "@/ui/Desktop/Homepage/HomepageAuth.tsx";
import { HomepageUpdateLog } from "@/ui/Desktop/Homepage/HompageUpdateLog.tsx"; import { HomepageUpdateLog } from "@/ui/Desktop/Homepage/HompageUpdateLog.tsx";
import { HomepageAlertManager } from "@/ui/Desktop/Homepage/HomepageAlertManager.tsx";
import { Button } from "@/components/ui/button.tsx"; import { Button } from "@/components/ui/button.tsx";
import { getUserInfo, getDatabaseHealth, getCookie } from "@/ui/main-axios.ts"; import { getUserInfo, getDatabaseHealth, getCookie } from "@/ui/main-axios.ts";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
@@ -45,10 +46,11 @@ export function Homepage({
.then(([meRes]) => { .then(([meRes]) => {
setIsAdmin(!!meRes.is_admin); setIsAdmin(!!meRes.is_admin);
setUsername(meRes.username || null); setUsername(meRes.username || null);
setUserId(meRes.id || null); setUserId(meRes.userId || null);
setDbError(null); setDbError(null);
}) })
.catch((err) => { .catch((err) => {
console.error("Homepage: Error fetching user info:", err);
setIsAdmin(false); setIsAdmin(false);
setUsername(null); setUsername(null);
setUserId(null); setUserId(null);
@@ -150,6 +152,8 @@ export function Homepage({
</div> </div>
</div> </div>
)} )}
<HomepageAlertManager userId={userId} loggedIn={loggedIn} />
</> </>
); );
} }

View File

@@ -34,7 +34,6 @@ export function HomepageAlertManager({
try { try {
const response = await getUserAlerts(userId); const response = await getUserAlerts(userId);
const userAlerts = response.alerts || []; const userAlerts = response.alerts || [];
const sortedAlerts = userAlerts.sort((a: TermixAlert, b: TermixAlert) => { const sortedAlerts = userAlerts.sort((a: TermixAlert, b: TermixAlert) => {

View File

@@ -66,7 +66,7 @@ interface AuthResponse {
interface UserInfo { interface UserInfo {
totp_enabled: boolean; totp_enabled: boolean;
id: string; userId: string;
username: string; username: string;
is_admin: boolean; is_admin: boolean;
is_oidc: boolean; is_oidc: boolean;