ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: no throw exception when request users:check

Browse Source
This commit is contained in:
chenos 2022-04-12 22:45:56 +08:00
parent d7856e76ab
commit 2af045979f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/user/CurrentUserProvider.tsx
View File

@ -16,7 +16,7 @@ export const CurrentUserProvider = (props) => {
if (result.loading) { if (result.loading) {
return <Spin />; return <Spin />;
} }
if (result.error) { if (!result?.data?.data?.id) {
return <Redirect to={'/signin'} />; return <Redirect to={'/signin'} />;
} }
return <CurrentUserContext.Provider value={result}>{props.children}</CurrentUserContext.Provider>; return <CurrentUserContext.Provider value={result}>{props.children}</CurrentUserContext.Provider>;

4
packages/plugin-users/src/actions/users.ts
View File

@ -6,10 +6,10 @@ export async function check(ctx: Context, next: Next) {
if (ctx.state.currentUser) { if (ctx.state.currentUser) {
const user = ctx.state.currentUser.toJSON(); const user = ctx.state.currentUser.toJSON();
ctx.body = user; ctx.body = user;
await next();
} else { } else {
ctx.throw(401, 'Unauthorized'); ctx.body = {};
} }
await next();
} }
export async function signin(ctx: Context, next: Next) { export async function signin(ctx: Context, next: Next) {