Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: fix auth status checks
Steven33dda9bf87c2
diff --git a/api/v2/auth_service.go b/api/v2/auth_service.goindex 4f9cb4410..65341f5de 100644--- a/api/v2/auth_service.go+++ b/api/v2/auth_service.go@@ -14,6 +14,9 @@ func (s *APIV2Service) GetAuthStatus(ctx context.Context, _ *apiv2pb.GetAuthStatif err != nil {return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)}+ if user == nil {+ return nil, status.Errorf(codes.Unauthenticated, "user not found")+ }return &apiv2pb.GetAuthStatusResponse{User: convertUserFromStore(user),}, nildiff --git a/web/src/pages/DailyReview.tsx b/web/src/pages/DailyReview.tsxindex 7f5d48730..009c7cc49 100644--- a/web/src/pages/DailyReview.tsx+++ b/web/src/pages/DailyReview.tsx@@ -21,7 +21,7 @@ import { useTranslate } from "@/utils/i18n";const DailyReview = () => {const t = useTranslate();const memoStore = useMemoStore();- const user = useCurrentUser();+ const currentUser = useCurrentUser();const currentDateStamp = getDateStampByDate(getNormalizedDateString()) as number;const [selectedDateStamp, setSelectedDateStamp] = useState<number>(currentDateStamp as number);const [showDatePicker, toggleShowDatePicker] = useToggle(false);@@ -31,7 +31,7 @@ const DailyReview = () => {const selectedDateStampWithOffset = selectedDateStamp;return (m.rowStatus === "NORMAL" &&- m.creatorUsername === extractUsernameFromName(user.name) &&+ m.creatorUsername === extractUsernameFromName(currentUser.name) &&displayTimestamp >= selectedDateStampWithOffset &&displayTimestamp < selectedDateStampWithOffset + DAILY_TIMESTAMP);diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsxindex 4139945fb..e06261d11 100644--- a/web/src/pages/MemoDetail.tsx+++ b/web/src/pages/MemoDetail.tsx@@ -27,10 +27,10 @@ const MemoDetail = () => {const t = useTranslate();const params = useParams();const navigateTo = useNavigateTo();+ const currentUser = useCurrentUser();const globalStore = useGlobalStore();const memoStore = useMemoStore();const userV1Store = useUserV1Store();- const currentUser = useCurrentUser();const [creator, setCreator] = useState<User>();const { systemStatus } = globalStore.state;const memoId = Number(params.memoId);@@ -101,7 +101,7 @@ const MemoDetail = () => {};const disableOption = (v: string) => {- const isAdminOrHost = currentUser.role === User_Role.ADMIN || currentUser.role === User_Role.HOST;+ const isAdminOrHost = currentUser?.role === User_Role.ADMIN || currentUser?.role === User_Role.HOST;if (v === "PUBLIC" && !isAdminOrHost) {return systemStatus.disablePublicMemos;diff --git a/web/src/router/AuthStatusProvider.tsx b/web/src/router/AuthStatusProvider.tsxnew file mode 100644index 000000000..a3c738467--- /dev/null+++ b/web/src/router/AuthStatusProvider.tsx@@ -0,0 +1,27 @@+import { useEffect } from "react";+import useCurrentUser from "@/hooks/useCurrentUser";+import useNavigateTo from "@/hooks/useNavigateTo";++interface Props {+ children: React.ReactNode;+}++const AuthStatusProvider = (props: Props) => {+ const navigateTo = useNavigateTo();+ const currentUser = useCurrentUser();++ useEffect(() => {+ if (!currentUser) {+ // If not logged in, redirect to explore page by default.+ navigateTo("/explore");+ }+ }, []);++ if (!currentUser) {+ return null;+ }++ return <>{props.children}</>;+};++export default AuthStatusProvider;diff --git a/web/src/router/index.tsx b/web/src/router/index.tsxindex 7ec5a5370..9f612639e 100644--- a/web/src/router/index.tsx+++ b/web/src/router/index.tsx@@ -2,6 +2,7 @@ import { lazy } from "react";import { createBrowserRouter } from "react-router-dom";import App from "@/App";import { initialGlobalState } from "@/store/module";+import AuthStatusProvider from "./AuthStatusProvider";const Root = lazy(() => import("@/layouts/Root"));const SignIn = lazy(() => import("@/pages/SignIn"));@@ -52,27 +53,51 @@ const router = createBrowserRouter([children: [{path: "",- element: <Home />,+ element: (+ <AuthStatusProvider>+ <Home />+ </AuthStatusProvider>+ ),},{path: "review",- element: <DailyReview />,+ element: (+ <AuthStatusProvider>+ <DailyReview />+ </AuthStatusProvider>+ ),},{path: "resources",- element: <Resources />,+ element: (+ <AuthStatusProvider>+ <Resources />+ </AuthStatusProvider>+ ),},{path: "inbox",- element: <Inboxes />,+ element: (+ <AuthStatusProvider>+ <Inboxes />+ </AuthStatusProvider>+ ),},{path: "archived",- element: <Archived />,+ element: (+ <AuthStatusProvider>+ <Archived />+ </AuthStatusProvider>+ ),},{path: "setting",- element: <Setting />,+ element: (+ <AuthStatusProvider>+ <Setting />+ </AuthStatusProvider>+ ),},{path: "explore",