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 access token order
Steven745902e8b16e
diff --git a/api/v1/jwt.go b/api/v1/jwt.goindex bc641fa58..a684e5282 100644--- a/api/v1/jwt.go+++ b/api/v1/jwt.go@@ -36,15 +36,15 @@ func extractTokenFromHeader(c echo.Context) (string, error) {}func findAccessToken(c echo.Context) string {- accessToken := ""- cookie, _ := c.Cookie(auth.AccessTokenCookieName)- if cookie != nil {- accessToken = cookie.Value- }+ // Check the HTTP request header first.+ accessToken, _ := extractTokenFromHeader(c)if accessToken == "" {- accessToken, _ = extractTokenFromHeader(c)+ // Check the cookie.+ cookie, _ := c.Cookie(auth.AccessTokenCookieName)+ if cookie != nil {+ accessToken = cookie.Value+ }}-return accessToken}diff --git a/api/v2/acl.go b/api/v2/acl.goindex 804604ba5..1c44b3ecc 100644--- a/api/v2/acl.go+++ b/api/v2/acl.go@@ -127,6 +127,7 @@ func (in *GRPCAuthInterceptor) authenticate(ctx context.Context, accessToken str}func getTokenFromMetadata(md metadata.MD) (string, error) {+ // Check the HTTP request header first.authorizationHeaders := md.Get("Authorization")if len(md.Get("Authorization")) > 0 {authHeaderParts := strings.Fields(authorizationHeaders[0])@@ -135,7 +136,7 @@ func getTokenFromMetadata(md metadata.MD) (string, error) {}return authHeaderParts[1], nil}- // check the HTTP cookie+ // Check the cookie header.var accessToken stringfor _, t := range append(md.Get("grpcgateway-cookie"), md.Get("cookie")...) {header := http.Header{}