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.

chore: update get user by id

boojackac560dfcf98c
diff --git a/server/basic_auth.go b/server/basic_auth.go
index 717ae8156..a3925aa29 100644
--- a/server/basic_auth.go
+++ b/server/basic_auth.go
@@ -55,7 +55,7 @@ func removeUserSession(c echo.Context) error {
func BasicAuthMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {
// Skip auth for some paths.
- if common.HasPrefixes(c.Path(), "/api/auth", "/api/ping", "/api/status") {
+ if common.HasPrefixes(c.Path(), "/api/auth", "/api/ping", "/api/status", "/api/user/:id/") {
return next(c)
}
@@ -76,8 +76,10 @@ func BasicAuthMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
}
}
- if common.HasPrefixes(c.Path(), "/api/memo", "/api/tag", "/api/shortcut", "/api/user/:id/name") && c.Request().Method == http.MethodGet {
- return next(c)
+ if common.HasPrefixes(c.Path(), "/api/memo", "/api/tag", "/api/shortcut") && c.Request().Method == http.MethodGet {
+ if _, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
+ return next(c)
+ }
}
sess, err := session.Get("session", c)
diff --git a/server/user.go b/server/user.go
index f19bb6f57..94c522cb7 100644
--- a/server/user.go
+++ b/server/user.go
@@ -51,7 +51,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
return nil
})
- g.GET("/user/:id/name", func(c echo.Context) error {
+ g.GET("/user/:id", func(c echo.Context) error {
id, err := strconv.Atoi(c.Param("id"))
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "Malformatted user id").SetInternal(err)
@@ -64,13 +64,8 @@ func (s *Server) registerUserRoutes(g *echo.Group) {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch user").SetInternal(err)
}
- username := ""
- if user != nil {
- username = user.Name
- }
-
c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
- if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(username)); err != nil {
+ if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to encode user response").SetInternal(err)
}
return nil