YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove access token after sign out

Browse Source
This commit is contained in:
Steven
2024-05-20 08:53:29 +08:00
parent 21838d0aae
commit fb15386db2
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/router/api/v1/acl.go
View File

@@ -24,6 +24,7 @@ const (
// The key name used to store username in the context // The key name used to store username in the context
// user id is extracted from the jwt token subject field. // user id is extracted from the jwt token subject field.
usernameContextKey ContextKey = iota usernameContextKey ContextKey = iota
accessTokenContextKey
) )
// GRPCAuthInterceptor is the auth interceptor for gRPC server. // GRPCAuthInterceptor is the auth interceptor for gRPC server.
@@ -74,9 +75,9 @@ func (in *GRPCAuthInterceptor) AuthenticationInterceptor(ctx context.Context, re
return nil, errors.Errorf("user %q is not admin", username) return nil, errors.Errorf("user %q is not admin", username)
} }
// Stores userID into context. ctx = context.WithValue(ctx, usernameContextKey, username)
childCtx := context.WithValue(ctx, usernameContextKey, username) ctx = context.WithValue(ctx, accessTokenContextKey, accessToken)
return handler(childCtx, request) return handler(ctx, request)
} }
func (in *GRPCAuthInterceptor) authenticate(ctx context.Context, accessToken string) (string, error) { func (in *GRPCAuthInterceptor) authenticate(ctx context.Context, accessToken string) (string, error) {

12
server/router/api/v1/auth_service.go
View File

@@ -3,6 +3,7 @@ package v1
import ( import (
"context" "context"
"fmt" "fmt"
"log/slog"
"regexp" "regexp"
"strings" "strings"
"time" "time"
@@ -214,6 +215,17 @@ func (s *APIV1Service) SignUp(ctx context.Context, request *v1pb.SignUpRequest)
} }
func (s *APIV1Service) SignOut(ctx context.Context, _ *v1pb.SignOutRequest) (*emptypb.Empty, error) { func (s *APIV1Service) SignOut(ctx context.Context, _ *v1pb.SignOutRequest) (*emptypb.Empty, error) {
accessToken, ok := ctx.Value(accessTokenContextKey).(string)
// Try to delete the access token from the store.
if ok {
_, err := s.DeleteUserAccessToken(ctx, &v1pb.DeleteUserAccessTokenRequest{
AccessToken: accessToken,
})
if err != nil {
slog.Error("failed to delete access token", err)
}
}
if err := s.clearAccessTokenCookie(ctx); err != nil { if err := s.clearAccessTokenCookie(ctx); err != nil {
return nil, status.Errorf(codes.Internal, "failed to set grpc header, error: %v", err) return nil, status.Errorf(codes.Internal, "failed to set grpc header, error: %v", err)
} }