chore: tweak api definition

proto/api/v2/activity_service.proto

@@ -11,7 +11,7 @@ option go_package = "gen/api/v2";
 
 service ActivityService {
   // GetActivity returns the activity with the given id.
-  rpc GetActivity(GetActivityRequest) returns (GetActivityResponse) {
+  rpc GetActivity(GetActivityRequest) returns (Activity) {
     option (google.api.http) = {get: "/v2/activities/{id}"};
     option (google.api.method_signature) = "id";
   }
@@ -54,7 +54,3 @@ message GetActivityRequest {
   // The system-generated unique identifier for the activity.
   int32 id = 1;
 }
-
-message GetActivityResponse {
-  Activity activity = 1;
-}

proto/api/v2/auth_service.proto

@@ -4,28 +4,29 @@ package memos.api.v2;
 
 import "api/v2/user_service.proto";
 import "google/api/annotations.proto";
+import "google/protobuf/empty.proto";
 
 option go_package = "gen/api/v2";
 
 service AuthService {
   // GetAuthStatus returns the current auth status of the user.
-  rpc GetAuthStatus(GetAuthStatusRequest) returns (GetAuthStatusResponse) {
+  rpc GetAuthStatus(GetAuthStatusRequest) returns (User) {
     option (google.api.http) = {post: "/api/v2/auth/status"};
   }
   // SignIn signs in the user with the given username and password.
-  rpc SignIn(SignInRequest) returns (SignInResponse) {
+  rpc SignIn(SignInRequest) returns (User) {
     option (google.api.http) = {post: "/api/v2/auth/signin"};
   }
   // SignInWithSSO signs in the user with the given SSO code.
-  rpc SignInWithSSO(SignInWithSSORequest) returns (SignInWithSSOResponse) {
+  rpc SignInWithSSO(SignInWithSSORequest) returns (User) {
     option (google.api.http) = {post: "/api/v2/auth/signin/sso"};
   }
   // SignUp signs up the user with the given username and password.
-  rpc SignUp(SignUpRequest) returns (SignUpResponse) {
+  rpc SignUp(SignUpRequest) returns (User) {
     option (google.api.http) = {post: "/api/v2/auth/signup"};
   }
   // SignOut signs out the user.
-  rpc SignOut(SignOutRequest) returns (SignOutResponse) {
+  rpc SignOut(SignOutRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {post: "/api/v2/auth/signout"};
   }
 }
@@ -45,10 +46,6 @@ message SignInRequest {
   bool never_expire = 3;
 }
 
-message SignInResponse {
-  User user = 1;
-}
-
 message SignInWithSSORequest {
   // The ID of the SSO provider.
   int32 idp_id = 1;
@@ -58,10 +55,6 @@ message SignInWithSSORequest {
   string redirect_uri = 3;
 }
 
-message SignInWithSSOResponse {
-  User user = 1;
-}
-
 message SignUpRequest {
   // The username to sign up with.
   string username = 1;
@@ -69,10 +62,4 @@ message SignUpRequest {
   string password = 2;
 }
 
-message SignUpResponse {
-  User user = 1;
-}
-
 message SignOutRequest {}
-
-message SignOutResponse {}

proto/api/v2/idp_service.proto

@@ -4,6 +4,7 @@ package memos.api.v2;
 
 import "google/api/annotations.proto";
 import "google/api/client.proto";
+import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 
 option go_package = "gen/api/v2";
@@ -14,19 +15,19 @@ service IdentityProviderService {
     option (google.api.http) = {get: "/api/v2/identityProviders"};
   }
   // GetIdentityProvider gets an identity provider.
-  rpc GetIdentityProvider(GetIdentityProviderRequest) returns (GetIdentityProviderResponse) {
+  rpc GetIdentityProvider(GetIdentityProviderRequest) returns (IdentityProvider) {
     option (google.api.http) = {get: "/api/v2/{name=identityProviders/*}"};
     option (google.api.method_signature) = "name";
   }
   // CreateIdentityProvider creates an identity provider.
-  rpc CreateIdentityProvider(CreateIdentityProviderRequest) returns (CreateIdentityProviderResponse) {
+  rpc CreateIdentityProvider(CreateIdentityProviderRequest) returns (IdentityProvider) {
     option (google.api.http) = {
       post: "/api/v2/identityProviders",
       body: "identity_provider"
     };
   }
   // UpdateIdentityProvider updates an identity provider.
-  rpc UpdateIdentityProvider(UpdateIdentityProviderRequest) returns (UpdateIdentityProviderResponse) {
+  rpc UpdateIdentityProvider(UpdateIdentityProviderRequest) returns (IdentityProvider) {
     option (google.api.http) = {
       patch: "/api/v2/{identity_provider.name=identityProviders/*}"
       body: "identity_provider"
@@ -34,7 +35,7 @@ service IdentityProviderService {
     option (google.api.method_signature) = "identity_provider,update_mask";
   }
   // DeleteIdentityProvider deletes an identity provider.
-  rpc DeleteIdentityProvider(DeleteIdentityProviderRequest) returns (DeleteIdentityProviderResponse) {
+  rpc DeleteIdentityProvider(DeleteIdentityProviderRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {delete: "/api/v2/{name=identityProviders/*}"};
     option (google.api.method_signature) = "name";
   }
@@ -92,21 +93,11 @@ message GetIdentityProviderRequest {
   string name = 1;
 }
 
-message GetIdentityProviderResponse {
-  // The identityProvider.
-  IdentityProvider identity_provider = 1;
-}
-
 message CreateIdentityProviderRequest {
   // The identityProvider to create.
   IdentityProvider identity_provider = 1;
 }
 
-message CreateIdentityProviderResponse {
-  // The created identityProvider.
-  IdentityProvider identity_provider = 1;
-}
-
 message UpdateIdentityProviderRequest {
   // The identityProvider to update.
   IdentityProvider identity_provider = 1;
@@ -116,15 +107,8 @@ message UpdateIdentityProviderRequest {
   google.protobuf.FieldMask update_mask = 2;
 }
 
-message UpdateIdentityProviderResponse {
-  // The updated identityProvider.
-  IdentityProvider identity_provider = 1;
-}
-
 message DeleteIdentityProviderRequest {
   // The name of the identityProvider to delete.
   // Format: identityProviders/{id}
   string name = 1;
 }
-
-message DeleteIdentityProviderResponse {}

proto/api/v2/inbox_service.proto

@@ -4,6 +4,7 @@ package memos.api.v2;
 
 import "google/api/annotations.proto";
 import "google/api/client.proto";
+import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
 
@@ -15,7 +16,7 @@ service InboxService {
     option (google.api.http) = {get: "/api/v2/inboxes"};
   }
   // UpdateInbox updates an inbox.
-  rpc UpdateInbox(UpdateInboxRequest) returns (UpdateInboxResponse) {
+  rpc UpdateInbox(UpdateInboxRequest) returns (Inbox) {
     option (google.api.http) = {
       patch: "/api/v2/{inbox.name=inboxes/*}"
       body: "inbox"
@@ -23,7 +24,7 @@ service InboxService {
     option (google.api.method_signature) = "inbox,update_mask";
   }
   // DeleteInbox deletes an inbox.
-  rpc DeleteInbox(DeleteInboxRequest) returns (DeleteInboxResponse) {
+  rpc DeleteInbox(DeleteInboxRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {delete: "/api/v2/{name=inboxes/*}"};
     option (google.api.method_signature) = "name";
   }
@@ -72,14 +73,8 @@ message UpdateInboxRequest {
   google.protobuf.FieldMask update_mask = 2;
 }
 
-message UpdateInboxResponse {
-  Inbox inbox = 1;
-}
-
 message DeleteInboxRequest {
   // The name of the inbox to delete.
   // Format: inboxes/{id}
   string name = 1;
 }
-
-message DeleteInboxResponse {}

proto/api/v2/memo_service.proto

@@ -9,6 +9,7 @@ import "api/v2/resource_service.proto";
 import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
+import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
 
@@ -16,7 +17,7 @@ option go_package = "gen/api/v2";
 
 service MemoService {
   // CreateMemo creates a memo.
-  rpc CreateMemo(CreateMemoRequest) returns (CreateMemoResponse) {
+  rpc CreateMemo(CreateMemoRequest) returns (Memo) {
     option (google.api.http) = {
       post: "/api/v2/memos"
       body: "*"
@@ -31,12 +32,12 @@ service MemoService {
     option (google.api.http) = {get: "/api/v2/memos:search"};
   }
   // GetMemo gets a memo.
-  rpc GetMemo(GetMemoRequest) returns (GetMemoResponse) {
+  rpc GetMemo(GetMemoRequest) returns (Memo) {
     option (google.api.http) = {get: "/api/v2/{name=memos/*}"};
     option (google.api.method_signature) = "name";
   }
   // UpdateMemo updates a memo.
-  rpc UpdateMemo(UpdateMemoRequest) returns (UpdateMemoResponse) {
+  rpc UpdateMemo(UpdateMemoRequest) returns (Memo) {
     option (google.api.http) = {
       patch: "/api/v2/{memo.name=memos/*}"
       body: "memo"
@@ -44,7 +45,7 @@ service MemoService {
     option (google.api.method_signature) = "memo,update_mask";
   }
   // DeleteMemo deletes a memo.
-  rpc DeleteMemo(DeleteMemoRequest) returns (DeleteMemoResponse) {
+  rpc DeleteMemo(DeleteMemoRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {delete: "/api/v2/{name=memos/*}"};
     option (google.api.method_signature) = "name";
   }
@@ -56,7 +57,7 @@ service MemoService {
     };
   }
   // SetMemoResources sets resources for a memo.
-  rpc SetMemoResources(SetMemoResourcesRequest) returns (SetMemoResourcesResponse) {
+  rpc SetMemoResources(SetMemoResourcesRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {
       patch: "/api/v2/{name=memos/*}/resources"
       body: "*"
@@ -69,7 +70,7 @@ service MemoService {
     option (google.api.method_signature) = "name";
   }
   // SetMemoRelations sets relations for a memo.
-  rpc SetMemoRelations(SetMemoRelationsRequest) returns (SetMemoRelationsResponse) {
+  rpc SetMemoRelations(SetMemoRelationsRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {
       patch: "/api/v2/{name=memos/*}/relations"
       body: "*"
@@ -82,10 +83,10 @@ service MemoService {
     option (google.api.method_signature) = "name";
   }
   // CreateMemoComment creates a comment for a memo.
-  rpc CreateMemoComment(CreateMemoCommentRequest) returns (CreateMemoCommentResponse) {
+  rpc CreateMemoComment(CreateMemoCommentRequest) returns (Memo) {
     option (google.api.http) = {
       post: "/api/v2/{name=memos/*}/comments",
-      body: "*"
+      body: "comment"
     };
     option (google.api.method_signature) = "name";
   }
@@ -105,7 +106,7 @@ service MemoService {
     option (google.api.method_signature) = "name";
   }
   // UpsertMemoReaction upserts a reaction for a memo.
-  rpc UpsertMemoReaction(UpsertMemoReactionRequest) returns (UpsertMemoReactionResponse) {
+  rpc UpsertMemoReaction(UpsertMemoReactionRequest) returns (Reaction) {
     option (google.api.http) = {
       post: "/api/v2/{name=memos/*}/reactions",
       body: "*"
@@ -113,7 +114,7 @@ service MemoService {
     option (google.api.method_signature) = "name";
   }
   // DeleteMemoReaction deletes a reaction for a memo.
-  rpc DeleteMemoReaction(DeleteMemoReactionRequest) returns (DeleteMemoReactionResponse) {
+  rpc DeleteMemoReaction(DeleteMemoReactionRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {delete: "/api/v2/reactions/{reaction_id}"};
     option (google.api.method_signature) = "reaction_id";
   }
@@ -168,10 +169,6 @@ message CreateMemoRequest {
   Visibility visibility = 2;
 }
 
-message CreateMemoResponse {
-  Memo memo = 1;
-}
-
 message ListMemosRequest {
   // The maximum number of memos to return.
   int32 page_size = 1;
@@ -209,28 +206,18 @@ message GetMemoRequest {
   string name = 1;
 }
 
-message GetMemoResponse {
-  Memo memo = 1;
-}
-
 message UpdateMemoRequest {
   Memo memo = 1;
 
   google.protobuf.FieldMask update_mask = 2;
 }
 
-message UpdateMemoResponse {
-  Memo memo = 1;
-}
-
 message DeleteMemoRequest {
   // The name of the memo.
   // Format: memos/{id}
   string name = 1;
 }
 
-message DeleteMemoResponse {}
-
 message ExportMemosRequest {
   // Same as ListMemosRequest.filter
   string filter = 1;
@@ -248,8 +235,6 @@ message SetMemoResourcesRequest {
   repeated Resource resources = 2;
 }
 
-message SetMemoResourcesResponse {}
-
 message ListMemoResourcesRequest {
   // The name of the memo.
   // Format: memos/{id}
@@ -268,8 +253,6 @@ message SetMemoRelationsRequest {
   repeated MemoRelation relations = 2;
 }
 
-message SetMemoRelationsResponse {}
-
 message ListMemoRelationsRequest {
   // The name of the memo.
   // Format: memos/{id}
@@ -288,10 +271,6 @@ message CreateMemoCommentRequest {
   CreateMemoRequest comment = 2;
 }
 
-message CreateMemoCommentResponse {
-  Memo memo = 1;
-}
-
 message ListMemoCommentsRequest {
   // The name of the memo.
   // Format: memos/{id}
@@ -340,12 +319,6 @@ message UpsertMemoReactionRequest {
   Reaction reaction = 2;
 }
 
-message UpsertMemoReactionResponse {
-  Reaction reaction = 1;
-}
-
 message DeleteMemoReactionRequest {
   int32 reaction_id = 1;
 }
-
-message DeleteMemoReactionResponse {}

proto/api/v2/resource_service.proto

@@ -5,6 +5,7 @@ package memos.api.v2;
 import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
+import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
 
@@ -12,7 +13,7 @@ option go_package = "gen/api/v2";
 
 service ResourceService {
   // CreateResource creates a new resource.
-  rpc CreateResource(CreateResourceRequest) returns (CreateResourceResponse) {
+  rpc CreateResource(CreateResourceRequest) returns (Resource) {
     option (google.api.http) = {
       post: "/api/v2/resources",
       body: "resource"
@@ -27,12 +28,12 @@ service ResourceService {
     option (google.api.http) = {get: "/api/v2/resources:search"};
   }
   // GetResource returns a resource by name.
-  rpc GetResource(GetResourceRequest) returns (GetResourceResponse) {
+  rpc GetResource(GetResourceRequest) returns (Resource) {
     option (google.api.http) = {get: "/api/v2/{name=resources/*}"};
     option (google.api.method_signature) = "name";
   }
   // UpdateResource updates a resource.
-  rpc UpdateResource(UpdateResourceRequest) returns (UpdateResourceResponse) {
+  rpc UpdateResource(UpdateResourceRequest) returns (Resource) {
     option (google.api.http) = {
       patch: "/api/v2/{resource.name=resources/*}",
       body: "resource"
@@ -40,7 +41,7 @@ service ResourceService {
     option (google.api.method_signature) = "resource,update_mask";
   }
   // DeleteResource deletes a resource by name.
-  rpc DeleteResource(DeleteResourceRequest) returns (DeleteResourceResponse) {
+  rpc DeleteResource(DeleteResourceRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {delete: "/api/v2/{name=resources/*}"};
     option (google.api.method_signature) = "name";
   }
@@ -76,10 +77,6 @@ message CreateResourceRequest {
   Resource resource = 1;
 }
 
-message CreateResourceResponse {
-  Resource resource = 1;
-}
-
 message ListResourcesRequest {}
 
 message ListResourcesResponse {
@@ -101,25 +98,15 @@ message GetResourceRequest {
   string name = 1;
 }
 
-message GetResourceResponse {
-  Resource resource = 1;
-}
-
 message UpdateResourceRequest {
   Resource resource = 1;
 
   google.protobuf.FieldMask update_mask = 2;
 }
 
-message UpdateResourceResponse {
-  Resource resource = 1;
-}
-
 message DeleteResourceRequest {
   // The name of the resource.
   // Format: resources/{id}
   // id is the system generated unique identifier.
   string name = 1;
 }
-
-message DeleteResourceResponse {}

proto/api/v2/workspace_service.proto

@@ -8,7 +8,7 @@ option go_package = "gen/api/v2";
 
 service WorkspaceService {
   // GetWorkspaceProfile returns the workspace profile.
-  rpc GetWorkspaceProfile(GetWorkspaceProfileRequest) returns (GetWorkspaceProfileResponse) {
+  rpc GetWorkspaceProfile(GetWorkspaceProfileRequest) returns (WorkspaceProfile) {
     option (google.api.http) = {get: "/api/v2/workspace/profile"};
   }
 }
@@ -24,7 +24,3 @@ message WorkspaceProfile {
 }
 
 message GetWorkspaceProfileRequest {}
-
-message GetWorkspaceProfileResponse {
-  WorkspaceProfile workspace_profile = 1;
-}

proto/buf.yaml

@@ -5,7 +5,7 @@ breaking:
     - FILE
 lint:
   use:
-    - DEFAULT
+    - BASIC
   except:
     - ENUM_VALUE_PREFIX
     - PACKAGE_DIRECTORY_MATCH

proto/gen/api/v2/activity_service.pb.go

@@ -324,53 +324,6 @@ func (x *GetActivityRequest) GetId() int32 {
 	return 0
 }
 
-type GetActivityResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Activity *Activity `protobuf:"bytes,1,opt,name=activity,proto3" json:"activity,omitempty"`
-}
-
-func (x *GetActivityResponse) Reset() {
-	*x = GetActivityResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_v2_activity_service_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetActivityResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetActivityResponse) ProtoMessage() {}
-
-func (x *GetActivityResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_api_v2_activity_service_proto_msgTypes[5]
-	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 GetActivityResponse.ProtoReflect.Descriptor instead.
-func (*GetActivityResponse) Descriptor() ([]byte, []int) {
-	return file_api_v2_activity_service_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *GetActivityResponse) GetActivity() *Activity {
-	if x != nil {
-		return x.Activity
-	}
-	return nil
-}
-
 var File_api_v2_activity_service_proto protoreflect.FileDescriptor
 
 var file_api_v2_activity_service_proto_rawDesc = []byte{
@@ -421,32 +374,26 @@ var file_api_v2_activity_service_proto_rawDesc = []byte{
 	0x79, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x0d, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x55, 0x70,
 	0x64, 0x61, 0x74, 0x65, 0x22, 0x24, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76,
 	0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x49, 0x0a, 0x13, 0x47, 0x65,
-	0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x32, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x32, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x08, 0x61, 0x63, 0x74,
-	0x69, 0x76, 0x69, 0x74, 0x79, 0x32, 0x87, 0x01, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
-	0x74, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x74, 0x0a, 0x0b, 0x47, 0x65, 0x74,
-	0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76,
-	0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6d, 0x65, 0x6d,
-	0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74,
-	0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x20, 0xda,
-	0x41, 0x02, 0x69, 0x64, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x76, 0x32, 0x2f,
-	0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42,
-	0xac, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x42, 0x14, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 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,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x32, 0x7c, 0x0a, 0x0f, 0x41, 0x63,
+	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x69, 0x0a,
+	0x0b, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x20, 0x2e, 0x6d,
+	0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x41,
+	0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16,
+	0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x63,
+	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 0x20, 0xda, 0x41, 0x02, 0x69, 0x64, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
+	0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xac, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d,
+	0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x14, 0x41,
+	0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 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 (
@@ -461,29 +408,27 @@ func file_api_v2_activity_service_proto_rawDescGZIP() []byte {
 	return file_api_v2_activity_service_proto_rawDescData
 }
 
-var file_api_v2_activity_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_api_v2_activity_service_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_api_v2_activity_service_proto_goTypes = []interface{}{
 	(*Activity)(nil),                     // 0: memos.api.v2.Activity
 	(*ActivityMemoCommentPayload)(nil),   // 1: memos.api.v2.ActivityMemoCommentPayload
 	(*ActivityVersionUpdatePayload)(nil), // 2: memos.api.v2.ActivityVersionUpdatePayload
 	(*ActivityPayload)(nil),              // 3: memos.api.v2.ActivityPayload
 	(*GetActivityRequest)(nil),           // 4: memos.api.v2.GetActivityRequest
-	(*GetActivityResponse)(nil),          // 5: memos.api.v2.GetActivityResponse
-	(*timestamppb.Timestamp)(nil),        // 6: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),        // 5: google.protobuf.Timestamp
 }
 var file_api_v2_activity_service_proto_depIdxs = []int32{
-	6, // 0: memos.api.v2.Activity.create_time:type_name -> google.protobuf.Timestamp
+	5, // 0: memos.api.v2.Activity.create_time:type_name -> google.protobuf.Timestamp
 	3, // 1: memos.api.v2.Activity.payload:type_name -> memos.api.v2.ActivityPayload
 	1, // 2: memos.api.v2.ActivityPayload.memo_comment:type_name -> memos.api.v2.ActivityMemoCommentPayload
 	2, // 3: memos.api.v2.ActivityPayload.version_update:type_name -> memos.api.v2.ActivityVersionUpdatePayload
-	0, // 4: memos.api.v2.GetActivityResponse.activity:type_name -> memos.api.v2.Activity
-	4, // 5: memos.api.v2.ActivityService.GetActivity:input_type -> memos.api.v2.GetActivityRequest
-	5, // 6: memos.api.v2.ActivityService.GetActivity:output_type -> memos.api.v2.GetActivityResponse
-	6, // [6:7] is the sub-list for method output_type
-	5, // [5:6] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
+	4, // 4: memos.api.v2.ActivityService.GetActivity:input_type -> memos.api.v2.GetActivityRequest
+	0, // 5: memos.api.v2.ActivityService.GetActivity:output_type -> memos.api.v2.Activity
+	5, // [5:6] is the sub-list for method output_type
+	4, // [4:5] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_api_v2_activity_service_proto_init() }
@@ -552,18 +497,6 @@ func file_api_v2_activity_service_proto_init() {
 				return nil
 			}
 		}
-		file_api_v2_activity_service_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetActivityResponse); 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{
@@ -571,7 +504,7 @@ func file_api_v2_activity_service_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_api_v2_activity_service_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   6,
+			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

proto/gen/api/v2/activity_service_grpc.pb.go

@@ -27,7 +27,7 @@ const (
 // 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 ActivityServiceClient interface {
 	// GetActivity returns the activity with the given id.
-	GetActivity(ctx context.Context, in *GetActivityRequest, opts ...grpc.CallOption) (*GetActivityResponse, error)
+	GetActivity(ctx context.Context, in *GetActivityRequest, opts ...grpc.CallOption) (*Activity, error)
 }
 
 type activityServiceClient struct {
@@ -38,8 +38,8 @@ func NewActivityServiceClient(cc grpc.ClientConnInterface) ActivityServiceClient
 	return &activityServiceClient{cc}
 }
 
-func (c *activityServiceClient) GetActivity(ctx context.Context, in *GetActivityRequest, opts ...grpc.CallOption) (*GetActivityResponse, error) {
-	out := new(GetActivityResponse)
+func (c *activityServiceClient) GetActivity(ctx context.Context, in *GetActivityRequest, opts ...grpc.CallOption) (*Activity, error) {
+	out := new(Activity)
 	err := c.cc.Invoke(ctx, ActivityService_GetActivity_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -52,7 +52,7 @@ func (c *activityServiceClient) GetActivity(ctx context.Context, in *GetActivity
 // for forward compatibility
 type ActivityServiceServer interface {
 	// GetActivity returns the activity with the given id.
-	GetActivity(context.Context, *GetActivityRequest) (*GetActivityResponse, error)
+	GetActivity(context.Context, *GetActivityRequest) (*Activity, error)
 	mustEmbedUnimplementedActivityServiceServer()
 }
 
@@ -60,7 +60,7 @@ type ActivityServiceServer interface {
 type UnimplementedActivityServiceServer struct {
 }
 
-func (UnimplementedActivityServiceServer) GetActivity(context.Context, *GetActivityRequest) (*GetActivityResponse, error) {
+func (UnimplementedActivityServiceServer) GetActivity(context.Context, *GetActivityRequest) (*Activity, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetActivity not implemented")
 }
 func (UnimplementedActivityServiceServer) mustEmbedUnimplementedActivityServiceServer() {}

proto/gen/api/v2/auth_service_grpc.pb.go

@@ -11,6 +11,7 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -31,15 +32,15 @@ const (
 // 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 AuthServiceClient interface {
 	// GetAuthStatus returns the current auth status of the user.
-	GetAuthStatus(ctx context.Context, in *GetAuthStatusRequest, opts ...grpc.CallOption) (*GetAuthStatusResponse, error)
+	GetAuthStatus(ctx context.Context, in *GetAuthStatusRequest, opts ...grpc.CallOption) (*User, error)
 	// SignIn signs in the user with the given username and password.
-	SignIn(ctx context.Context, in *SignInRequest, opts ...grpc.CallOption) (*SignInResponse, error)
+	SignIn(ctx context.Context, in *SignInRequest, opts ...grpc.CallOption) (*User, error)
 	// SignInWithSSO signs in the user with the given SSO code.
-	SignInWithSSO(ctx context.Context, in *SignInWithSSORequest, opts ...grpc.CallOption) (*SignInWithSSOResponse, error)
+	SignInWithSSO(ctx context.Context, in *SignInWithSSORequest, opts ...grpc.CallOption) (*User, error)
 	// SignUp signs up the user with the given username and password.
-	SignUp(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*SignUpResponse, error)
+	SignUp(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*User, error)
 	// SignOut signs out the user.
-	SignOut(ctx context.Context, in *SignOutRequest, opts ...grpc.CallOption) (*SignOutResponse, error)
+	SignOut(ctx context.Context, in *SignOutRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type authServiceClient struct {
@@ -50,8 +51,8 @@ func NewAuthServiceClient(cc grpc.ClientConnInterface) AuthServiceClient {
 	return &authServiceClient{cc}
 }
 
-func (c *authServiceClient) GetAuthStatus(ctx context.Context, in *GetAuthStatusRequest, opts ...grpc.CallOption) (*GetAuthStatusResponse, error) {
-	out := new(GetAuthStatusResponse)
+func (c *authServiceClient) GetAuthStatus(ctx context.Context, in *GetAuthStatusRequest, opts ...grpc.CallOption) (*User, error) {
+	out := new(User)
 	err := c.cc.Invoke(ctx, AuthService_GetAuthStatus_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -59,8 +60,8 @@ func (c *authServiceClient) GetAuthStatus(ctx context.Context, in *GetAuthStatus
 	return out, nil
 }
 
-func (c *authServiceClient) SignIn(ctx context.Context, in *SignInRequest, opts ...grpc.CallOption) (*SignInResponse, error) {
-	out := new(SignInResponse)
+func (c *authServiceClient) SignIn(ctx context.Context, in *SignInRequest, opts ...grpc.CallOption) (*User, error) {
+	out := new(User)
 	err := c.cc.Invoke(ctx, AuthService_SignIn_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -68,8 +69,8 @@ func (c *authServiceClient) SignIn(ctx context.Context, in *SignInRequest, opts
 	return out, nil
 }
 
-func (c *authServiceClient) SignInWithSSO(ctx context.Context, in *SignInWithSSORequest, opts ...grpc.CallOption) (*SignInWithSSOResponse, error) {
-	out := new(SignInWithSSOResponse)
+func (c *authServiceClient) SignInWithSSO(ctx context.Context, in *SignInWithSSORequest, opts ...grpc.CallOption) (*User, error) {
+	out := new(User)
 	err := c.cc.Invoke(ctx, AuthService_SignInWithSSO_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -77,8 +78,8 @@ func (c *authServiceClient) SignInWithSSO(ctx context.Context, in *SignInWithSSO
 	return out, nil
 }
 
-func (c *authServiceClient) SignUp(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*SignUpResponse, error) {
-	out := new(SignUpResponse)
+func (c *authServiceClient) SignUp(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*User, error) {
+	out := new(User)
 	err := c.cc.Invoke(ctx, AuthService_SignUp_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -86,8 +87,8 @@ func (c *authServiceClient) SignUp(ctx context.Context, in *SignUpRequest, opts
 	return out, nil
 }
 
-func (c *authServiceClient) SignOut(ctx context.Context, in *SignOutRequest, opts ...grpc.CallOption) (*SignOutResponse, error) {
-	out := new(SignOutResponse)
+func (c *authServiceClient) SignOut(ctx context.Context, in *SignOutRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, AuthService_SignOut_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -100,15 +101,15 @@ func (c *authServiceClient) SignOut(ctx context.Context, in *SignOutRequest, opt
 // for forward compatibility
 type AuthServiceServer interface {
 	// GetAuthStatus returns the current auth status of the user.
-	GetAuthStatus(context.Context, *GetAuthStatusRequest) (*GetAuthStatusResponse, error)
+	GetAuthStatus(context.Context, *GetAuthStatusRequest) (*User, error)
 	// SignIn signs in the user with the given username and password.
-	SignIn(context.Context, *SignInRequest) (*SignInResponse, error)
+	SignIn(context.Context, *SignInRequest) (*User, error)
 	// SignInWithSSO signs in the user with the given SSO code.
-	SignInWithSSO(context.Context, *SignInWithSSORequest) (*SignInWithSSOResponse, error)
+	SignInWithSSO(context.Context, *SignInWithSSORequest) (*User, error)
 	// SignUp signs up the user with the given username and password.
-	SignUp(context.Context, *SignUpRequest) (*SignUpResponse, error)
+	SignUp(context.Context, *SignUpRequest) (*User, error)
 	// SignOut signs out the user.
-	SignOut(context.Context, *SignOutRequest) (*SignOutResponse, error)
+	SignOut(context.Context, *SignOutRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedAuthServiceServer()
 }
 
@@ -116,19 +117,19 @@ type AuthServiceServer interface {
 type UnimplementedAuthServiceServer struct {
 }
 
-func (UnimplementedAuthServiceServer) GetAuthStatus(context.Context, *GetAuthStatusRequest) (*GetAuthStatusResponse, error) {
+func (UnimplementedAuthServiceServer) GetAuthStatus(context.Context, *GetAuthStatusRequest) (*User, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetAuthStatus not implemented")
 }
-func (UnimplementedAuthServiceServer) SignIn(context.Context, *SignInRequest) (*SignInResponse, error) {
+func (UnimplementedAuthServiceServer) SignIn(context.Context, *SignInRequest) (*User, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignIn not implemented")
 }
-func (UnimplementedAuthServiceServer) SignInWithSSO(context.Context, *SignInWithSSORequest) (*SignInWithSSOResponse, error) {
+func (UnimplementedAuthServiceServer) SignInWithSSO(context.Context, *SignInWithSSORequest) (*User, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignInWithSSO not implemented")
 }
-func (UnimplementedAuthServiceServer) SignUp(context.Context, *SignUpRequest) (*SignUpResponse, error) {
+func (UnimplementedAuthServiceServer) SignUp(context.Context, *SignUpRequest) (*User, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignUp not implemented")
 }
-func (UnimplementedAuthServiceServer) SignOut(context.Context, *SignOutRequest) (*SignOutResponse, error) {
+func (UnimplementedAuthServiceServer) SignOut(context.Context, *SignOutRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignOut not implemented")
 }
 func (UnimplementedAuthServiceServer) mustEmbedUnimplementedAuthServiceServer() {}

proto/gen/api/v2/idp_service_grpc.pb.go

@@ -11,6 +11,7 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -33,13 +34,13 @@ type IdentityProviderServiceClient interface {
 	// ListIdentityProviders lists identity providers.
 	ListIdentityProviders(ctx context.Context, in *ListIdentityProvidersRequest, opts ...grpc.CallOption) (*ListIdentityProvidersResponse, error)
 	// GetIdentityProvider gets an identity provider.
-	GetIdentityProvider(ctx context.Context, in *GetIdentityProviderRequest, opts ...grpc.CallOption) (*GetIdentityProviderResponse, error)
+	GetIdentityProvider(ctx context.Context, in *GetIdentityProviderRequest, opts ...grpc.CallOption) (*IdentityProvider, error)
 	// CreateIdentityProvider creates an identity provider.
-	CreateIdentityProvider(ctx context.Context, in *CreateIdentityProviderRequest, opts ...grpc.CallOption) (*CreateIdentityProviderResponse, error)
+	CreateIdentityProvider(ctx context.Context, in *CreateIdentityProviderRequest, opts ...grpc.CallOption) (*IdentityProvider, error)
 	// UpdateIdentityProvider updates an identity provider.
-	UpdateIdentityProvider(ctx context.Context, in *UpdateIdentityProviderRequest, opts ...grpc.CallOption) (*UpdateIdentityProviderResponse, error)
+	UpdateIdentityProvider(ctx context.Context, in *UpdateIdentityProviderRequest, opts ...grpc.CallOption) (*IdentityProvider, error)
 	// DeleteIdentityProvider deletes an identity provider.
-	DeleteIdentityProvider(ctx context.Context, in *DeleteIdentityProviderRequest, opts ...grpc.CallOption) (*DeleteIdentityProviderResponse, error)
+	DeleteIdentityProvider(ctx context.Context, in *DeleteIdentityProviderRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type identityProviderServiceClient struct {
@@ -59,8 +60,8 @@ func (c *identityProviderServiceClient) ListIdentityProviders(ctx context.Contex
 	return out, nil
 }
 
-func (c *identityProviderServiceClient) GetIdentityProvider(ctx context.Context, in *GetIdentityProviderRequest, opts ...grpc.CallOption) (*GetIdentityProviderResponse, error) {
-	out := new(GetIdentityProviderResponse)
+func (c *identityProviderServiceClient) GetIdentityProvider(ctx context.Context, in *GetIdentityProviderRequest, opts ...grpc.CallOption) (*IdentityProvider, error) {
+	out := new(IdentityProvider)
 	err := c.cc.Invoke(ctx, IdentityProviderService_GetIdentityProvider_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -68,8 +69,8 @@ func (c *identityProviderServiceClient) GetIdentityProvider(ctx context.Context,
 	return out, nil
 }
 
-func (c *identityProviderServiceClient) CreateIdentityProvider(ctx context.Context, in *CreateIdentityProviderRequest, opts ...grpc.CallOption) (*CreateIdentityProviderResponse, error) {
-	out := new(CreateIdentityProviderResponse)
+func (c *identityProviderServiceClient) CreateIdentityProvider(ctx context.Context, in *CreateIdentityProviderRequest, opts ...grpc.CallOption) (*IdentityProvider, error) {
+	out := new(IdentityProvider)
 	err := c.cc.Invoke(ctx, IdentityProviderService_CreateIdentityProvider_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -77,8 +78,8 @@ func (c *identityProviderServiceClient) CreateIdentityProvider(ctx context.Conte
 	return out, nil
 }
 
-func (c *identityProviderServiceClient) UpdateIdentityProvider(ctx context.Context, in *UpdateIdentityProviderRequest, opts ...grpc.CallOption) (*UpdateIdentityProviderResponse, error) {
-	out := new(UpdateIdentityProviderResponse)
+func (c *identityProviderServiceClient) UpdateIdentityProvider(ctx context.Context, in *UpdateIdentityProviderRequest, opts ...grpc.CallOption) (*IdentityProvider, error) {
+	out := new(IdentityProvider)
 	err := c.cc.Invoke(ctx, IdentityProviderService_UpdateIdentityProvider_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -86,8 +87,8 @@ func (c *identityProviderServiceClient) UpdateIdentityProvider(ctx context.Conte
 	return out, nil
 }
 
-func (c *identityProviderServiceClient) DeleteIdentityProvider(ctx context.Context, in *DeleteIdentityProviderRequest, opts ...grpc.CallOption) (*DeleteIdentityProviderResponse, error) {
-	out := new(DeleteIdentityProviderResponse)
+func (c *identityProviderServiceClient) DeleteIdentityProvider(ctx context.Context, in *DeleteIdentityProviderRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, IdentityProviderService_DeleteIdentityProvider_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -102,13 +103,13 @@ type IdentityProviderServiceServer interface {
 	// ListIdentityProviders lists identity providers.
 	ListIdentityProviders(context.Context, *ListIdentityProvidersRequest) (*ListIdentityProvidersResponse, error)
 	// GetIdentityProvider gets an identity provider.
-	GetIdentityProvider(context.Context, *GetIdentityProviderRequest) (*GetIdentityProviderResponse, error)
+	GetIdentityProvider(context.Context, *GetIdentityProviderRequest) (*IdentityProvider, error)
 	// CreateIdentityProvider creates an identity provider.
-	CreateIdentityProvider(context.Context, *CreateIdentityProviderRequest) (*CreateIdentityProviderResponse, error)
+	CreateIdentityProvider(context.Context, *CreateIdentityProviderRequest) (*IdentityProvider, error)
 	// UpdateIdentityProvider updates an identity provider.
-	UpdateIdentityProvider(context.Context, *UpdateIdentityProviderRequest) (*UpdateIdentityProviderResponse, error)
+	UpdateIdentityProvider(context.Context, *UpdateIdentityProviderRequest) (*IdentityProvider, error)
 	// DeleteIdentityProvider deletes an identity provider.
-	DeleteIdentityProvider(context.Context, *DeleteIdentityProviderRequest) (*DeleteIdentityProviderResponse, error)
+	DeleteIdentityProvider(context.Context, *DeleteIdentityProviderRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedIdentityProviderServiceServer()
 }
 
@@ -119,16 +120,16 @@ type UnimplementedIdentityProviderServiceServer struct {
 func (UnimplementedIdentityProviderServiceServer) ListIdentityProviders(context.Context, *ListIdentityProvidersRequest) (*ListIdentityProvidersResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListIdentityProviders not implemented")
 }
-func (UnimplementedIdentityProviderServiceServer) GetIdentityProvider(context.Context, *GetIdentityProviderRequest) (*GetIdentityProviderResponse, error) {
+func (UnimplementedIdentityProviderServiceServer) GetIdentityProvider(context.Context, *GetIdentityProviderRequest) (*IdentityProvider, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetIdentityProvider not implemented")
 }
-func (UnimplementedIdentityProviderServiceServer) CreateIdentityProvider(context.Context, *CreateIdentityProviderRequest) (*CreateIdentityProviderResponse, error) {
+func (UnimplementedIdentityProviderServiceServer) CreateIdentityProvider(context.Context, *CreateIdentityProviderRequest) (*IdentityProvider, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateIdentityProvider not implemented")
 }
-func (UnimplementedIdentityProviderServiceServer) UpdateIdentityProvider(context.Context, *UpdateIdentityProviderRequest) (*UpdateIdentityProviderResponse, error) {
+func (UnimplementedIdentityProviderServiceServer) UpdateIdentityProvider(context.Context, *UpdateIdentityProviderRequest) (*IdentityProvider, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateIdentityProvider not implemented")
 }
-func (UnimplementedIdentityProviderServiceServer) DeleteIdentityProvider(context.Context, *DeleteIdentityProviderRequest) (*DeleteIdentityProviderResponse, error) {
+func (UnimplementedIdentityProviderServiceServer) DeleteIdentityProvider(context.Context, *DeleteIdentityProviderRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteIdentityProvider not implemented")
 }
 func (UnimplementedIdentityProviderServiceServer) mustEmbedUnimplementedIdentityProviderServiceServer() {

proto/gen/api/v2/inbox_service_grpc.pb.go

@@ -11,6 +11,7 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -31,9 +32,9 @@ type InboxServiceClient interface {
 	// ListInboxes lists inboxes for a user.
 	ListInboxes(ctx context.Context, in *ListInboxesRequest, opts ...grpc.CallOption) (*ListInboxesResponse, error)
 	// UpdateInbox updates an inbox.
-	UpdateInbox(ctx context.Context, in *UpdateInboxRequest, opts ...grpc.CallOption) (*UpdateInboxResponse, error)
+	UpdateInbox(ctx context.Context, in *UpdateInboxRequest, opts ...grpc.CallOption) (*Inbox, error)
 	// DeleteInbox deletes an inbox.
-	DeleteInbox(ctx context.Context, in *DeleteInboxRequest, opts ...grpc.CallOption) (*DeleteInboxResponse, error)
+	DeleteInbox(ctx context.Context, in *DeleteInboxRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type inboxServiceClient struct {
@@ -53,8 +54,8 @@ func (c *inboxServiceClient) ListInboxes(ctx context.Context, in *ListInboxesReq
 	return out, nil
 }
 
-func (c *inboxServiceClient) UpdateInbox(ctx context.Context, in *UpdateInboxRequest, opts ...grpc.CallOption) (*UpdateInboxResponse, error) {
-	out := new(UpdateInboxResponse)
+func (c *inboxServiceClient) UpdateInbox(ctx context.Context, in *UpdateInboxRequest, opts ...grpc.CallOption) (*Inbox, error) {
+	out := new(Inbox)
 	err := c.cc.Invoke(ctx, InboxService_UpdateInbox_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -62,8 +63,8 @@ func (c *inboxServiceClient) UpdateInbox(ctx context.Context, in *UpdateInboxReq
 	return out, nil
 }
 
-func (c *inboxServiceClient) DeleteInbox(ctx context.Context, in *DeleteInboxRequest, opts ...grpc.CallOption) (*DeleteInboxResponse, error) {
-	out := new(DeleteInboxResponse)
+func (c *inboxServiceClient) DeleteInbox(ctx context.Context, in *DeleteInboxRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, InboxService_DeleteInbox_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -78,9 +79,9 @@ type InboxServiceServer interface {
 	// ListInboxes lists inboxes for a user.
 	ListInboxes(context.Context, *ListInboxesRequest) (*ListInboxesResponse, error)
 	// UpdateInbox updates an inbox.
-	UpdateInbox(context.Context, *UpdateInboxRequest) (*UpdateInboxResponse, error)
+	UpdateInbox(context.Context, *UpdateInboxRequest) (*Inbox, error)
 	// DeleteInbox deletes an inbox.
-	DeleteInbox(context.Context, *DeleteInboxRequest) (*DeleteInboxResponse, error)
+	DeleteInbox(context.Context, *DeleteInboxRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedInboxServiceServer()
 }
 
@@ -91,10 +92,10 @@ type UnimplementedInboxServiceServer struct {
 func (UnimplementedInboxServiceServer) ListInboxes(context.Context, *ListInboxesRequest) (*ListInboxesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListInboxes not implemented")
 }
-func (UnimplementedInboxServiceServer) UpdateInbox(context.Context, *UpdateInboxRequest) (*UpdateInboxResponse, error) {
+func (UnimplementedInboxServiceServer) UpdateInbox(context.Context, *UpdateInboxRequest) (*Inbox, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateInbox not implemented")
 }
-func (UnimplementedInboxServiceServer) DeleteInbox(context.Context, *DeleteInboxRequest) (*DeleteInboxResponse, error) {
+func (UnimplementedInboxServiceServer) DeleteInbox(context.Context, *DeleteInboxRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteInbox not implemented")
 }
 func (UnimplementedInboxServiceServer) mustEmbedUnimplementedInboxServiceServer() {}

proto/gen/api/v2/memo_service.pb.gw.go

@@ -587,7 +587,7 @@ func request_MemoService_CreateMemoComment_0(ctx context.Context, marshaler runt
 	var protoReq CreateMemoCommentRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Comment); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -617,7 +617,7 @@ func local_request_MemoService_CreateMemoComment_0(ctx context.Context, marshale
 	var protoReq CreateMemoCommentRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Comment); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 

proto/gen/api/v2/resource_service_grpc.pb.go

@@ -11,6 +11,7 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -32,17 +33,17 @@ const (
 // 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 ResourceServiceClient interface {
 	// CreateResource creates a new resource.
-	CreateResource(ctx context.Context, in *CreateResourceRequest, opts ...grpc.CallOption) (*CreateResourceResponse, error)
+	CreateResource(ctx context.Context, in *CreateResourceRequest, opts ...grpc.CallOption) (*Resource, error)
 	// ListResources lists all resources.
 	ListResources(ctx context.Context, in *ListResourcesRequest, opts ...grpc.CallOption) (*ListResourcesResponse, error)
 	// SearchResources searches memos.
 	SearchResources(ctx context.Context, in *SearchResourcesRequest, opts ...grpc.CallOption) (*SearchResourcesResponse, error)
 	// GetResource returns a resource by name.
-	GetResource(ctx context.Context, in *GetResourceRequest, opts ...grpc.CallOption) (*GetResourceResponse, error)
+	GetResource(ctx context.Context, in *GetResourceRequest, opts ...grpc.CallOption) (*Resource, error)
 	// UpdateResource updates a resource.
-	UpdateResource(ctx context.Context, in *UpdateResourceRequest, opts ...grpc.CallOption) (*UpdateResourceResponse, error)
+	UpdateResource(ctx context.Context, in *UpdateResourceRequest, opts ...grpc.CallOption) (*Resource, error)
 	// DeleteResource deletes a resource by name.
-	DeleteResource(ctx context.Context, in *DeleteResourceRequest, opts ...grpc.CallOption) (*DeleteResourceResponse, error)
+	DeleteResource(ctx context.Context, in *DeleteResourceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type resourceServiceClient struct {
@@ -53,8 +54,8 @@ func NewResourceServiceClient(cc grpc.ClientConnInterface) ResourceServiceClient
 	return &resourceServiceClient{cc}
 }
 
-func (c *resourceServiceClient) CreateResource(ctx context.Context, in *CreateResourceRequest, opts ...grpc.CallOption) (*CreateResourceResponse, error) {
-	out := new(CreateResourceResponse)
+func (c *resourceServiceClient) CreateResource(ctx context.Context, in *CreateResourceRequest, opts ...grpc.CallOption) (*Resource, error) {
+	out := new(Resource)
 	err := c.cc.Invoke(ctx, ResourceService_CreateResource_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -80,8 +81,8 @@ func (c *resourceServiceClient) SearchResources(ctx context.Context, in *SearchR
 	return out, nil
 }
 
-func (c *resourceServiceClient) GetResource(ctx context.Context, in *GetResourceRequest, opts ...grpc.CallOption) (*GetResourceResponse, error) {
-	out := new(GetResourceResponse)
+func (c *resourceServiceClient) GetResource(ctx context.Context, in *GetResourceRequest, opts ...grpc.CallOption) (*Resource, error) {
+	out := new(Resource)
 	err := c.cc.Invoke(ctx, ResourceService_GetResource_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -89,8 +90,8 @@ func (c *resourceServiceClient) GetResource(ctx context.Context, in *GetResource
 	return out, nil
 }
 
-func (c *resourceServiceClient) UpdateResource(ctx context.Context, in *UpdateResourceRequest, opts ...grpc.CallOption) (*UpdateResourceResponse, error) {
-	out := new(UpdateResourceResponse)
+func (c *resourceServiceClient) UpdateResource(ctx context.Context, in *UpdateResourceRequest, opts ...grpc.CallOption) (*Resource, error) {
+	out := new(Resource)
 	err := c.cc.Invoke(ctx, ResourceService_UpdateResource_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -98,8 +99,8 @@ func (c *resourceServiceClient) UpdateResource(ctx context.Context, in *UpdateRe
 	return out, nil
 }
 
-func (c *resourceServiceClient) DeleteResource(ctx context.Context, in *DeleteResourceRequest, opts ...grpc.CallOption) (*DeleteResourceResponse, error) {
-	out := new(DeleteResourceResponse)
+func (c *resourceServiceClient) DeleteResource(ctx context.Context, in *DeleteResourceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, ResourceService_DeleteResource_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -112,17 +113,17 @@ func (c *resourceServiceClient) DeleteResource(ctx context.Context, in *DeleteRe
 // for forward compatibility
 type ResourceServiceServer interface {
 	// CreateResource creates a new resource.
-	CreateResource(context.Context, *CreateResourceRequest) (*CreateResourceResponse, error)
+	CreateResource(context.Context, *CreateResourceRequest) (*Resource, error)
 	// ListResources lists all resources.
 	ListResources(context.Context, *ListResourcesRequest) (*ListResourcesResponse, error)
 	// SearchResources searches memos.
 	SearchResources(context.Context, *SearchResourcesRequest) (*SearchResourcesResponse, error)
 	// GetResource returns a resource by name.
-	GetResource(context.Context, *GetResourceRequest) (*GetResourceResponse, error)
+	GetResource(context.Context, *GetResourceRequest) (*Resource, error)
 	// UpdateResource updates a resource.
-	UpdateResource(context.Context, *UpdateResourceRequest) (*UpdateResourceResponse, error)
+	UpdateResource(context.Context, *UpdateResourceRequest) (*Resource, error)
 	// DeleteResource deletes a resource by name.
-	DeleteResource(context.Context, *DeleteResourceRequest) (*DeleteResourceResponse, error)
+	DeleteResource(context.Context, *DeleteResourceRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedResourceServiceServer()
 }
 
@@ -130,7 +131,7 @@ type ResourceServiceServer interface {
 type UnimplementedResourceServiceServer struct {
 }
 
-func (UnimplementedResourceServiceServer) CreateResource(context.Context, *CreateResourceRequest) (*CreateResourceResponse, error) {
+func (UnimplementedResourceServiceServer) CreateResource(context.Context, *CreateResourceRequest) (*Resource, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateResource not implemented")
 }
 func (UnimplementedResourceServiceServer) ListResources(context.Context, *ListResourcesRequest) (*ListResourcesResponse, error) {
@@ -139,13 +140,13 @@ func (UnimplementedResourceServiceServer) ListResources(context.Context, *ListRe
 func (UnimplementedResourceServiceServer) SearchResources(context.Context, *SearchResourcesRequest) (*SearchResourcesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SearchResources not implemented")
 }
-func (UnimplementedResourceServiceServer) GetResource(context.Context, *GetResourceRequest) (*GetResourceResponse, error) {
+func (UnimplementedResourceServiceServer) GetResource(context.Context, *GetResourceRequest) (*Resource, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetResource not implemented")
 }
-func (UnimplementedResourceServiceServer) UpdateResource(context.Context, *UpdateResourceRequest) (*UpdateResourceResponse, error) {
+func (UnimplementedResourceServiceServer) UpdateResource(context.Context, *UpdateResourceRequest) (*Resource, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateResource not implemented")
 }
-func (UnimplementedResourceServiceServer) DeleteResource(context.Context, *DeleteResourceRequest) (*DeleteResourceResponse, error) {
+func (UnimplementedResourceServiceServer) DeleteResource(context.Context, *DeleteResourceRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteResource not implemented")
 }
 func (UnimplementedResourceServiceServer) mustEmbedUnimplementedResourceServiceServer() {}

proto/gen/api/v2/workspace_service.pb.go

@@ -126,53 +126,6 @@ func (*GetWorkspaceProfileRequest) Descriptor() ([]byte, []int) {
 	return file_api_v2_workspace_service_proto_rawDescGZIP(), []int{1}
 }
 
-type GetWorkspaceProfileResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	WorkspaceProfile *WorkspaceProfile `protobuf:"bytes,1,opt,name=workspace_profile,json=workspaceProfile,proto3" json:"workspace_profile,omitempty"`
-}
-
-func (x *GetWorkspaceProfileResponse) Reset() {
-	*x = GetWorkspaceProfileResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_v2_workspace_service_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GetWorkspaceProfileResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetWorkspaceProfileResponse) ProtoMessage() {}
-
-func (x *GetWorkspaceProfileResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_api_v2_workspace_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 GetWorkspaceProfileResponse.ProtoReflect.Descriptor instead.
-func (*GetWorkspaceProfileResponse) Descriptor() ([]byte, []int) {
-	return file_api_v2_workspace_service_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *GetWorkspaceProfileResponse) GetWorkspaceProfile() *WorkspaceProfile {
-	if x != nil {
-		return x.WorkspaceProfile
-	}
-	return nil
-}
-
 var File_api_v2_workspace_service_proto protoreflect.FileDescriptor
 
 var file_api_v2_workspace_service_proto_rawDesc = []byte{
@@ -188,35 +141,28 @@ var file_api_v2_workspace_service_proto_rawDesc = []byte{
 	0x12, 0x12, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
 	0x6d, 0x6f, 0x64, 0x65, 0x22, 0x1c, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73,
 	0x70, 0x61, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x22, 0x6a, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x4b, 0x0a, 0x11, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x70,
-	0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d,
-	0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x57, 0x6f, 0x72, 0x6b,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x52, 0x10, 0x77, 0x6f,
-	0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x32, 0xa2,
-	0x01, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x8d, 0x01, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x28, 0x2e, 0x6d, 0x65,
-	0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x57, 0x6f,
-	0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x12, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
-	0x32, 0x2f, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x66,
-	0x69, 0x6c, 0x65, 0x42, 0xad, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,
-	0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x15, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70,
-	0x61, 0x63, 0x65, 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,
+	0x73, 0x74, 0x32, 0x97, 0x01, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x82, 0x01, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x57,
+	0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12,
+	0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47,
+	0x65, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69,
+	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6d, 0x65, 0x6d, 0x6f,
+	0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x1b, 0x12, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x77, 0x6f, 0x72, 0x6b, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0xad, 0x01, 0x0a,
+	0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x42, 0x15, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 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 (
@@ -231,21 +177,19 @@ func file_api_v2_workspace_service_proto_rawDescGZIP() []byte {
 	return file_api_v2_workspace_service_proto_rawDescData
 }
 
-var file_api_v2_workspace_service_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_api_v2_workspace_service_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_api_v2_workspace_service_proto_goTypes = []interface{}{
-	(*WorkspaceProfile)(nil),            // 0: memos.api.v2.WorkspaceProfile
-	(*GetWorkspaceProfileRequest)(nil),  // 1: memos.api.v2.GetWorkspaceProfileRequest
-	(*GetWorkspaceProfileResponse)(nil), // 2: memos.api.v2.GetWorkspaceProfileResponse
+	(*WorkspaceProfile)(nil),           // 0: memos.api.v2.WorkspaceProfile
+	(*GetWorkspaceProfileRequest)(nil), // 1: memos.api.v2.GetWorkspaceProfileRequest
 }
 var file_api_v2_workspace_service_proto_depIdxs = []int32{
-	0, // 0: memos.api.v2.GetWorkspaceProfileResponse.workspace_profile:type_name -> memos.api.v2.WorkspaceProfile
-	1, // 1: memos.api.v2.WorkspaceService.GetWorkspaceProfile:input_type -> memos.api.v2.GetWorkspaceProfileRequest
-	2, // 2: memos.api.v2.WorkspaceService.GetWorkspaceProfile:output_type -> memos.api.v2.GetWorkspaceProfileResponse
-	2, // [2:3] is the sub-list for method output_type
-	1, // [1:2] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	1, // 0: memos.api.v2.WorkspaceService.GetWorkspaceProfile:input_type -> memos.api.v2.GetWorkspaceProfileRequest
+	0, // 1: memos.api.v2.WorkspaceService.GetWorkspaceProfile:output_type -> memos.api.v2.WorkspaceProfile
+	1, // [1:2] is the sub-list for method output_type
+	0, // [0:1] 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_workspace_service_proto_init() }
@@ -278,18 +222,6 @@ func file_api_v2_workspace_service_proto_init() {
 				return nil
 			}
 		}
-		file_api_v2_workspace_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetWorkspaceProfileResponse); 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{
@@ -297,7 +229,7 @@ func file_api_v2_workspace_service_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_api_v2_workspace_service_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

proto/gen/api/v2/workspace_service_grpc.pb.go

@@ -27,7 +27,7 @@ const (
 // 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 WorkspaceServiceClient interface {
 	// GetWorkspaceProfile returns the workspace profile.
-	GetWorkspaceProfile(ctx context.Context, in *GetWorkspaceProfileRequest, opts ...grpc.CallOption) (*GetWorkspaceProfileResponse, error)
+	GetWorkspaceProfile(ctx context.Context, in *GetWorkspaceProfileRequest, opts ...grpc.CallOption) (*WorkspaceProfile, error)
 }
 
 type workspaceServiceClient struct {
@@ -38,8 +38,8 @@ func NewWorkspaceServiceClient(cc grpc.ClientConnInterface) WorkspaceServiceClie
 	return &workspaceServiceClient{cc}
 }
 
-func (c *workspaceServiceClient) GetWorkspaceProfile(ctx context.Context, in *GetWorkspaceProfileRequest, opts ...grpc.CallOption) (*GetWorkspaceProfileResponse, error) {
-	out := new(GetWorkspaceProfileResponse)
+func (c *workspaceServiceClient) GetWorkspaceProfile(ctx context.Context, in *GetWorkspaceProfileRequest, opts ...grpc.CallOption) (*WorkspaceProfile, error) {
+	out := new(WorkspaceProfile)
 	err := c.cc.Invoke(ctx, WorkspaceService_GetWorkspaceProfile_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -52,7 +52,7 @@ func (c *workspaceServiceClient) GetWorkspaceProfile(ctx context.Context, in *Ge
 // for forward compatibility
 type WorkspaceServiceServer interface {
 	// GetWorkspaceProfile returns the workspace profile.
-	GetWorkspaceProfile(context.Context, *GetWorkspaceProfileRequest) (*GetWorkspaceProfileResponse, error)
+	GetWorkspaceProfile(context.Context, *GetWorkspaceProfileRequest) (*WorkspaceProfile, error)
 	mustEmbedUnimplementedWorkspaceServiceServer()
 }
 
@@ -60,7 +60,7 @@ type WorkspaceServiceServer interface {
 type UnimplementedWorkspaceServiceServer struct {
 }
 
-func (UnimplementedWorkspaceServiceServer) GetWorkspaceProfile(context.Context, *GetWorkspaceProfileRequest) (*GetWorkspaceProfileResponse, error) {
+func (UnimplementedWorkspaceServiceServer) GetWorkspaceProfile(context.Context, *GetWorkspaceProfileRequest) (*WorkspaceProfile, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetWorkspaceProfile not implemented")
 }
 func (UnimplementedWorkspaceServiceServer) mustEmbedUnimplementedWorkspaceServiceServer() {}

server/route/api/v2/activity_service.go

@@ -13,7 +13,7 @@ import (
 	"github.com/usememos/memos/store"
 )
 
-func (s *APIV2Service) GetActivity(ctx context.Context, request *apiv2pb.GetActivityRequest) (*apiv2pb.GetActivityResponse, error) {
+func (s *APIV2Service) GetActivity(ctx context.Context, request *apiv2pb.GetActivityRequest) (*apiv2pb.Activity, error) {
 	activity, err := s.Store.GetActivity(ctx, &store.FindActivity{
 		ID: &request.Id,
 	})
@@ -25,9 +25,7 @@ func (s *APIV2Service) GetActivity(ctx context.Context, request *apiv2pb.GetActi
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to convert activity from store: %v", err)
 	}
-	return &apiv2pb.GetActivityResponse{
-		Activity: activityMessage,
-	}, nil
+	return activityMessage, nil
 }
 
 func (*APIV2Service) convertActivityFromStore(_ context.Context, activity *store.Activity) (*apiv2pb.Activity, error) {

server/route/api/v2/auth_service.go

@@ -13,6 +13,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 
 	"github.com/usememos/memos/internal/util"
 	"github.com/usememos/memos/plugin/idp"
@@ -23,7 +24,7 @@ import (
 	"github.com/usememos/memos/store"
 )
 
-func (s *APIV2Service) GetAuthStatus(ctx context.Context, _ *apiv2pb.GetAuthStatusRequest) (*apiv2pb.GetAuthStatusResponse, error) {
+func (s *APIV2Service) GetAuthStatus(ctx context.Context, _ *apiv2pb.GetAuthStatusRequest) (*apiv2pb.User, error) {
 	user, err := getCurrentUser(ctx, s.Store)
 	if err != nil {
 		return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@@ -35,12 +36,10 @@ func (s *APIV2Service) GetAuthStatus(ctx context.Context, _ *apiv2pb.GetAuthStat
 		}
 		return nil, status.Errorf(codes.Unauthenticated, "user not found")
 	}
-	return &apiv2pb.GetAuthStatusResponse{
-		User: convertUserFromStore(user),
-	}, nil
+	return convertUserFromStore(user), nil
 }
 
-func (s *APIV2Service) SignIn(ctx context.Context, request *apiv2pb.SignInRequest) (*apiv2pb.SignInResponse, error) {
+func (s *APIV2Service) SignIn(ctx context.Context, request *apiv2pb.SignInRequest) (*apiv2pb.User, error) {
 	user, err := s.Store.GetUser(ctx, &store.FindUser{
 		Username: &request.Username,
 	})
@@ -66,12 +65,10 @@ func (s *APIV2Service) SignIn(ctx context.Context, request *apiv2pb.SignInReques
 	if err := s.doSignIn(ctx, user, expireTime); err != nil {
 		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to sign in, err: %s", err))
 	}
-	return &apiv2pb.SignInResponse{
-		User: convertUserFromStore(user),
-	}, nil
+	return convertUserFromStore(user), nil
 }
 
-func (s *APIV2Service) SignInWithSSO(ctx context.Context, request *apiv2pb.SignInWithSSORequest) (*apiv2pb.SignInWithSSOResponse, error) {
+func (s *APIV2Service) SignInWithSSO(ctx context.Context, request *apiv2pb.SignInWithSSORequest) (*apiv2pb.User, error) {
 	identityProvider, err := s.Store.GetIdentityProvider(ctx, &store.FindIdentityProvider{
 		ID: &request.IdpId,
 	})
@@ -144,9 +141,7 @@ func (s *APIV2Service) SignInWithSSO(ctx context.Context, request *apiv2pb.SignI
 	if err := s.doSignIn(ctx, user, time.Now().Add(auth.AccessTokenDuration)); err != nil {
 		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to sign in, err: %s", err))
 	}
-	return &apiv2pb.SignInWithSSOResponse{
-		User: convertUserFromStore(user),
-	}, nil
+	return convertUserFromStore(user), nil
 }
 
 func (s *APIV2Service) doSignIn(ctx context.Context, user *store.User, expireTime time.Time) error {
@@ -171,7 +166,7 @@ func (s *APIV2Service) doSignIn(ctx context.Context, user *store.User, expireTim
 	return nil
 }
 
-func (s *APIV2Service) SignUp(ctx context.Context, request *apiv2pb.SignUpRequest) (*apiv2pb.SignUpResponse, error) {
+func (s *APIV2Service) SignUp(ctx context.Context, request *apiv2pb.SignUpRequest) (*apiv2pb.User, error) {
 	workspaceGeneralSetting, err := s.Store.GetWorkspaceGeneralSetting(ctx)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to get workspace setting, err: %s", err))
@@ -216,16 +211,14 @@ func (s *APIV2Service) SignUp(ctx context.Context, request *apiv2pb.SignUpReques
 	if err := s.doSignIn(ctx, user, time.Now().Add(auth.AccessTokenDuration)); err != nil {
 		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to sign in, err: %s", err))
 	}
-	return &apiv2pb.SignUpResponse{
-		User: convertUserFromStore(user),
-	}, nil
+	return convertUserFromStore(user), nil
 }
 
-func (s *APIV2Service) SignOut(ctx context.Context, _ *apiv2pb.SignOutRequest) (*apiv2pb.SignOutResponse, error) {
+func (s *APIV2Service) SignOut(ctx context.Context, _ *apiv2pb.SignOutRequest) (*emptypb.Empty, error) {
 	if err := s.clearAccessTokenCookie(ctx); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to set grpc header, error: %v", err)
 	}
-	return &apiv2pb.SignOutResponse{}, nil
+	return &emptypb.Empty{}, nil
 }
 
 func (s *APIV2Service) clearAccessTokenCookie(ctx context.Context) error {

server/route/api/v2/idp_service.go

@@ -6,13 +6,14 @@ import (
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 
 	apiv2pb "github.com/usememos/memos/proto/gen/api/v2"
 	storepb "github.com/usememos/memos/proto/gen/store"
 	"github.com/usememos/memos/store"
 )
 
-func (s *APIV2Service) CreateIdentityProvider(ctx context.Context, request *apiv2pb.CreateIdentityProviderRequest) (*apiv2pb.CreateIdentityProviderResponse, error) {
+func (s *APIV2Service) CreateIdentityProvider(ctx context.Context, request *apiv2pb.CreateIdentityProviderRequest) (*apiv2pb.IdentityProvider, error) {
 	currentUser, err := getCurrentUser(ctx, s.Store)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get user: %v", err)
@@ -25,9 +26,7 @@ func (s *APIV2Service) CreateIdentityProvider(ctx context.Context, request *apiv
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to create identity provider, error: %+v", err)
 	}
-	return &apiv2pb.CreateIdentityProviderResponse{
-		IdentityProvider: convertIdentityProviderFromStore(identityProvider),
-	}, nil
+	return convertIdentityProviderFromStore(identityProvider), nil
 }
 
 func (s *APIV2Service) ListIdentityProviders(ctx context.Context, _ *apiv2pb.ListIdentityProvidersRequest) (*apiv2pb.ListIdentityProvidersResponse, error) {
@@ -45,7 +44,7 @@ func (s *APIV2Service) ListIdentityProviders(ctx context.Context, _ *apiv2pb.Lis
 	return response, nil
 }
 
-func (s *APIV2Service) GetIdentityProvider(ctx context.Context, request *apiv2pb.GetIdentityProviderRequest) (*apiv2pb.GetIdentityProviderResponse, error) {
+func (s *APIV2Service) GetIdentityProvider(ctx context.Context, request *apiv2pb.GetIdentityProviderRequest) (*apiv2pb.IdentityProvider, error) {
 	id, err := ExtractIdentityProviderIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid identity provider name: %v", err)
@@ -59,12 +58,10 @@ func (s *APIV2Service) GetIdentityProvider(ctx context.Context, request *apiv2pb
 	if identityProvider == nil {
 		return nil, status.Errorf(codes.NotFound, "identity provider not found")
 	}
-	return &apiv2pb.GetIdentityProviderResponse{
-		IdentityProvider: convertIdentityProviderFromStore(identityProvider),
-	}, nil
+	return convertIdentityProviderFromStore(identityProvider), nil
 }
 
-func (s *APIV2Service) UpdateIdentityProvider(ctx context.Context, request *apiv2pb.UpdateIdentityProviderRequest) (*apiv2pb.UpdateIdentityProviderResponse, error) {
+func (s *APIV2Service) UpdateIdentityProvider(ctx context.Context, request *apiv2pb.UpdateIdentityProviderRequest) (*apiv2pb.IdentityProvider, error) {
 	if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
 		return nil, status.Errorf(codes.InvalidArgument, "update_mask is required")
 	}
@@ -90,12 +87,10 @@ func (s *APIV2Service) UpdateIdentityProvider(ctx context.Context, request *apiv
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to update identity provider, error: %+v", err)
 	}
-	return &apiv2pb.UpdateIdentityProviderResponse{
-		IdentityProvider: convertIdentityProviderFromStore(identityProvider),
-	}, nil
+	return convertIdentityProviderFromStore(identityProvider), nil
 }
 
-func (s *APIV2Service) DeleteIdentityProvider(ctx context.Context, request *apiv2pb.DeleteIdentityProviderRequest) (*apiv2pb.DeleteIdentityProviderResponse, error) {
+func (s *APIV2Service) DeleteIdentityProvider(ctx context.Context, request *apiv2pb.DeleteIdentityProviderRequest) (*emptypb.Empty, error) {
 	id, err := ExtractIdentityProviderIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid identity provider name: %v", err)
@@ -103,7 +98,7 @@ func (s *APIV2Service) DeleteIdentityProvider(ctx context.Context, request *apiv
 	if err := s.Store.DeleteIdentityProvider(ctx, &store.DeleteIdentityProvider{ID: id}); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to delete identity provider, error: %+v", err)
 	}
-	return &apiv2pb.DeleteIdentityProviderResponse{}, nil
+	return &emptypb.Empty{}, nil
 }
 
 func convertIdentityProviderFromStore(identityProvider *storepb.IdentityProvider) *apiv2pb.IdentityProvider {

server/route/api/v2/inbox_service.go

@@ -7,6 +7,7 @@ import (
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	apiv2pb "github.com/usememos/memos/proto/gen/api/v2"
@@ -36,7 +37,7 @@ func (s *APIV2Service) ListInboxes(ctx context.Context, _ *apiv2pb.ListInboxesRe
 	return response, nil
 }
 
-func (s *APIV2Service) UpdateInbox(ctx context.Context, request *apiv2pb.UpdateInboxRequest) (*apiv2pb.UpdateInboxResponse, error) {
+func (s *APIV2Service) UpdateInbox(ctx context.Context, request *apiv2pb.UpdateInboxRequest) (*apiv2pb.Inbox, error) {
 	if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
 		return nil, status.Errorf(codes.InvalidArgument, "update mask is required")
 	}
@@ -62,12 +63,10 @@ func (s *APIV2Service) UpdateInbox(ctx context.Context, request *apiv2pb.UpdateI
 		return nil, status.Errorf(codes.Internal, "failed to update inbox: %v", err)
 	}
 
-	return &apiv2pb.UpdateInboxResponse{
-		Inbox: convertInboxFromStore(inbox),
-	}, nil
+	return convertInboxFromStore(inbox), nil
 }
 
-func (s *APIV2Service) DeleteInbox(ctx context.Context, request *apiv2pb.DeleteInboxRequest) (*apiv2pb.DeleteInboxResponse, error) {
+func (s *APIV2Service) DeleteInbox(ctx context.Context, request *apiv2pb.DeleteInboxRequest) (*emptypb.Empty, error) {
 	inboxID, err := ExtractInboxIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid inbox name: %v", err)
@@ -78,7 +77,7 @@ func (s *APIV2Service) DeleteInbox(ctx context.Context, request *apiv2pb.DeleteI
 	}); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to update inbox: %v", err)
 	}
-	return &apiv2pb.DeleteInboxResponse{}, nil
+	return &emptypb.Empty{}, nil
 }
 
 func convertInboxFromStore(inbox *store.Inbox) *apiv2pb.Inbox {

server/route/api/v2/memo_relation_service.go

@@ -6,12 +6,13 @@ import (
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 
 	apiv2pb "github.com/usememos/memos/proto/gen/api/v2"
 	"github.com/usememos/memos/store"
 )
 
-func (s *APIV2Service) SetMemoRelations(ctx context.Context, request *apiv2pb.SetMemoRelationsRequest) (*apiv2pb.SetMemoRelationsResponse, error) {
+func (s *APIV2Service) SetMemoRelations(ctx context.Context, request *apiv2pb.SetMemoRelationsRequest) (*emptypb.Empty, error) {
 	id, err := ExtractMemoIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid memo name: %v", err)
@@ -48,7 +49,7 @@ func (s *APIV2Service) SetMemoRelations(ctx context.Context, request *apiv2pb.Se
 		}
 	}
 
-	return &apiv2pb.SetMemoRelationsResponse{}, nil
+	return &emptypb.Empty{}, nil
 }
 
 func (s *APIV2Service) ListMemoRelations(ctx context.Context, request *apiv2pb.ListMemoRelationsRequest) (*apiv2pb.ListMemoRelationsResponse, error) {

server/route/api/v2/memo_resource_service.go

@@ -7,12 +7,13 @@ import (
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 
 	apiv2pb "github.com/usememos/memos/proto/gen/api/v2"
 	"github.com/usememos/memos/store"
 )
 
-func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.SetMemoResourcesRequest) (*apiv2pb.SetMemoResourcesResponse, error) {
+func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.SetMemoResourcesRequest) (*emptypb.Empty, error) {
 	memoID, err := ExtractMemoIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid memo name: %v", err)
@@ -60,7 +61,7 @@ func (s *APIV2Service) SetMemoResources(ctx context.Context, request *apiv2pb.Se
 		}
 	}
 
-	return &apiv2pb.SetMemoResourcesResponse{}, nil
+	return &emptypb.Empty{}, nil
 }
 
 func (s *APIV2Service) ListMemoResources(ctx context.Context, request *apiv2pb.ListMemoResourcesRequest) (*apiv2pb.ListMemoResourcesResponse, error) {

server/route/api/v2/memo_service.go

@@ -14,6 +14,7 @@ import (
 	expr "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/usememos/memos/internal/util"
@@ -29,7 +30,7 @@ const (
 	ChunkSize        = 64 * 1024 // 64 KiB
 )
 
-func (s *APIV2Service) CreateMemo(ctx context.Context, request *apiv2pb.CreateMemoRequest) (*apiv2pb.CreateMemoResponse, error) {
+func (s *APIV2Service) CreateMemo(ctx context.Context, request *apiv2pb.CreateMemoRequest) (*apiv2pb.Memo, error) {
 	user, err := getCurrentUser(ctx, s.Store)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get user")
@@ -69,10 +70,7 @@ func (s *APIV2Service) CreateMemo(ctx context.Context, request *apiv2pb.CreateMe
 		slog.Warn("Failed to dispatch memo created webhook", err)
 	}
 
-	response := &apiv2pb.CreateMemoResponse{
-		Memo: memoMessage,
-	}
-	return response, nil
+	return memoMessage, nil
 }
 
 func (s *APIV2Service) ListMemos(ctx context.Context, request *apiv2pb.ListMemosRequest) (*apiv2pb.ListMemosResponse, error) {
@@ -162,7 +160,7 @@ func (s *APIV2Service) SearchMemos(ctx context.Context, request *apiv2pb.SearchM
 	return response, nil
 }
 
-func (s *APIV2Service) GetMemo(ctx context.Context, request *apiv2pb.GetMemoRequest) (*apiv2pb.GetMemoResponse, error) {
+func (s *APIV2Service) GetMemo(ctx context.Context, request *apiv2pb.GetMemoRequest) (*apiv2pb.Memo, error) {
 	id, err := ExtractMemoIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid memo name: %v", err)
@@ -193,13 +191,10 @@ func (s *APIV2Service) GetMemo(ctx context.Context, request *apiv2pb.GetMemoRequ
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to convert memo")
 	}
-	response := &apiv2pb.GetMemoResponse{
-		Memo: memoMessage,
-	}
-	return response, nil
+	return memoMessage, nil
 }
 
-func (s *APIV2Service) UpdateMemo(ctx context.Context, request *apiv2pb.UpdateMemoRequest) (*apiv2pb.UpdateMemoResponse, error) {
+func (s *APIV2Service) UpdateMemo(ctx context.Context, request *apiv2pb.UpdateMemoRequest) (*apiv2pb.Memo, error) {
 	id, err := ExtractMemoIDFromName(request.Memo.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid memo name: %v", err)
@@ -283,12 +278,10 @@ func (s *APIV2Service) UpdateMemo(ctx context.Context, request *apiv2pb.UpdateMe
 		slog.Warn("Failed to dispatch memo updated webhook", err)
 	}
 
-	return &apiv2pb.UpdateMemoResponse{
-		Memo: memoMessage,
-	}, nil
+	return memoMessage, nil
 }
 
-func (s *APIV2Service) DeleteMemo(ctx context.Context, request *apiv2pb.DeleteMemoRequest) (*apiv2pb.DeleteMemoResponse, error) {
+func (s *APIV2Service) DeleteMemo(ctx context.Context, request *apiv2pb.DeleteMemoRequest) (*emptypb.Empty, error) {
 	id, err := ExtractMemoIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid memo name: %v", err)
@@ -319,10 +312,10 @@ func (s *APIV2Service) DeleteMemo(ctx context.Context, request *apiv2pb.DeleteMe
 		return nil, status.Errorf(codes.Internal, "failed to delete memo")
 	}
 
-	return &apiv2pb.DeleteMemoResponse{}, nil
+	return &emptypb.Empty{}, nil
 }
 
-func (s *APIV2Service) CreateMemoComment(ctx context.Context, request *apiv2pb.CreateMemoCommentRequest) (*apiv2pb.CreateMemoCommentResponse, error) {
+func (s *APIV2Service) CreateMemoComment(ctx context.Context, request *apiv2pb.CreateMemoCommentRequest) (*apiv2pb.Memo, error) {
 	id, err := ExtractMemoIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid memo name: %v", err)
@@ -333,13 +326,12 @@ func (s *APIV2Service) CreateMemoComment(ctx context.Context, request *apiv2pb.C
 	}
 
 	// Create the comment memo first.
-	createMemoResponse, err := s.CreateMemo(ctx, request.Comment)
+	memo, err := s.CreateMemo(ctx, request.Comment)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to create memo")
 	}
 
 	// Build the relation between the comment memo and the original memo.
-	memo := createMemoResponse.Memo
 	memoID, err := ExtractMemoIDFromName(memo.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid memo name: %v", err)
@@ -384,10 +376,7 @@ func (s *APIV2Service) CreateMemoComment(ctx context.Context, request *apiv2pb.C
 		}
 	}
 
-	response := &apiv2pb.CreateMemoCommentResponse{
-		Memo: memo,
-	}
-	return response, nil
+	return memo, nil
 }
 
 func (s *APIV2Service) ListMemoComments(ctx context.Context, request *apiv2pb.ListMemoCommentsRequest) (*apiv2pb.ListMemoCommentsResponse, error) {

server/route/api/v2/reaction_service.go

@@ -6,6 +6,7 @@ import (
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 
 	apiv2pb "github.com/usememos/memos/proto/gen/api/v2"
 	storepb "github.com/usememos/memos/proto/gen/store"
@@ -33,7 +34,7 @@ func (s *APIV2Service) ListMemoReactions(ctx context.Context, request *apiv2pb.L
 	return response, nil
 }
 
-func (s *APIV2Service) UpsertMemoReaction(ctx context.Context, request *apiv2pb.UpsertMemoReactionRequest) (*apiv2pb.UpsertMemoReactionResponse, error) {
+func (s *APIV2Service) UpsertMemoReaction(ctx context.Context, request *apiv2pb.UpsertMemoReactionRequest) (*apiv2pb.Reaction, error) {
 	user, err := getCurrentUser(ctx, s.Store)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get current user")
@@ -51,19 +52,17 @@ func (s *APIV2Service) UpsertMemoReaction(ctx context.Context, request *apiv2pb.
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to convert reaction")
 	}
-	return &apiv2pb.UpsertMemoReactionResponse{
-		Reaction: reactionMessage,
-	}, nil
+	return reactionMessage, nil
 }
 
-func (s *APIV2Service) DeleteMemoReaction(ctx context.Context, request *apiv2pb.DeleteMemoReactionRequest) (*apiv2pb.DeleteMemoReactionResponse, error) {
+func (s *APIV2Service) DeleteMemoReaction(ctx context.Context, request *apiv2pb.DeleteMemoReactionRequest) (*emptypb.Empty, error) {
 	if err := s.Store.DeleteReaction(ctx, &store.DeleteReaction{
 		ID: request.ReactionId,
 	}); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to delete reaction")
 	}
 
-	return &apiv2pb.DeleteMemoReactionResponse{}, nil
+	return &emptypb.Empty{}, nil
 }
 
 func (s *APIV2Service) convertReactionFromStore(ctx context.Context, reaction *store.Reaction) (*apiv2pb.Reaction, error) {

server/route/api/v2/resource_service.go

@@ -18,6 +18,7 @@ import (
 	expr "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/usememos/memos/internal/util"
@@ -35,7 +36,7 @@ const (
 	MebiByte                 = 1024 * 1024
 )
 
-func (s *APIV2Service) CreateResource(ctx context.Context, request *apiv2pb.CreateResourceRequest) (*apiv2pb.CreateResourceResponse, error) {
+func (s *APIV2Service) CreateResource(ctx context.Context, request *apiv2pb.CreateResourceRequest) (*apiv2pb.Resource, error) {
 	user, err := getCurrentUser(ctx, s.Store)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err)
@@ -89,9 +90,7 @@ func (s *APIV2Service) CreateResource(ctx context.Context, request *apiv2pb.Crea
 		return nil, status.Errorf(codes.Internal, "failed to create resource: %v", err)
 	}
 
-	return &apiv2pb.CreateResourceResponse{
-		Resource: s.convertResourceFromStore(ctx, resource),
-	}, nil
+	return s.convertResourceFromStore(ctx, resource), nil
 }
 
 func (s *APIV2Service) ListResources(ctx context.Context, _ *apiv2pb.ListResourcesRequest) (*apiv2pb.ListResourcesResponse, error) {
@@ -142,7 +141,7 @@ func (s *APIV2Service) SearchResources(ctx context.Context, request *apiv2pb.Sea
 	return response, nil
 }
 
-func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetResourceRequest) (*apiv2pb.GetResourceResponse, error) {
+func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetResourceRequest) (*apiv2pb.Resource, error) {
 	id, err := ExtractResourceIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid resource id: %v", err)
@@ -157,12 +156,10 @@ func (s *APIV2Service) GetResource(ctx context.Context, request *apiv2pb.GetReso
 		return nil, status.Errorf(codes.NotFound, "resource not found")
 	}
 
-	return &apiv2pb.GetResourceResponse{
-		Resource: s.convertResourceFromStore(ctx, resource),
-	}, nil
+	return s.convertResourceFromStore(ctx, resource), nil
 }
 
-func (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.UpdateResourceRequest) (*apiv2pb.UpdateResourceResponse, error) {
+func (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.UpdateResourceRequest) (*apiv2pb.Resource, error) {
 	id, err := ExtractResourceIDFromName(request.Resource.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid resource id: %v", err)
@@ -195,12 +192,10 @@ func (s *APIV2Service) UpdateResource(ctx context.Context, request *apiv2pb.Upda
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to update resource: %v", err)
 	}
-	return &apiv2pb.UpdateResourceResponse{
-		Resource: s.convertResourceFromStore(ctx, resource),
-	}, nil
+	return s.convertResourceFromStore(ctx, resource), nil
 }
 
-func (s *APIV2Service) DeleteResource(ctx context.Context, request *apiv2pb.DeleteResourceRequest) (*apiv2pb.DeleteResourceResponse, error) {
+func (s *APIV2Service) DeleteResource(ctx context.Context, request *apiv2pb.DeleteResourceRequest) (*emptypb.Empty, error) {
 	id, err := ExtractResourceIDFromName(request.Name)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "invalid resource id: %v", err)
@@ -225,7 +220,7 @@ func (s *APIV2Service) DeleteResource(ctx context.Context, request *apiv2pb.Dele
 	}); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to delete resource: %v", err)
 	}
-	return &apiv2pb.DeleteResourceResponse{}, nil
+	return &emptypb.Empty{}, nil
 }
 
 func (s *APIV2Service) convertResourceFromStore(ctx context.Context, resource *store.Resource) *apiv2pb.Resource {

server/route/api/v2/workspace_service.go

@@ -13,7 +13,7 @@ import (
 
 var ownerCache *apiv2pb.User
 
-func (s *APIV2Service) GetWorkspaceProfile(ctx context.Context, _ *apiv2pb.GetWorkspaceProfileRequest) (*apiv2pb.GetWorkspaceProfileResponse, error) {
+func (s *APIV2Service) GetWorkspaceProfile(ctx context.Context, _ *apiv2pb.GetWorkspaceProfileRequest) (*apiv2pb.WorkspaceProfile, error) {
 	workspaceProfile := &apiv2pb.WorkspaceProfile{
 		Version: s.Profile.Version,
 		Mode:    s.Profile.Mode,
@@ -25,9 +25,7 @@ func (s *APIV2Service) GetWorkspaceProfile(ctx context.Context, _ *apiv2pb.GetWo
 	if owner != nil {
 		workspaceProfile.Owner = owner.Name
 	}
-	return &apiv2pb.GetWorkspaceProfileResponse{
-		WorkspaceProfile: workspaceProfile,
-	}, nil
+	return workspaceProfile, nil
 }
 
 func (s *APIV2Service) GetInstanceOwner(ctx context.Context) (*apiv2pb.User, error) {

web/src/components/Inbox/MemoCommentMessage.tsx

@@ -30,12 +30,9 @@ const MemoCommentMessage = ({ inbox }: Props) => {
     }
 
     (async () => {
-      const { activity } = await activityServiceClient.getActivity({
+      const activity = await activityServiceClient.getActivity({
         id: inbox.activityId,
       });
-      if (!activity) {
-        return;
-      }
       if (activity.payload?.memoComment) {
         const memoCommentPayload = activity.payload.memoComment;
         const relatedMemoId = memoCommentPayload.relatedMemoId;

web/src/store/v1/user.ts

@@ -115,10 +115,7 @@ export const useUserStore = create(
       set({ userMapByName: userMap });
     },
     fetchCurrentUser: async () => {
-      const { user } = await authServiceClient.getAuthStatus({});
-      if (!user) {
-        throw new Error("User not found");
-      }
+      const user = await authServiceClient.getAuthStatus({});
       const userMap = get().userMapByName;
       userMap[user.name] = user;
       set({ currentUser: user.name, userMapByName: userMap });