chore: release v0.4.3

boojack · boojack · commit b8a7df21f2a0 · 2022-09-09T20:00:04.000+08:00
diff --git a/common/version.go b/common/version.go
@@ -7,10 +7,10 @@ import (
 
 // Version is the service current released version.
 // Semantic versioning: https://semver.org/
-var Version = "0.4.2"
+var Version = "0.4.3"
 
 // DevVersion is the service current development version.
-var DevVersion = "0.4.2"
+var DevVersion = "0.4.3"
 
 func GetCurrentVersion(mode string) string {
 	if mode == "dev" {
@@ -27,6 +27,12 @@ func GetMinorVersion(version string) string {
 	return versionList[0] + "." + versionList[1]
 }
 
+func GetSchemaVersion(version string) string {
+	minorVersion := GetMinorVersion(version)
+
+	return minorVersion + ".0"
+}
+
 // convSemanticVersionToInt converts version string to int.
 func convSemanticVersionToInt(version string) int {
 	versionList := strings.Split(version, ".")
diff --git a/server/acl.go b/server/acl.go
@@ -71,7 +71,7 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
 				OpenID: &openID,
 			}
 			user, err := s.Store.FindUser(ctx, userFind)
-			if err != nil {
+			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 {
@@ -90,7 +90,7 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
 					ID: &userID,
 				}
 				user, err := s.Store.FindUser(ctx, userFind)
-				if err != nil {
+				if err != nil && common.ErrorCode(err) != common.NotFound {
 					return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by ID: %d", userID)).SetInternal(err)
 				}
 				if user != nil {
diff --git a/server/auth.go b/server/auth.go
@@ -24,7 +24,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 			Email: &signin.Email,
 		}
 		user, err := s.Store.FindUser(ctx, userFind)
-		if err != nil {
+		if err != nil && common.ErrorCode(err) != common.NotFound {
 			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by email %s", signin.Email)).SetInternal(err)
 		}
 		if user == nil {
@@ -68,7 +68,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 			Role: &hostUserType,
 		}
 		hostUser, err := s.Store.FindUser(ctx, &hostUserFind)
-		if err != nil {
+		if err != nil && common.ErrorCode(err) != common.NotFound {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)
 		}
 		if hostUser != nil {
diff --git a/server/system.go b/server/system.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/usememos/memos/api"
+	"github.com/usememos/memos/common"
 
 	"github.com/labstack/echo/v4"
 )
@@ -27,7 +28,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
 			Role: &hostUserType,
 		}
 		hostUser, err := s.Store.FindUser(ctx, &hostUserFind)
-		if err != nil {
+		if err != nil && common.ErrorCode(err) != common.NotFound {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)
 		}
 
diff --git a/store/db/db.go b/store/db/db.go
@@ -84,7 +84,7 @@ func (db *DB) Open(ctx context.Context) (err error) {
 				}
 			}
 
-			if common.IsVersionGreaterThan(currentVersion, migrationHistory.Version) {
+			if common.IsVersionGreaterThan(common.GetSchemaVersion(currentVersion), migrationHistory.Version) {
 				minorVersionList := getMinorVersionList()
 
 				// backup the raw database file before migration
diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "memos",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {`
`71`	`71`	`OpenID: &openID,`
`72`	`72`	`}`
`73`	`73`	`user, err := s.Store.FindUser(ctx, userFind)`
`74`		`- if err != nil {`
	`74`	`+ if err != nil && common.ErrorCode(err) != common.NotFound {`
`75`	`75`	`return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user by open_id").SetInternal(err)`
`76`	`76`	`}`
`77`	`77`	`if user != nil {`
`@@ -90,7 +90,7 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {`
`90`	`90`	`ID: &userID,`
`91`	`91`	`}`
`92`	`92`	`user, err := s.Store.FindUser(ctx, userFind)`
`93`		`- if err != nil {`
	`93`	`+ if err != nil && common.ErrorCode(err) != common.NotFound {`
`94`	`94`	`return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by ID: %d", userID)).SetInternal(err)`
`95`	`95`	`}`
`96`	`96`	`if user != nil {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func (s Server) registerAuthRoutes(g echo.Group) {`
`24`	`24`	`Email: &signin.Email,`
`25`	`25`	`}`
`26`	`26`	`user, err := s.Store.FindUser(ctx, userFind)`
`27`		`- if err != nil {`
	`27`	`+ if err != nil && common.ErrorCode(err) != common.NotFound {`
`28`	`28`	`return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by email %s", signin.Email)).SetInternal(err)`
`29`	`29`	`}`
`30`	`30`	`if user == nil {`
`@@ -68,7 +68,7 @@ func (s Server) registerAuthRoutes(g echo.Group) {`
`68`	`68`	`Role: &hostUserType,`
`69`	`69`	`}`
`70`	`70`	`hostUser, err := s.Store.FindUser(ctx, &hostUserFind)`
`71`		`- if err != nil {`
	`71`	`+ if err != nil && common.ErrorCode(err) != common.NotFound {`
`72`	`72`	`return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)`
`73`	`73`	`}`
`74`	`74`	`if hostUser != nil {`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"net/http"`
`6`	`6`
`7`	`7`	`"github.com/usememos/memos/api"`
	`8`	`+ "github.com/usememos/memos/common"`
`8`	`9`
`9`	`10`	`"github.com/labstack/echo/v4"`
`10`	`11`	`)`
`@@ -27,7 +28,7 @@ func (s Server) registerSystemRoutes(g echo.Group) {`
`27`	`28`	`Role: &hostUserType,`
`28`	`29`	`}`
`29`	`30`	`hostUser, err := s.Store.FindUser(ctx, &hostUserFind)`
`30`		`- if err != nil {`
	`31`	`+ if err != nil && common.ErrorCode(err) != common.NotFound {`
`31`	`32`	`return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)`
`32`	`33`	`}`
`33`	`34`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func (db *DB) Open(ctx context.Context) (err error) {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`- if common.IsVersionGreaterThan(currentVersion, migrationHistory.Version) {`
	`87`	`+ if common.IsVersionGreaterThan(common.GetSchemaVersion(currentVersion), migrationHistory.Version) {`
`88`	`88`	`minorVersionList := getMinorVersionList()`
`89`	`89`
`90`	`90`	`// backup the raw database file before migration`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "memos",`
`3`		`- "version": "0.4.2",`
	`3`	`+ "version": "0.4.3",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"dev": "vite",`
`6`	`6`	`"build": "tsc && vite build",`