Skip to content

Commit 39637fb

Browse files
authored
🐛 fix: login button not show on user panel (lobehub#2496)
* 🐛 fix: show login button when enable nextauth * 🐛 fix: wrong navigate after logout
1 parent 1484a04 commit 39637fb

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/features/User/UserPanel/PanelContent.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { Flexbox } from 'react-layout-kit';
44

55
import BrandWatermark from '@/components/BrandWatermark';
66
import Menu from '@/components/Menu';
7-
import { enableAuth } from '@/const/auth';
87
import { useUserStore } from '@/store/user';
98
import { authSelectors } from '@/store/user/selectors';
109

@@ -18,10 +17,12 @@ import { useMenu } from './useMenu';
1817
const PanelContent = memo<{ closePopover: () => void }>(({ closePopover }) => {
1918
const router = useRouter();
2019
const isLoginWithAuth = useUserStore(authSelectors.isLoginWithAuth);
21-
const [openSignIn, signOut, openUserProfile] = useUserStore((s) => [
20+
const [openSignIn, signOut, openUserProfile, enableAuth, enabledNextAuth] = useUserStore((s) => [
2221
s.openLogin,
2322
s.logout,
2423
s.openUserProfile,
24+
s.enableAuth(),
25+
s.enabledNextAuth(),
2526
]);
2627
const { mainItems, logoutItems } = useMenu();
2728

@@ -39,6 +40,8 @@ const PanelContent = memo<{ closePopover: () => void }>(({ closePopover }) => {
3940
const handleSignOut = () => {
4041
signOut();
4142
closePopover();
43+
// NextAuth doesn't need to redirect to login page
44+
if (enabledNextAuth) return;
4245
router.push('/login');
4346
};
4447

src/features/User/__tests__/PanelContent.test.tsx

+3-6
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,9 @@ vi.mock('../DataStatistics', () => ({
6464
// 定义一个变量来存储 enableAuth 的值
6565
let enableAuth = true;
6666

67-
// 模拟 @/const/auth 模块
68-
vi.mock('@/const/auth', () => ({
69-
get enableAuth() {
70-
return enableAuth;
71-
},
72-
}));
67+
beforeEach(() => {
68+
useUserStore.setState({ enableAuth: () => true });
69+
});
7370

7471
afterEach(() => {
7572
enableAuth = true;

0 commit comments

Comments
 (0)