feat: per-admin localStorage namespacing with migration
Made-with: Cursor
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
import React, { createContext, useState, useContext, useEffect } from 'react';
|
import React, { createContext, useState, useContext, useEffect } from 'react';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
import { migratePreferences } from '../utils/adminPrefs';
|
||||||
|
|
||||||
const AuthContext = createContext();
|
const AuthContext = createContext();
|
||||||
|
|
||||||
@@ -13,6 +14,7 @@ export const useAuth = () => {
|
|||||||
|
|
||||||
export const AuthProvider = ({ children }) => {
|
export const AuthProvider = ({ children }) => {
|
||||||
const [token, setToken] = useState(localStorage.getItem('adminToken'));
|
const [token, setToken] = useState(localStorage.getItem('adminToken'));
|
||||||
|
const [adminName, setAdminName] = useState(localStorage.getItem('adminName'));
|
||||||
const [isAuthenticated, setIsAuthenticated] = useState(false);
|
const [isAuthenticated, setIsAuthenticated] = useState(false);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
@@ -20,10 +22,17 @@ export const AuthProvider = ({ children }) => {
|
|||||||
const verifyToken = async () => {
|
const verifyToken = async () => {
|
||||||
if (token) {
|
if (token) {
|
||||||
try {
|
try {
|
||||||
await axios.post('/api/auth/verify', {}, {
|
const response = await axios.post('/api/auth/verify', {}, {
|
||||||
headers: { Authorization: `Bearer ${token}` }
|
headers: { Authorization: `Bearer ${token}` }
|
||||||
});
|
});
|
||||||
setIsAuthenticated(true);
|
setIsAuthenticated(true);
|
||||||
|
const name = response.data.user?.name;
|
||||||
|
if (name) {
|
||||||
|
setAdminName(name);
|
||||||
|
localStorage.setItem('adminName', name);
|
||||||
|
} else {
|
||||||
|
logout();
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Token verification failed:', error);
|
console.error('Token verification failed:', error);
|
||||||
logout();
|
logout();
|
||||||
@@ -38,27 +47,33 @@ export const AuthProvider = ({ children }) => {
|
|||||||
const login = async (key) => {
|
const login = async (key) => {
|
||||||
try {
|
try {
|
||||||
const response = await axios.post('/api/auth/login', { key });
|
const response = await axios.post('/api/auth/login', { key });
|
||||||
const newToken = response.data.token;
|
const { token: newToken, name } = response.data;
|
||||||
localStorage.setItem('adminToken', newToken);
|
localStorage.setItem('adminToken', newToken);
|
||||||
|
localStorage.setItem('adminName', name);
|
||||||
setToken(newToken);
|
setToken(newToken);
|
||||||
|
setAdminName(name);
|
||||||
setIsAuthenticated(true);
|
setIsAuthenticated(true);
|
||||||
|
migratePreferences(name);
|
||||||
return { success: true };
|
return { success: true };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
error: error.response?.data?.error || 'Login failed'
|
error: error.response?.data?.error || 'Login failed'
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const logout = () => {
|
const logout = () => {
|
||||||
localStorage.removeItem('adminToken');
|
localStorage.removeItem('adminToken');
|
||||||
|
localStorage.removeItem('adminName');
|
||||||
setToken(null);
|
setToken(null);
|
||||||
|
setAdminName(null);
|
||||||
setIsAuthenticated(false);
|
setIsAuthenticated(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
const value = {
|
const value = {
|
||||||
token,
|
token,
|
||||||
|
adminName,
|
||||||
isAuthenticated,
|
isAuthenticated,
|
||||||
loading,
|
loading,
|
||||||
login,
|
login,
|
||||||
@@ -67,4 +82,3 @@ export const AuthProvider = ({ children }) => {
|
|||||||
|
|
||||||
return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
|
return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,10 @@ import { useAuth } from '../context/AuthContext';
|
|||||||
import { useToast } from '../components/Toast';
|
import { useToast } from '../components/Toast';
|
||||||
import api from '../api/axios';
|
import api from '../api/axios';
|
||||||
import { formatLocalDate, isSunday } from '../utils/dateUtils';
|
import { formatLocalDate, isSunday } from '../utils/dateUtils';
|
||||||
|
import { prefixKey } from '../utils/adminPrefs';
|
||||||
|
|
||||||
function History() {
|
function History() {
|
||||||
const { isAuthenticated } = useAuth();
|
const { isAuthenticated, adminName } = useAuth();
|
||||||
const { error, success } = useToast();
|
const { error, success } = useToast();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
@@ -15,8 +16,8 @@ function History() {
|
|||||||
const [totalCount, setTotalCount] = useState(0);
|
const [totalCount, setTotalCount] = useState(0);
|
||||||
const [closingSession, setClosingSession] = useState(null);
|
const [closingSession, setClosingSession] = useState(null);
|
||||||
|
|
||||||
const [filter, setFilter] = useState(() => localStorage.getItem('history-filter') || 'default');
|
const [filter, setFilter] = useState(() => localStorage.getItem(prefixKey(adminName, 'history-filter')) || 'default');
|
||||||
const [limit, setLimit] = useState(() => localStorage.getItem('history-show-limit') || '5');
|
const [limit, setLimit] = useState(() => localStorage.getItem(prefixKey(adminName, 'history-show-limit')) || '5');
|
||||||
|
|
||||||
const [selectMode, setSelectMode] = useState(false);
|
const [selectMode, setSelectMode] = useState(false);
|
||||||
const [selectedIds, setSelectedIds] = useState(new Set());
|
const [selectedIds, setSelectedIds] = useState(new Set());
|
||||||
@@ -50,15 +51,24 @@ function History() {
|
|||||||
return () => clearInterval(interval);
|
return () => clearInterval(interval);
|
||||||
}, [loadSessions]);
|
}, [loadSessions]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (adminName) {
|
||||||
|
const savedFilter = localStorage.getItem(prefixKey(adminName, 'history-filter'));
|
||||||
|
const savedLimit = localStorage.getItem(prefixKey(adminName, 'history-show-limit'));
|
||||||
|
if (savedFilter) setFilter(savedFilter);
|
||||||
|
if (savedLimit) setLimit(savedLimit);
|
||||||
|
}
|
||||||
|
}, [adminName]);
|
||||||
|
|
||||||
const handleFilterChange = (newFilter) => {
|
const handleFilterChange = (newFilter) => {
|
||||||
setFilter(newFilter);
|
setFilter(newFilter);
|
||||||
localStorage.setItem('history-filter', newFilter);
|
localStorage.setItem(prefixKey(adminName, 'history-filter'), newFilter);
|
||||||
setSelectedIds(new Set());
|
setSelectedIds(new Set());
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleLimitChange = (newLimit) => {
|
const handleLimitChange = (newLimit) => {
|
||||||
setLimit(newLimit);
|
setLimit(newLimit);
|
||||||
localStorage.setItem('history-show-limit', newLimit);
|
localStorage.setItem(prefixKey(adminName, 'history-show-limit'), newLimit);
|
||||||
setSelectedIds(new Set());
|
setSelectedIds(new Set());
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
19
frontend/src/utils/adminPrefs.js
Normal file
19
frontend/src/utils/adminPrefs.js
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
const PREF_KEYS = ['history-filter', 'history-show-limit'];
|
||||||
|
|
||||||
|
export function prefixKey(adminName, key) {
|
||||||
|
if (!adminName) return key;
|
||||||
|
return `${adminName}:${key}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function migratePreferences(adminName) {
|
||||||
|
if (!adminName) return;
|
||||||
|
|
||||||
|
for (const key of PREF_KEYS) {
|
||||||
|
const oldValue = localStorage.getItem(key);
|
||||||
|
const newKey = prefixKey(adminName, key);
|
||||||
|
if (oldValue !== null && localStorage.getItem(newKey) === null) {
|
||||||
|
localStorage.setItem(newKey, oldValue);
|
||||||
|
localStorage.removeItem(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user