Skip to content

armgit / memos

Public Imported from GitHub
0

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.

fix: visibility param override the user auth state (#1942)

Athurg Gooth3093f80d68c9
diff --git a/api/v1/memo.go b/api/v1/memo.go
index 25ce44797..a363333f6 100644
--- a/api/v1/memo.go
+++ b/api/v1/memo.go
@@ -6,7 +6,6 @@ import (
"fmt"
"net/http"
"strconv"
- "strings"
"time"
"github.com/labstack/echo/v4"
@@ -357,16 +356,21 @@ func (s *APIV1Service) registerMemoRoutes(g *echo.Group) {
currentUserID, ok := c.Get(getUserIDContextKey()).(int)
if !ok {
+ // Anonymous use should only fetch PUBLIC memos with specified user
if findMemoMessage.CreatorID == nil {
return echo.NewHTTPError(http.StatusBadRequest, "Missing user id to find memo")
}
findMemoMessage.VisibilityList = []store.Visibility{store.Public}
} else {
- if findMemoMessage.CreatorID == nil {
+ // Authorized user can fetch all PUBLIC/PROTECTED memo
+ visibilityList := []store.Visibility{store.Public, store.Protected}
+
+ // If Creator is authorized user (as default), PRIVATE memo is OK
+ if findMemoMessage.CreatorID == nil || *findMemoMessage.CreatorID == currentUserID {
findMemoMessage.CreatorID = &currentUserID
- } else {
- findMemoMessage.VisibilityList = []store.Visibility{store.Public, store.Protected}
+ visibilityList = append(visibilityList, store.Private)
}
+ findMemoMessage.VisibilityList = visibilityList
}
rowStatus := store.RowStatus(c.QueryParam("rowStatus"))
@@ -390,14 +394,6 @@ func (s *APIV1Service) registerMemoRoutes(g *echo.Group) {
}
findMemoMessage.ContentSearch = contentSearch
- visibilityListStr := c.QueryParam("visibility")
- if visibilityListStr != "" {
- visibilityList := []store.Visibility{}
- for _, visibility := range strings.Split(visibilityListStr, ",") {
- visibilityList = append(visibilityList, store.Visibility(visibility))
- }
- findMemoMessage.VisibilityList = visibilityList
- }
if limit, err := strconv.Atoi(c.QueryParam("limit")); err == nil {
findMemoMessage.Limit = &limit
}