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: update memo detail access handler
Steven63468dbaf3a7
diff --git a/server/acl.go b/server/acl.goindex b0d4a6ad2..b826562e1 100644--- a/server/acl.go+++ b/server/acl.go@@ -104,7 +104,7 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {}}- if common.HasPrefixes(path, "/api/memo/all") && c.Request().Method == http.MethodGet {+ if common.HasPrefixes(path, "/api/memo/all", "/api/memo/:memoId") && c.Request().Method == http.MethodGet {return next(c)}diff --git a/server/memo.go b/server/memo.goindex 0f136eaa5..d8d6846d2 100644--- a/server/memo.go+++ b/server/memo.go@@ -203,33 +203,17 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {return nil})- g.POST("/memo/:memoId/organizer", func(c echo.Context) error {+ g.GET("/memo/:memoId", func(c echo.Context) error {ctx := c.Request().Context()memoID, err := strconv.Atoi(c.Param("memoId"))if err != nil {return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("memoId"))).SetInternal(err)}- userID, ok := c.Get(getUserIDContextKey()).(int)- if !ok {- return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")- }- memoOrganizerUpsert := &api.MemoOrganizerUpsert{- MemoID: memoID,- UserID: userID,- }- if err := json.NewDecoder(c.Request().Body).Decode(memoOrganizerUpsert); err != nil {- return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post memo organizer request").SetInternal(err)- }-- err = s.Store.UpsertMemoOrganizer(ctx, memoOrganizerUpsert)- if err != nil {- return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert memo organizer").SetInternal(err)- }-- memo, err := s.Store.FindMemo(ctx, &api.MemoFind{+ memoFind := &api.MemoFind{ID: &memoID,- })+ }+ memo, err := s.Store.FindMemo(ctx, memoFind)if err != nil {if common.ErrorCode(err) == common.NotFound {return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Memo ID not found: %d", memoID)).SetInternal(err)@@ -238,6 +222,15 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find memo by ID: %v", memoID)).SetInternal(err)}+ if memo.Visibility == api.Privite {+ return echo.NewHTTPError(http.StatusForbidden, "this memo is private only")+ } else if memo.Visibility == api.Protected {+ _, ok := c.Get(getUserIDContextKey()).(int)+ if !ok {+ return echo.NewHTTPError(http.StatusForbidden, "this memo is protected, missing user in session")+ }+ }+c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode memo response").SetInternal(err)@@ -245,17 +238,33 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {return nil})- g.GET("/memo/:memoId", func(c echo.Context) error {+ g.POST("/memo/:memoId/organizer", func(c echo.Context) error {ctx := c.Request().Context()memoID, err := strconv.Atoi(c.Param("memoId"))if err != nil {return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("memoId"))).SetInternal(err)}- memoFind := &api.MemoFind{- ID: &memoID,+ userID, ok := c.Get(getUserIDContextKey()).(int)+ if !ok {+ return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")}- memo, err := s.Store.FindMemo(ctx, memoFind)+ memoOrganizerUpsert := &api.MemoOrganizerUpsert{+ MemoID: memoID,+ UserID: userID,+ }+ if err := json.NewDecoder(c.Request().Body).Decode(memoOrganizerUpsert); err != nil {+ return echo.NewHTTPError(http.StatusBadRequest, "Malformatted post memo organizer request").SetInternal(err)+ }++ err = s.Store.UpsertMemoOrganizer(ctx, memoOrganizerUpsert)+ if err != nil {+ return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert memo organizer").SetInternal(err)+ }++ memo, err := s.Store.FindMemo(ctx, &api.MemoFind{+ ID: &memoID,+ })if err != nil {if common.ErrorCode(err) == common.NotFound {return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Memo ID not found: %d", memoID)).SetInternal(err)diff --git a/web/src/components/MemoCardDialog.tsx b/web/src/components/MemoCardDialog.tsxindex 2dde33c73..36c97bf72 100644--- a/web/src/components/MemoCardDialog.tsx+++ b/web/src/components/MemoCardDialog.tsx@@ -115,11 +115,6 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {}, []);const handleGotoMemoLinkBtnClick = () => {- if (memo.visibility === "PRIVATE") {- toastHelper.error(t("message.private-only"));- return;- }-window.open(`/m/${memo.id}`);};diff --git a/web/src/components/Toast.tsx b/web/src/components/Toast.tsxindex e440d568a..622b58073 100644--- a/web/src/components/Toast.tsx+++ b/web/src/components/Toast.tsx@@ -94,7 +94,7 @@ const initialToastHelper = () => {return showToast({ type: "success", content, duration });};- const error = (content: string, duration = 3000) => {+ const error = (content: string, duration = -1) => {return showToast({ type: "error", content, duration });};diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsxindex 115172b56..bea9bae1f 100644--- a/web/src/pages/MemoDetail.tsx+++ b/web/src/pages/MemoDetail.tsx@@ -7,6 +7,7 @@ import { UNKNOWN_ID } from "../helpers/consts";import { isNullorUndefined } from "../helpers/utils";import { useAppSelector } from "../store";import useLoading from "../hooks/useLoading";+import toastHelper from "../components/Toast";import MemoContent from "../components/MemoContent";import MemoResources from "../components/MemoResources";import "../less/explore.less";@@ -37,12 +38,18 @@ const MemoDetail = () => {const memoId = Number(params.memoId);if (memoId && !isNaN(memoId)) {- memoService.fetchMemoById(memoId).then((memo) => {- setState({- memo,+ memoService+ .fetchMemoById(memoId)+ .then((memo) => {+ setState({+ memo,+ });+ loadingState.setFinish();+ })+ .catch((error) => {+ console.error(error);+ toastHelper.error(error.response.data.message);});- loadingState.setFinish();- });}}, [location]);