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
feat: implement part of user service (#2053)
boojack470fe1df49fa
diff --git a/api/v2/common.go b/api/v2/common.gonew file mode 100644index 000000000..fbe24519c--- /dev/null+++ b/api/v2/common.go@@ -0,0 +1,17 @@+package v2++import (+ apiv2pb "github.com/usememos/memos/proto/gen/api/v2"+ "github.com/usememos/memos/store"+)++func convertRowStatusFromStore(rowStatus store.RowStatus) apiv2pb.RowStatus {+ switch rowStatus {+ case store.Normal:+ return apiv2pb.RowStatus_ACTIVE+ case store.Archived:+ return apiv2pb.RowStatus_ARCHIVED+ default:+ return apiv2pb.RowStatus_ROW_STATUS_UNSPECIFIED+ }+}diff --git a/api/v2/gw_mux.go b/api/v2/gw_mux.godeleted file mode 100644index e3b15c049..000000000--- a/api/v2/gw_mux.go+++ /dev/null@@ -1,33 +0,0 @@-package v2--import (- "context"- "fmt"-- grpcRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"- "github.com/labstack/echo/v4"- apiv2pb "github.com/usememos/memos/proto/gen/api/v2"- "google.golang.org/grpc"- "google.golang.org/grpc/credentials/insecure"-)--// RegisterGateway registers the gRPC-Gateway with the given Echo instance.-func RegisterGateway(ctx context.Context, e *echo.Echo, grpcServerPort int) {- // Create a client connection to the gRPC Server we just started.- // This is where the gRPC-Gateway proxies the requests.- conn, err := grpc.DialContext(- ctx,- fmt.Sprintf(":%d", grpcServerPort),- grpc.WithTransportCredentials(insecure.NewCredentials()),- )- if err != nil {- panic(err)- }-- gwMux := grpcRuntime.NewServeMux()- err = apiv2pb.RegisterTagServiceHandler(context.Background(), gwMux, conn)- if err != nil {- panic(err)- }- e.Any("/api/v2/*", echo.WrapHandler(gwMux))-}diff --git a/api/v2/user_service.go b/api/v2/user_service.gonew file mode 100644index 000000000..37e8db91d--- /dev/null+++ b/api/v2/user_service.go@@ -0,0 +1,73 @@+package v2++import (+ "context"++ apiv2pb "github.com/usememos/memos/proto/gen/api/v2"+ "github.com/usememos/memos/store"+ "google.golang.org/grpc/codes"+ "google.golang.org/grpc/status"+)++type UserService struct {+ apiv2pb.UnimplementedUserServiceServer++ Store *store.Store+}++// NewUserService creates a new UserService.+func NewUserService(store *store.Store) *UserService {+ return &UserService{+ Store: store,+ }+}++func (s *UserService) GetUser(ctx context.Context, request *apiv2pb.GetUserRequest) (*apiv2pb.GetUserResponse, error) {+ println("GetUser", request.Name)+ user, err := s.Store.GetUser(ctx, &store.FindUser{+ Username: &request.Name,+ })+ if err != nil {+ return nil, status.Errorf(codes.Internal, "failed to list tags: %v", err)+ }+ if user == nil {+ return nil, status.Errorf(codes.NotFound, "user not found")+ }++ userMessage := convertUserFromStore(user)+ // Data desensitization.+ userMessage.OpenId = ""++ response := &apiv2pb.GetUserResponse{+ User: userMessage,+ }+ return response, nil+}++func convertUserFromStore(user *store.User) *apiv2pb.User {+ return &apiv2pb.User{+ Id: int32(user.ID),+ RowStatus: convertRowStatusFromStore(user.RowStatus),+ CreatedTs: user.CreatedTs,+ UpdatedTs: user.UpdatedTs,+ Username: user.Username,+ Role: convertUserRoleFromStore(user.Role),+ Email: user.Email,+ Nickname: user.Nickname,+ OpenId: user.OpenID,+ AvatarUrl: user.AvatarURL,+ }+}++func convertUserRoleFromStore(role store.Role) apiv2pb.Role {+ switch role {+ case store.RoleHost:+ return apiv2pb.Role_HOST+ case store.RoleAdmin:+ return apiv2pb.Role_ADMIN+ case store.RoleUser:+ return apiv2pb.Role_USER+ default:+ return apiv2pb.Role_ROLE_UNSPECIFIED+ }+}diff --git a/api/v2/v2.go b/api/v2/v2.goindex 5ec3cc8e8..525cbbb46 100644--- a/api/v2/v2.go+++ b/api/v2/v2.go@@ -1 +1,45 @@package v2++import (+ "context"+ "fmt"++ grpcRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"+ "github.com/labstack/echo/v4"+ apiv2pb "github.com/usememos/memos/proto/gen/api/v2"+ "github.com/usememos/memos/store"+ "google.golang.org/grpc"+ "google.golang.org/grpc/credentials/insecure"+)++func NewGRPCServer(store *store.Store) *grpc.Server {+ grpcServer := grpc.NewServer()+ apiv2pb.RegisterUserServiceServer(grpcServer, NewUserService(store))+ apiv2pb.RegisterTagServiceServer(grpcServer, NewTagService(store))+ return grpcServer+}++// RegisterGateway registers the gRPC-Gateway with the given Echo instance.+func RegisterGateway(ctx context.Context, e *echo.Echo, grpcServerPort int) error {+ // Create a client connection to the gRPC Server we just started.+ // This is where the gRPC-Gateway proxies the requests.+ conn, err := grpc.DialContext(+ ctx,+ fmt.Sprintf(":%d", grpcServerPort),+ grpc.WithTransportCredentials(insecure.NewCredentials()),+ )+ if err != nil {+ return err+ }++ gwMux := grpcRuntime.NewServeMux()+ if err := apiv2pb.RegisterUserServiceHandler(context.Background(), gwMux, conn); err != nil {+ return err+ }+ if err := apiv2pb.RegisterTagServiceHandler(context.Background(), gwMux, conn); err != nil {+ return err+ }+ e.Any("/api/v2/*", echo.WrapHandler(gwMux))++ return nil+}diff --git a/proto/api/v2/common.proto b/proto/api/v2/common.protonew file mode 100644index 000000000..532e8eb73--- /dev/null+++ b/proto/api/v2/common.proto@@ -0,0 +1,13 @@+syntax = "proto3";++package memos.api.v2;++option go_package = "gen/api/v2";++enum RowStatus {+ ROW_STATUS_UNSPECIFIED = 0;++ ACTIVE = 1;++ ARCHIVED = 2;+}diff --git a/proto/api/v2/user_service.proto b/proto/api/v2/user_service.protonew file mode 100644index 000000000..b2e22cb71--- /dev/null+++ b/proto/api/v2/user_service.proto@@ -0,0 +1,56 @@+syntax = "proto3";++package memos.api.v2;++import "api/v2/common.proto";+import "google/api/annotations.proto";+import "google/api/client.proto";++option go_package = "gen/api/v2";++service UserService {+ rpc GetUser(GetUserRequest) returns (GetUserResponse) {+ option (google.api.http) = {get: "/api/v2/users/{name}"};+ option (google.api.method_signature) = "name";+ }+}++message User {+ int32 id = 1;++ RowStatus row_status = 2;++ int64 created_ts = 3;++ int64 updated_ts = 4;++ string username = 5;++ Role role = 6;++ string email = 7;++ string nickname = 8;++ string open_id = 9;++ string avatar_url = 10;+}++enum Role {+ ROLE_UNSPECIFIED = 0;++ HOST = 1;++ ADMIN = 2;++ USER = 3;+}++message GetUserRequest {+ string name = 1;+}++message GetUserResponse {+ User user = 1;+}diff --git a/proto/buf.yaml b/proto/buf.yamlindex 59bf45eb6..192119fcd 100644--- a/proto/buf.yaml+++ b/proto/buf.yaml@@ -7,6 +7,7 @@ lint:use:- DEFAULTexcept:+ - ENUM_VALUE_PREFIX- PACKAGE_DIRECTORY_MATCH- PACKAGE_VERSION_SUFFIXdeps:diff --git a/proto/gen/api/v2/README.md b/proto/gen/api/v2/README.mdindex d99cdc690..cc858285a 100644--- a/proto/gen/api/v2/README.md+++ b/proto/gen/api/v2/README.md@@ -3,6 +3,9 @@## Table of Contents+- [api/v2/common.proto](#api_v2_common-proto)+ - [RowStatus](#memos-api-v2-RowStatus)+- [api/v2/tag_service.proto](#api_v2_tag_service-proto)- [ListTagsRequest](#memos-api-v2-ListTagsRequest)- [ListTagsResponse](#memos-api-v2-ListTagsResponse)@@ -10,10 +13,48 @@- [TagService](#memos-api-v2-TagService)+- [api/v2/user_service.proto](#api_v2_user_service-proto)+ - [GetUserRequest](#memos-api-v2-GetUserRequest)+ - [GetUserResponse](#memos-api-v2-GetUserResponse)+ - [User](#memos-api-v2-User)++ - [Role](#memos-api-v2-Role)++ - [UserService](#memos-api-v2-UserService)+- [Scalar Value Types](#scalar-value-types)+<a name="api_v2_common-proto"></a>+<p align="right"><a href="#top">Top</a></p>++## api/v2/common.proto++++++<a name="memos-api-v2-RowStatus"></a>++### RowStatus+++| Name | Number | Description |+| ---- | ------ | ----------- |+| ROW_STATUS_UNSPECIFIED | 0 | |+| ACTIVE | 1 | |+| ARCHIVED | 2 | |++++++++++<a name="api_v2_tag_service-proto"></a><p align="right"><a href="#top">Top</a></p>@@ -86,6 +127,100 @@+<a name="api_v2_user_service-proto"></a>+<p align="right"><a href="#top">Top</a></p>++## api/v2/user_service.proto++++<a name="memos-api-v2-GetUserRequest"></a>++### GetUserRequest++++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| name | [string](#string) | | |+++++++<a name="memos-api-v2-GetUserResponse"></a>++### GetUserResponse++++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| user | [User](#memos-api-v2-User) | | |+++++++<a name="memos-api-v2-User"></a>++### User++++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| id | [int32](#int32) | | |+| row_status | [RowStatus](#memos-api-v2-RowStatus) | | |+| created_ts | [int64](#int64) | | |+| updated_ts | [int64](#int64) | | |+| username | [string](#string) | | |+| role | [Role](#memos-api-v2-Role) | | |+| email | [string](#string) | | |+| nickname | [string](#string) | | |+| open_id | [string](#string) | | |+| avatar_url | [string](#string) | | |+++++++++<a name="memos-api-v2-Role"></a>++### Role+++| Name | Number | Description |+| ---- | ------ | ----------- |+| ROLE_UNSPECIFIED | 0 | |+| HOST | 1 | |+| ADMIN | 2 | |+| USER | 3 | |++++++++<a name="memos-api-v2-UserService"></a>++### UserService+++| Method Name | Request Type | Response Type | Description |+| ----------- | ------------ | ------------- | ------------|+| GetUser | [GetUserRequest](#memos-api-v2-GetUserRequest) | [GetUserResponse](#memos-api-v2-GetUserResponse) | |+++++## Scalar Value Types| .proto Type | Notes | C++ | Java | Python | Go | C# | PHP | Ruby |diff --git a/proto/gen/api/v2/common.pb.go b/proto/gen/api/v2/common.pb.gonew file mode 100644index 000000000..02ecea218--- /dev/null+++ b/proto/gen/api/v2/common.pb.go@@ -0,0 +1,142 @@+// Code generated by protoc-gen-go. DO NOT EDIT.+// versions:+// protoc-gen-go v1.31.0+// protoc (unknown)+// source: api/v2/common.proto++package apiv2++import (+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"+ reflect "reflect"+ sync "sync"+)++const (+ // Verify that this generated code is sufficiently up-to-date.+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)+ // Verify that runtime/protoimpl is sufficiently up-to-date.+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)+)++type RowStatus int32++const (+ RowStatus_ROW_STATUS_UNSPECIFIED RowStatus = 0+ RowStatus_ACTIVE RowStatus = 1+ RowStatus_ARCHIVED RowStatus = 2+)++// Enum value maps for RowStatus.+var (+ RowStatus_name = map[int32]string{+ 0: "ROW_STATUS_UNSPECIFIED",+ 1: "ACTIVE",+ 2: "ARCHIVED",+ }+ RowStatus_value = map[string]int32{+ "ROW_STATUS_UNSPECIFIED": 0,+ "ACTIVE": 1,+ "ARCHIVED": 2,+ }+)++func (x RowStatus) Enum() *RowStatus {+ p := new(RowStatus)+ *p = x+ return p+}++func (x RowStatus) String() string {+ return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))+}++func (RowStatus) Descriptor() protoreflect.EnumDescriptor {+ return file_api_v2_common_proto_enumTypes[0].Descriptor()+}++func (RowStatus) Type() protoreflect.EnumType {+ return &file_api_v2_common_proto_enumTypes[0]+}++func (x RowStatus) Number() protoreflect.EnumNumber {+ return protoreflect.EnumNumber(x)+}++// Deprecated: Use RowStatus.Descriptor instead.+func (RowStatus) EnumDescriptor() ([]byte, []int) {+ return file_api_v2_common_proto_rawDescGZIP(), []int{0}+}++var File_api_v2_common_proto protoreflect.FileDescriptor++var file_api_v2_common_proto_rawDesc = []byte{+ 0x0a, 0x13, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69,+ 0x2e, 0x76, 0x32, 0x2a, 0x41, 0x0a, 0x09, 0x52, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,+ 0x12, 0x1a, 0x0a, 0x16, 0x52, 0x4f, 0x57, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55,+ 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06,+ 0x41, 0x43, 0x54, 0x49, 0x56, 0x45, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x41, 0x52, 0x43, 0x48,+ 0x49, 0x56, 0x45, 0x44, 0x10, 0x02, 0x42, 0xa3, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0b, 0x43, 0x6f, 0x6d,+ 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68,+ 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f,+ 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f,+ 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x4d,+ 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56,+ 0x32, 0xca, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32,+ 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0x5c,+ 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65,+ 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72,+ 0x6f, 0x74, 0x6f, 0x33,+}++var (+ file_api_v2_common_proto_rawDescOnce sync.Once+ file_api_v2_common_proto_rawDescData = file_api_v2_common_proto_rawDesc+)++func file_api_v2_common_proto_rawDescGZIP() []byte {+ file_api_v2_common_proto_rawDescOnce.Do(func() {+ file_api_v2_common_proto_rawDescData = protoimpl.X.CompressGZIP(file_api_v2_common_proto_rawDescData)+ })+ return file_api_v2_common_proto_rawDescData+}++var file_api_v2_common_proto_enumTypes = make([]protoimpl.EnumInfo, 1)+var file_api_v2_common_proto_goTypes = []interface{}{+ (RowStatus)(0), // 0: memos.api.v2.RowStatus+}+var file_api_v2_common_proto_depIdxs = []int32{+ 0, // [0:0] is the sub-list for method output_type+ 0, // [0:0] is the sub-list for method input_type+ 0, // [0:0] is the sub-list for extension type_name+ 0, // [0:0] is the sub-list for extension extendee+ 0, // [0:0] is the sub-list for field type_name+}++func init() { file_api_v2_common_proto_init() }+func file_api_v2_common_proto_init() {+ if File_api_v2_common_proto != nil {+ return+ }+ type x struct{}+ out := protoimpl.TypeBuilder{+ File: protoimpl.DescBuilder{+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),+ RawDescriptor: file_api_v2_common_proto_rawDesc,+ NumEnums: 1,+ NumMessages: 0,+ NumExtensions: 0,+ NumServices: 0,+ },+ GoTypes: file_api_v2_common_proto_goTypes,+ DependencyIndexes: file_api_v2_common_proto_depIdxs,+ EnumInfos: file_api_v2_common_proto_enumTypes,+ }.Build()+ File_api_v2_common_proto = out.File+ file_api_v2_common_proto_rawDesc = nil+ file_api_v2_common_proto_goTypes = nil+ file_api_v2_common_proto_depIdxs = nil+}diff --git a/proto/gen/api/v2/user_service.pb.go b/proto/gen/api/v2/user_service.pb.gonew file mode 100644index 000000000..87c02870f--- /dev/null+++ b/proto/gen/api/v2/user_service.pb.go@@ -0,0 +1,447 @@+// Code generated by protoc-gen-go. DO NOT EDIT.+// versions:+// protoc-gen-go v1.31.0+// protoc (unknown)+// source: api/v2/user_service.proto++package apiv2++import (+ _ "google.golang.org/genproto/googleapis/api/annotations"+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"+ reflect "reflect"+ sync "sync"+)++const (+ // Verify that this generated code is sufficiently up-to-date.+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)+ // Verify that runtime/protoimpl is sufficiently up-to-date.+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)+)++type Role int32++const (+ Role_ROLE_UNSPECIFIED Role = 0+ Role_HOST Role = 1+ Role_ADMIN Role = 2+ Role_USER Role = 3+)++// Enum value maps for Role.+var (+ Role_name = map[int32]string{+ 0: "ROLE_UNSPECIFIED",+ 1: "HOST",+ 2: "ADMIN",+ 3: "USER",+ }+ Role_value = map[string]int32{+ "ROLE_UNSPECIFIED": 0,+ "HOST": 1,+ "ADMIN": 2,+ "USER": 3,+ }+)++func (x Role) Enum() *Role {+ p := new(Role)+ *p = x+ return p+}++func (x Role) String() string {+ return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))+}++func (Role) Descriptor() protoreflect.EnumDescriptor {+ return file_api_v2_user_service_proto_enumTypes[0].Descriptor()+}++func (Role) Type() protoreflect.EnumType {+ return &file_api_v2_user_service_proto_enumTypes[0]+}++func (x Role) Number() protoreflect.EnumNumber {+ return protoreflect.EnumNumber(x)+}++// Deprecated: Use Role.Descriptor instead.+func (Role) EnumDescriptor() ([]byte, []int) {+ return file_api_v2_user_service_proto_rawDescGZIP(), []int{0}+}++type User struct {+ state protoimpl.MessageState+ sizeCache protoimpl.SizeCache+ unknownFields protoimpl.UnknownFields++ Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`+ RowStatus RowStatus `protobuf:"varint,2,opt,name=row_status,json=rowStatus,proto3,enum=memos.api.v2.RowStatus" json:"row_status,omitempty"`+ CreatedTs int64 `protobuf:"varint,3,opt,name=created_ts,json=createdTs,proto3" json:"created_ts,omitempty"`+ UpdatedTs int64 `protobuf:"varint,4,opt,name=updated_ts,json=updatedTs,proto3" json:"updated_ts,omitempty"`+ Username string `protobuf:"bytes,5,opt,name=username,proto3" json:"username,omitempty"`+ Role Role `protobuf:"varint,6,opt,name=role,proto3,enum=memos.api.v2.Role" json:"role,omitempty"`+ Email string `protobuf:"bytes,7,opt,name=email,proto3" json:"email,omitempty"`+ Nickname string `protobuf:"bytes,8,opt,name=nickname,proto3" json:"nickname,omitempty"`+ OpenId string `protobuf:"bytes,9,opt,name=open_id,json=openId,proto3" json:"open_id,omitempty"`+ AvatarUrl string `protobuf:"bytes,10,opt,name=avatar_url,json=avatarUrl,proto3" json:"avatar_url,omitempty"`+}++func (x *User) Reset() {+ *x = User{}+ if protoimpl.UnsafeEnabled {+ mi := &file_api_v2_user_service_proto_msgTypes[0]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+ }+}++func (x *User) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*User) ProtoMessage() {}++func (x *User) ProtoReflect() protoreflect.Message {+ mi := &file_api_v2_user_service_proto_msgTypes[0]+ if protoimpl.UnsafeEnabled && x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use User.ProtoReflect.Descriptor instead.+func (*User) Descriptor() ([]byte, []int) {+ return file_api_v2_user_service_proto_rawDescGZIP(), []int{0}+}++func (x *User) GetId() int32 {+ if x != nil {+ return x.Id+ }+ return 0+}++func (x *User) GetRowStatus() RowStatus {+ if x != nil {+ return x.RowStatus+ }+ return RowStatus_ROW_STATUS_UNSPECIFIED+}++func (x *User) GetCreatedTs() int64 {+ if x != nil {+ return x.CreatedTs+ }+ return 0+}++func (x *User) GetUpdatedTs() int64 {+ if x != nil {+ return x.UpdatedTs+ }+ return 0+}++func (x *User) GetUsername() string {+ if x != nil {+ return x.Username+ }+ return ""+}++func (x *User) GetRole() Role {+ if x != nil {+ return x.Role+ }+ return Role_ROLE_UNSPECIFIED+}++func (x *User) GetEmail() string {+ if x != nil {+ return x.Email+ }+ return ""+}++func (x *User) GetNickname() string {+ if x != nil {+ return x.Nickname+ }+ return ""+}++func (x *User) GetOpenId() string {+ if x != nil {+ return x.OpenId+ }+ return ""+}++func (x *User) GetAvatarUrl() string {+ if x != nil {+ return x.AvatarUrl+ }+ return ""+}++type GetUserRequest struct {+ state protoimpl.MessageState+ sizeCache protoimpl.SizeCache+ unknownFields protoimpl.UnknownFields++ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`+}++func (x *GetUserRequest) Reset() {+ *x = GetUserRequest{}+ if protoimpl.UnsafeEnabled {+ mi := &file_api_v2_user_service_proto_msgTypes[1]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+ }+}++func (x *GetUserRequest) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*GetUserRequest) ProtoMessage() {}++func (x *GetUserRequest) ProtoReflect() protoreflect.Message {+ mi := &file_api_v2_user_service_proto_msgTypes[1]+ if protoimpl.UnsafeEnabled && x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use GetUserRequest.ProtoReflect.Descriptor instead.+func (*GetUserRequest) Descriptor() ([]byte, []int) {+ return file_api_v2_user_service_proto_rawDescGZIP(), []int{1}+}++func (x *GetUserRequest) GetName() string {+ if x != nil {+ return x.Name+ }+ return ""+}++type GetUserResponse struct {+ state protoimpl.MessageState+ sizeCache protoimpl.SizeCache+ unknownFields protoimpl.UnknownFields++ User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`+}++func (x *GetUserResponse) Reset() {+ *x = GetUserResponse{}+ if protoimpl.UnsafeEnabled {+ mi := &file_api_v2_user_service_proto_msgTypes[2]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+ }+}++func (x *GetUserResponse) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*GetUserResponse) ProtoMessage() {}++func (x *GetUserResponse) ProtoReflect() protoreflect.Message {+ mi := &file_api_v2_user_service_proto_msgTypes[2]+ if protoimpl.UnsafeEnabled && x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use GetUserResponse.ProtoReflect.Descriptor instead.+func (*GetUserResponse) Descriptor() ([]byte, []int) {+ return file_api_v2_user_service_proto_rawDescGZIP(), []int{2}+}++func (x *GetUserResponse) GetUser() *User {+ if x != nil {+ return x.User+ }+ return nil+}++var File_api_v2_user_service_proto protoreflect.FileDescriptor++var file_api_v2_user_service_proto_rawDesc = []byte{+ 0x0a, 0x19, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x73, 0x65,+ 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x6d, 0x65, 0x6d,+ 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x1a, 0x13, 0x61, 0x70, 0x69, 0x2f, 0x76,+ 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c,+ 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74,+ 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x67, 0x6f,+ 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2e,+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xba, 0x02, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e,+ 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x36,+ 0x0a, 0x0a, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01,+ 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,+ 0x32, 0x2e, 0x52, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x09, 0x72, 0x6f, 0x77,+ 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,+ 0x64, 0x5f, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61,+ 0x74, 0x65, 0x64, 0x54, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64,+ 0x5f, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74,+ 0x65, 0x64, 0x54, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65,+ 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65,+ 0x12, 0x26, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12,+ 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x6f,+ 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69,+ 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x1a,+ 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09,+ 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6f, 0x70,+ 0x65, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x70, 0x65,+ 0x6e, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x5f, 0x75, 0x72,+ 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55,+ 0x72, 0x6c, 0x22, 0x24, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71,+ 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,+ 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x39, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x55,+ 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x04, 0x75,+ 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,+ 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75,+ 0x73, 0x65, 0x72, 0x2a, 0x3b, 0x0a, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x52,+ 0x4f, 0x4c, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,+ 0x00, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x4f, 0x53, 0x54, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41,+ 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x55, 0x53, 0x45, 0x52, 0x10, 0x03,+ 0x32, 0x7a, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,+ 0x6b, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1c, 0x2e, 0x6d, 0x65, 0x6d,+ 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65,+ 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,+ 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52,+ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23, 0xda, 0x41, 0x04, 0x6e, 0x61, 0x6d, 0x65,+ 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f,+ 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x42, 0xa8, 0x01, 0x0a,+ 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,+ 0x32, 0x42, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72,+ 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,+ 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73,+ 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,+ 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c,+ 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0c, 0x4d,+ 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x18, 0x4d, 0x65,+ 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,+ 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a,+ 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,+}++var (+ file_api_v2_user_service_proto_rawDescOnce sync.Once+ file_api_v2_user_service_proto_rawDescData = file_api_v2_user_service_proto_rawDesc+)++func file_api_v2_user_service_proto_rawDescGZIP() []byte {+ file_api_v2_user_service_proto_rawDescOnce.Do(func() {+ file_api_v2_user_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_api_v2_user_service_proto_rawDescData)+ })+ return file_api_v2_user_service_proto_rawDescData+}++var file_api_v2_user_service_proto_enumTypes = make([]protoimpl.EnumInfo, 1)+var file_api_v2_user_service_proto_msgTypes = make([]protoimpl.MessageInfo, 3)+var file_api_v2_user_service_proto_goTypes = []interface{}{+ (Role)(0), // 0: memos.api.v2.Role+ (*User)(nil), // 1: memos.api.v2.User+ (*GetUserRequest)(nil), // 2: memos.api.v2.GetUserRequest+ (*GetUserResponse)(nil), // 3: memos.api.v2.GetUserResponse+ (RowStatus)(0), // 4: memos.api.v2.RowStatus+}+var file_api_v2_user_service_proto_depIdxs = []int32{+ 4, // 0: memos.api.v2.User.row_status:type_name -> memos.api.v2.RowStatus+ 0, // 1: memos.api.v2.User.role:type_name -> memos.api.v2.Role+ 1, // 2: memos.api.v2.GetUserResponse.user:type_name -> memos.api.v2.User+ 2, // 3: memos.api.v2.UserService.GetUser:input_type -> memos.api.v2.GetUserRequest+ 3, // 4: memos.api.v2.UserService.GetUser:output_type -> memos.api.v2.GetUserResponse+ 4, // [4:5] is the sub-list for method output_type+ 3, // [3:4] is the sub-list for method input_type+ 3, // [3:3] is the sub-list for extension type_name+ 3, // [3:3] is the sub-list for extension extendee+ 0, // [0:3] is the sub-list for field type_name+}++func init() { file_api_v2_user_service_proto_init() }+func file_api_v2_user_service_proto_init() {+ if File_api_v2_user_service_proto != nil {+ return+ }+ file_api_v2_common_proto_init()+ if !protoimpl.UnsafeEnabled {+ file_api_v2_user_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {+ switch v := v.(*User); i {+ case 0:+ return &v.state+ case 1:+ return &v.sizeCache+ case 2:+ return &v.unknownFields+ default:+ return nil+ }+ }+ file_api_v2_user_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {+ switch v := v.(*GetUserRequest); i {+ case 0:+ return &v.state+ case 1:+ return &v.sizeCache+ case 2:+ return &v.unknownFields+ default:+ return nil+ }+ }+ file_api_v2_user_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {+ switch v := v.(*GetUserResponse); i {+ case 0:+ return &v.state+ case 1:+ return &v.sizeCache+ case 2:+ return &v.unknownFields+ default:+ return nil+ }+ }+ }+ type x struct{}+ out := protoimpl.TypeBuilder{+ File: protoimpl.DescBuilder{+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),+ RawDescriptor: file_api_v2_user_service_proto_rawDesc,+ NumEnums: 1,+ NumMessages: 3,+ NumExtensions: 0,+ NumServices: 1,+ },+ GoTypes: file_api_v2_user_service_proto_goTypes,+ DependencyIndexes: file_api_v2_user_service_proto_depIdxs,+ EnumInfos: file_api_v2_user_service_proto_enumTypes,+ MessageInfos: file_api_v2_user_service_proto_msgTypes,+ }.Build()+ File_api_v2_user_service_proto = out.File+ file_api_v2_user_service_proto_rawDesc = nil+ file_api_v2_user_service_proto_goTypes = nil+ file_api_v2_user_service_proto_depIdxs = nil+}diff --git a/proto/gen/api/v2/user_service.pb.gw.go b/proto/gen/api/v2/user_service.pb.gw.gonew file mode 100644index 000000000..a71ef0d69--- /dev/null+++ b/proto/gen/api/v2/user_service.pb.gw.go@@ -0,0 +1,189 @@+// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.+// source: api/v2/user_service.proto++/*+Package apiv2 is a reverse proxy.++It translates gRPC into RESTful JSON APIs.+*/+package apiv2++import (+ "context"+ "io"+ "net/http"++ "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"+ "github.com/grpc-ecosystem/grpc-gateway/v2/utilities"+ "google.golang.org/grpc"+ "google.golang.org/grpc/codes"+ "google.golang.org/grpc/grpclog"+ "google.golang.org/grpc/metadata"+ "google.golang.org/grpc/status"+ "google.golang.org/protobuf/proto"+)++// Suppress "imported and not used" errors+var _ codes.Code+var _ io.Reader+var _ status.Status+var _ = runtime.String+var _ = utilities.NewDoubleArray+var _ = metadata.Join++func request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var protoReq GetUserRequest+ var metadata runtime.ServerMetadata++ var (+ val string+ ok bool+ err error+ _ = err+ )++ val, ok = pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }++ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }++ msg, err := client.GetUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err++}++func local_request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var protoReq GetUserRequest+ var metadata runtime.ServerMetadata++ var (+ val string+ ok bool+ err error+ _ = err+ )++ val, ok = pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }++ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }++ msg, err := server.GetUser(ctx, &protoReq)+ return msg, metadata, err++}++// RegisterUserServiceHandlerServer registers the http handlers for service UserService to "mux".+// UnaryRPC :call UserServiceServer directly.+// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterUserServiceHandlerFromEndpoint instead.+func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server UserServiceServer) error {++ mux.Handle("GET", pattern_UserService_GetUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ var err error+ var annotatedContext context.Context+ annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v2.UserService/GetUser", runtime.WithHTTPPathPattern("/api/v2/users/{name}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_UserService_GetUser_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }++ forward_UserService_GetUser_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)++ })++ return nil+}++// RegisterUserServiceHandlerFromEndpoint is same as RegisterUserServiceHandler but+// automatically dials to "endpoint" and closes the connection when "ctx" gets done.+func RegisterUserServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) {+ conn, err := grpc.DialContext(ctx, endpoint, opts...)+ if err != nil {+ return err+ }+ defer func() {+ if err != nil {+ if cerr := conn.Close(); cerr != nil {+ grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr)+ }+ return+ }+ go func() {+ <-ctx.Done()+ if cerr := conn.Close(); cerr != nil {+ grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr)+ }+ }()+ }()++ return RegisterUserServiceHandler(ctx, mux, conn)+}++// RegisterUserServiceHandler registers the http handlers for service UserService to "mux".+// The handlers forward requests to the grpc endpoint over "conn".+func RegisterUserServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {+ return RegisterUserServiceHandlerClient(ctx, mux, NewUserServiceClient(conn))+}++// RegisterUserServiceHandlerClient registers the http handlers for service UserService+// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "UserServiceClient".+// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "UserServiceClient"+// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in+// "UserServiceClient" to call the correct interceptors.+func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client UserServiceClient) error {++ mux.Handle("GET", pattern_UserService_GetUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ var err error+ var annotatedContext context.Context+ annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/memos.api.v2.UserService/GetUser", runtime.WithHTTPPathPattern("/api/v2/users/{name}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_UserService_GetUser_0(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }++ forward_UserService_GetUser_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)++ })++ return nil+}++var (+ pattern_UserService_GetUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v2", "users", "name"}, ""))+)++var (+ forward_UserService_GetUser_0 = runtime.ForwardResponseMessage+)diff --git a/proto/gen/api/v2/user_service_grpc.pb.go b/proto/gen/api/v2/user_service_grpc.pb.gonew file mode 100644index 000000000..18600fea2--- /dev/null+++ b/proto/gen/api/v2/user_service_grpc.pb.go@@ -0,0 +1,109 @@+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.+// versions:+// - protoc-gen-go-grpc v1.3.0+// - protoc (unknown)+// source: api/v2/user_service.proto++package apiv2++import (+ context "context"+ grpc "google.golang.org/grpc"+ codes "google.golang.org/grpc/codes"+ status "google.golang.org/grpc/status"+)++// This is a compile-time assertion to ensure that this generated file+// is compatible with the grpc package it is being compiled against.+// Requires gRPC-Go v1.32.0 or later.+const _ = grpc.SupportPackageIsVersion7++const (+ UserService_GetUser_FullMethodName = "/memos.api.v2.UserService/GetUser"+)++// UserServiceClient is the client API for UserService service.+//+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.+type UserServiceClient interface {+ GetUser(ctx context.Context, in *GetUserRequest, opts ...grpc.CallOption) (*GetUserResponse, error)+}++type userServiceClient struct {+ cc grpc.ClientConnInterface+}++func NewUserServiceClient(cc grpc.ClientConnInterface) UserServiceClient {+ return &userServiceClient{cc}+}++func (c *userServiceClient) GetUser(ctx context.Context, in *GetUserRequest, opts ...grpc.CallOption) (*GetUserResponse, error) {+ out := new(GetUserResponse)+ err := c.cc.Invoke(ctx, UserService_GetUser_FullMethodName, in, out, opts...)+ if err != nil {+ return nil, err+ }+ return out, nil+}++// UserServiceServer is the server API for UserService service.+// All implementations must embed UnimplementedUserServiceServer+// for forward compatibility+type UserServiceServer interface {+ GetUser(context.Context, *GetUserRequest) (*GetUserResponse, error)+ mustEmbedUnimplementedUserServiceServer()+}++// UnimplementedUserServiceServer must be embedded to have forward compatible implementations.+type UnimplementedUserServiceServer struct {+}++func (UnimplementedUserServiceServer) GetUser(context.Context, *GetUserRequest) (*GetUserResponse, error) {+ return nil, status.Errorf(codes.Unimplemented, "method GetUser not implemented")+}+func (UnimplementedUserServiceServer) mustEmbedUnimplementedUserServiceServer() {}++// UnsafeUserServiceServer may be embedded to opt out of forward compatibility for this service.+// Use of this interface is not recommended, as added methods to UserServiceServer will+// result in compilation errors.+type UnsafeUserServiceServer interface {+ mustEmbedUnimplementedUserServiceServer()+}++func RegisterUserServiceServer(s grpc.ServiceRegistrar, srv UserServiceServer) {+ s.RegisterService(&UserService_ServiceDesc, srv)+}++func _UserService_GetUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {+ in := new(GetUserRequest)+ if err := dec(in); err != nil {+ return nil, err+ }+ if interceptor == nil {+ return srv.(UserServiceServer).GetUser(ctx, in)+ }+ info := &grpc.UnaryServerInfo{+ Server: srv,+ FullMethod: UserService_GetUser_FullMethodName,+ }+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {+ return srv.(UserServiceServer).GetUser(ctx, req.(*GetUserRequest))+ }+ return interceptor(ctx, in, info, handler)+}++// UserService_ServiceDesc is the grpc.ServiceDesc for UserService service.+// It's only intended for direct use with grpc.RegisterService,+// and not to be introspected or modified (even as a copy)+var UserService_ServiceDesc = grpc.ServiceDesc{+ ServiceName: "memos.api.v2.UserService",+ HandlerType: (*UserServiceServer)(nil),+ Methods: []grpc.MethodDesc{+ {+ MethodName: "GetUser",+ Handler: _UserService_GetUser_Handler,+ },+ },+ Streams: []grpc.StreamDesc{},+ Metadata: "api/v2/user_service.proto",+}diff --git a/proto/gen/store/README.md b/proto/gen/store/README.mddeleted file mode 100644index 1ea76a82a..000000000--- a/proto/gen/store/README.md+++ /dev/null@@ -1,64 +0,0 @@-# Protocol Documentation-<a name="top"></a>--## Table of Contents--- [store/tag.proto](#store_tag-proto)- - [Tag](#memos-store-Tag)--- [Scalar Value Types](#scalar-value-types)----<a name="store_tag-proto"></a>-<p align="right"><a href="#top">Top</a></p>--## store/tag.proto----<a name="memos-store-Tag"></a>--### Tag----| Field | Type | Label | Description |-| ----- | ---- | ----- | ----------- |-| name | [string](#string) | | |-| creator_id | [int32](#int32) | | |----------------## Scalar Value Types--| .proto Type | Notes | C++ | Java | Python | Go | C# | PHP | Ruby |-| ----------- | ----- | --- | ---- | ------ | -- | -- | --- | ---- |-| <a name="double" /> double | | double | double | float | float64 | double | float | Float |-| <a name="float" /> float | | float | float | float | float32 | float | float | Float |-| <a name="int32" /> int32 | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint32 instead. | int32 | int | int | int32 | int | integer | Bignum or Fixnum (as required) |-| <a name="int64" /> int64 | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint64 instead. | int64 | long | int/long | int64 | long | integer/string | Bignum |-| <a name="uint32" /> uint32 | Uses variable-length encoding. | uint32 | int | int/long | uint32 | uint | integer | Bignum or Fixnum (as required) |-| <a name="uint64" /> uint64 | Uses variable-length encoding. | uint64 | long | int/long | uint64 | ulong | integer/string | Bignum or Fixnum (as required) |-| <a name="sint32" /> sint32 | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int32s. | int32 | int | int | int32 | int | integer | Bignum or Fixnum (as required) |-| <a name="sint64" /> sint64 | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int64s. | int64 | long | int/long | int64 | long | integer/string | Bignum |-| <a name="fixed32" /> fixed32 | Always four bytes. More efficient than uint32 if values are often greater than 2^28. | uint32 | int | int | uint32 | uint | integer | Bignum or Fixnum (as required) |-| <a name="fixed64" /> fixed64 | Always eight bytes. More efficient than uint64 if values are often greater than 2^56. | uint64 | long | int/long | uint64 | ulong | integer/string | Bignum |-| <a name="sfixed32" /> sfixed32 | Always four bytes. | int32 | int | int | int32 | int | integer | Bignum or Fixnum (as required) |-| <a name="sfixed64" /> sfixed64 | Always eight bytes. | int64 | long | int/long | int64 | long | integer/string | Bignum |-| <a name="bool" /> bool | | bool | boolean | boolean | bool | bool | boolean | TrueClass/FalseClass |-| <a name="string" /> string | A string must always contain UTF-8 encoded or 7-bit ASCII text. | string | String | str/unicode | string | string | string | String (UTF-8) |-| <a name="bytes" /> bytes | May contain any arbitrary sequence of bytes. | string | ByteString | str | []byte | ByteString | string | String (ASCII-8BIT) |-diff --git a/proto/gen/store/tag.pb.go b/proto/gen/store/tag.pb.godeleted file mode 100644index 92a203a95..000000000--- a/proto/gen/store/tag.pb.go+++ /dev/null@@ -1,160 +0,0 @@-// Code generated by protoc-gen-go. DO NOT EDIT.-// versions:-// protoc-gen-go v1.31.0-// protoc (unknown)-// source: store/tag.proto--package store--import (- protoreflect "google.golang.org/protobuf/reflect/protoreflect"- protoimpl "google.golang.org/protobuf/runtime/protoimpl"- reflect "reflect"- sync "sync"-)--const (- // Verify that this generated code is sufficiently up-to-date.- _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)- // Verify that runtime/protoimpl is sufficiently up-to-date.- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)-)--type Tag struct {- state protoimpl.MessageState- sizeCache protoimpl.SizeCache- unknownFields protoimpl.UnknownFields-- Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`- CreatorId int32 `protobuf:"varint,2,opt,name=creator_id,json=creatorId,proto3" json:"creator_id,omitempty"`-}--func (x *Tag) Reset() {- *x = Tag{}- if protoimpl.UnsafeEnabled {- mi := &file_store_tag_proto_msgTypes[0]- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- ms.StoreMessageInfo(mi)- }-}--func (x *Tag) String() string {- return protoimpl.X.MessageStringOf(x)-}--func (*Tag) ProtoMessage() {}--func (x *Tag) ProtoReflect() protoreflect.Message {- mi := &file_store_tag_proto_msgTypes[0]- if protoimpl.UnsafeEnabled && x != nil {- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- if ms.LoadMessageInfo() == nil {- ms.StoreMessageInfo(mi)- }- return ms- }- return mi.MessageOf(x)-}--// Deprecated: Use Tag.ProtoReflect.Descriptor instead.-func (*Tag) Descriptor() ([]byte, []int) {- return file_store_tag_proto_rawDescGZIP(), []int{0}-}--func (x *Tag) GetName() string {- if x != nil {- return x.Name- }- return ""-}--func (x *Tag) GetCreatorId() int32 {- if x != nil {- return x.CreatorId- }- return 0-}--var File_store_tag_proto protoreflect.FileDescriptor--var file_store_tag_proto_rawDesc = []byte{- 0x0a, 0x0f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,- 0x6f, 0x12, 0x0b, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x38,- 0x0a, 0x03, 0x54, 0x61, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,- 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65,- 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63,- 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x42, 0x93, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d,- 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x42, 0x08, 0x54, 0x61,- 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,- 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65,- 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x73, 0x74,- 0x6f, 0x72, 0x65, 0xa2, 0x02, 0x03, 0x4d, 0x53, 0x58, 0xaa, 0x02, 0x0b, 0x4d, 0x65, 0x6d, 0x6f,- 0x73, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x65, 0xca, 0x02, 0x0b, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c,- 0x53, 0x74, 0x6f, 0x72, 0x65, 0xe2, 0x02, 0x17, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x53, 0x74,- 0x6f, 0x72, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,- 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x62, 0x06,- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,-}--var (- file_store_tag_proto_rawDescOnce sync.Once- file_store_tag_proto_rawDescData = file_store_tag_proto_rawDesc-)--func file_store_tag_proto_rawDescGZIP() []byte {- file_store_tag_proto_rawDescOnce.Do(func() {- file_store_tag_proto_rawDescData = protoimpl.X.CompressGZIP(file_store_tag_proto_rawDescData)- })- return file_store_tag_proto_rawDescData-}--var file_store_tag_proto_msgTypes = make([]protoimpl.MessageInfo, 1)-var file_store_tag_proto_goTypes = []interface{}{- (*Tag)(nil), // 0: memos.store.Tag-}-var file_store_tag_proto_depIdxs = []int32{- 0, // [0:0] is the sub-list for method output_type- 0, // [0:0] is the sub-list for method input_type- 0, // [0:0] is the sub-list for extension type_name- 0, // [0:0] is the sub-list for extension extendee- 0, // [0:0] is the sub-list for field type_name-}--func init() { file_store_tag_proto_init() }-func file_store_tag_proto_init() {- if File_store_tag_proto != nil {- return- }- if !protoimpl.UnsafeEnabled {- file_store_tag_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {- switch v := v.(*Tag); i {- case 0:- return &v.state- case 1:- return &v.sizeCache- case 2:- return &v.unknownFields- default:- return nil- }- }- }- type x struct{}- out := protoimpl.TypeBuilder{- File: protoimpl.DescBuilder{- GoPackagePath: reflect.TypeOf(x{}).PkgPath(),- RawDescriptor: file_store_tag_proto_rawDesc,- NumEnums: 0,- NumMessages: 1,- NumExtensions: 0,- NumServices: 0,- },- GoTypes: file_store_tag_proto_goTypes,- DependencyIndexes: file_store_tag_proto_depIdxs,- MessageInfos: file_store_tag_proto_msgTypes,- }.Build()- File_store_tag_proto = out.File- file_store_tag_proto_rawDesc = nil- file_store_tag_proto_goTypes = nil- file_store_tag_proto_depIdxs = nil-}diff --git a/proto/store/tag.proto b/proto/store/tag.protodeleted file mode 100644index 2202a5bcb..000000000--- a/proto/store/tag.proto+++ /dev/null@@ -1,10 +0,0 @@-syntax = "proto3";--package memos.store;--option go_package = "gen/store";--message Tag {- string name = 1;- int32 creator_id = 2;-}diff --git a/server/server.go b/server/server.goindex d675aca68..c67601ffd 100644--- a/server/server.go+++ b/server/server.go@@ -17,7 +17,6 @@ import ("github.com/usememos/memos/common/log""github.com/usememos/memos/common/util""github.com/usememos/memos/plugin/telegram"- apiv2pb "github.com/usememos/memos/proto/gen/api/v2""github.com/usememos/memos/server/profile""github.com/usememos/memos/store""go.uber.org/zap"@@ -101,11 +100,12 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.StoreapiV1Service.Register(rootGroup)// Register gPRC server services.- s.grpcServer = grpc.NewServer()- apiv2pb.RegisterTagServiceServer(s.grpcServer, apiv2.NewTagService(store))+ s.grpcServer = apiv2.NewGRPCServer(store)// Register gRPC gateway as api v2.- apiv2.RegisterGateway(ctx, e, s.Profile.Port+1)+ if err := apiv2.RegisterGateway(ctx, e, s.Profile.Port+1); err != nil {+ return nil, fmt.Errorf("failed to register gRPC gateway: %w", err)+ }return s, nil}