PR Summary #1

Merged
sonderau merged 6 commits from dev into main 2025-10-10 08:49:20 +08:00
2 changed files with 26 additions and 21 deletions
Showing only changes of commit 12c9e75743 - Show all commits

View File

@@ -16,6 +16,7 @@ interface DeviceDTO {
export default async function DeviceManagementPage() {
const user = await requireAuthOrRedirect();
try {
const res = await axiosServer.get('/admin/devices', {
headers: {
Authorization: `Bearer ${user.token}`,
@@ -25,4 +26,8 @@ export default async function DeviceManagementPage() {
const devices: DeviceDTO[] = res.data;
return <DeviceTableSection initialDevices={devices} />;
} catch (error) {
console.error('Failed to fetch devices:', error);
throw new Error(`Failed to load devices: ${error instanceof Error ? error.message : 'Unknown error'}`);
}
}

View File

@@ -1,5 +1,4 @@
// src/app/admin/users/page.tsx
import { cookies } from 'next/headers';
import { requireAuthOrRedirect } from '@/lib/authServer';
import axiosServer from '@/lib/axiosServer';
import UserTableSection from '@/components/admin/UserTableSection';
@@ -19,18 +18,19 @@ interface UserDTO {
export default async function UserManagementPage() {
const user = await requireAuthOrRedirect();
const cookieStore = cookies();
// @ts-expect-error - cookies() is not actually async, type is misleading
const token = cookieStore.get('authToken')?.value;
try {
const res = await axiosServer.get('/admin/users', {
headers: {
Authorization: `Bearer ${user.token}`, // token is guaranteed to exist
Authorization: `Bearer ${user.token}`,
},
});
const users: UserDTO[] = res.data;
return <UserTableSection initialUsers={users} />;
} catch (error) {
console.error('Failed to fetch users:', error);
throw new Error(`Failed to load users: ${error instanceof Error ? error.message : 'Unknown error'}`);
}
}