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
fix(backend): correct generic type parameter in withHeaderCarrier helper
Steven65a19df4beec
diff --git a/server/router/api/v1/connect_services.go b/server/router/api/v1/connect_services.goindex ea89603f2..92cebd93d 100644--- a/server/router/api/v1/connect_services.go+++ b/server/router/api/v1/connect_services.go@@ -42,23 +42,23 @@ func (s *ConnectServiceHandler) UpdateInstanceSetting(ctx context.Context, req *// AuthService//// Auth service methods need special handling for response headers (cookies).-// We use withHeaderCarrier helper to inject a header carrier into the context,+// We use connectWithHeaderCarrier helper to inject a header carrier into the context,// which allows the service to set headers in a protocol-agnostic way.func (s *ConnectServiceHandler) GetCurrentSession(ctx context.Context, req *connect.Request[v1pb.GetCurrentSessionRequest]) (*connect.Response[v1pb.GetCurrentSessionResponse], error) {- return withHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.GetCurrentSessionResponse, error) {+ return connectWithHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.GetCurrentSessionResponse, error) {return s.APIV1Service.GetCurrentSession(ctx, req.Msg)})}func (s *ConnectServiceHandler) CreateSession(ctx context.Context, req *connect.Request[v1pb.CreateSessionRequest]) (*connect.Response[v1pb.CreateSessionResponse], error) {- return withHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.CreateSessionResponse, error) {+ return connectWithHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.CreateSessionResponse, error) {return s.APIV1Service.CreateSession(ctx, req.Msg)})}func (s *ConnectServiceHandler) DeleteSession(ctx context.Context, req *connect.Request[v1pb.DeleteSessionRequest]) (*connect.Response[emptypb.Empty], error) {- return withHeaderCarrier(ctx, func(ctx context.Context) (*emptypb.Empty, error) {+ return connectWithHeaderCarrier(ctx, func(ctx context.Context) (*emptypb.Empty, error) {return s.APIV1Service.DeleteSession(ctx, req.Msg)})}diff --git a/server/router/api/v1/header_carrier.go b/server/router/api/v1/header_carrier.goindex 2cc5b1b9e..7aa806948 100644--- a/server/router/api/v1/header_carrier.go+++ b/server/router/api/v1/header_carrier.go@@ -6,7 +6,6 @@ import ("connectrpc.com/connect""google.golang.org/grpc""google.golang.org/grpc/metadata"- "google.golang.org/protobuf/proto")// headerCarrierKey is the context key for storing headers to be set in the response.@@ -86,19 +85,22 @@ func SetResponseHeader(ctx context.Context, key, value string) error {}))}-// withHeaderCarrier is a helper for Connect service wrappers that need to set response headers.+// connectWithHeaderCarrier is a helper for Connect service wrappers that need to set response headers.//// It injects a HeaderCarrier into the context, calls the service method,// and applies any headers from the carrier to the Connect response.//+// The generic parameter T is the non-pointer protobuf message type (e.g., v1pb.CreateSessionResponse),+// while fn returns *T (the pointer type) as is standard for protobuf messages.+//// Usage in Connect wrappers://-// func (s *ConnectServiceHandler) CreateSession(ctx context.Context, req *connect.Request[...]) (*connect.Response[...], error) {-// return withHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.CreateSessionResponse, error) {+// func (s *ConnectServiceHandler) CreateSession(ctx context.Context, req *connect.Request[v1pb.CreateSessionRequest]) (*connect.Response[v1pb.CreateSessionResponse], error) {+// return connectWithHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.CreateSessionResponse, error) {// return s.APIV1Service.CreateSession(ctx, req.Msg)// })// }-func withHeaderCarrier[T proto.Message](ctx context.Context, fn func(context.Context) (T, error)) (*connect.Response[T], error) {+func connectWithHeaderCarrier[T any](ctx context.Context, fn func(context.Context) (*T, error)) (*connect.Response[T], error) {// Inject header carrier for Connect protocolctx = WithHeaderCarrier(ctx)