usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-12-20 01:31:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: update dev version

Browse Source
This commit is contained in:
Steven 2022-09-16 21:45:56 +08:00
parent 2c17ea703d
commit 19ef97a7ec
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/acl.go
View File

@ -64,20 +64,22 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
return next(c) return next(c)
} }
// If there is openId in query string and related user is found, then skip auth. {
openID := c.QueryParam("openId") // If there is openId in query string and related user is found, then skip auth.
if openID != "" { openID := c.QueryParam("openId")
userFind := &api.UserFind{ if openID != "" {
OpenID: &openID, userFind := &api.UserFind{
} OpenID: &openID,
user, err := s.Store.FindUser(ctx, userFind) }
if err != nil && common.ErrorCode(err) != common.NotFound { user, err := s.Store.FindUser(ctx, userFind)
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user by open_id").SetInternal(err) if err != nil && common.ErrorCode(err) != common.NotFound {
} return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user by open_id").SetInternal(err)
if user != nil { }
// Stores userID into context. if user != nil {
c.Set(getUserIDContextKey(), user.ID) // Stores userID into context.
return next(c) c.Set(getUserIDContextKey(), user.ID)
return next(c)
}
} }
} }

2
server/version/version.go
View File

@ -10,7 +10,7 @@ import (
var Version = "0.4.3" var Version = "0.4.3"
// DevVersion is the service current development version. // DevVersion is the service current development version.
var DevVersion = "0.5.0" var DevVersion = "0.4.4"
func GetCurrentVersion(mode string) string { func GetCurrentVersion(mode string) string {
if mode == "dev" { if mode == "dev" {