Commit 93f062d0 authored by Steven's avatar Steven

chore: update user v2 api

parent 86693778
...@@ -15,3 +15,14 @@ func convertRowStatusFromStore(rowStatus store.RowStatus) apiv2pb.RowStatus { ...@@ -15,3 +15,14 @@ func convertRowStatusFromStore(rowStatus store.RowStatus) apiv2pb.RowStatus {
return apiv2pb.RowStatus_ROW_STATUS_UNSPECIFIED return apiv2pb.RowStatus_ROW_STATUS_UNSPECIFIED
} }
} }
func convertRowStatusToStore(rowStatus apiv2pb.RowStatus) store.RowStatus {
switch rowStatus {
case apiv2pb.RowStatus_ACTIVE:
return store.Normal
case apiv2pb.RowStatus_ARCHIVED:
return store.Archived
default:
return store.Normal
}
}
...@@ -2,11 +2,17 @@ package v2 ...@@ -2,11 +2,17 @@ package v2
import ( import (
"context" "context"
"net/http"
"time"
"github.com/labstack/echo/v4"
"github.com/usememos/memos/common/util"
apiv2pb "github.com/usememos/memos/proto/gen/api/v2" apiv2pb "github.com/usememos/memos/proto/gen/api/v2"
"github.com/usememos/memos/store" "github.com/usememos/memos/store"
"golang.org/x/crypto/bcrypt"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/timestamppb"
) )
type UserService struct { type UserService struct {
...@@ -24,18 +30,24 @@ func NewUserService(store *store.Store) *UserService { ...@@ -24,18 +30,24 @@ func NewUserService(store *store.Store) *UserService {
func (s *UserService) GetUser(ctx context.Context, request *apiv2pb.GetUserRequest) (*apiv2pb.GetUserResponse, error) { func (s *UserService) GetUser(ctx context.Context, request *apiv2pb.GetUserRequest) (*apiv2pb.GetUserResponse, error) {
user, err := s.Store.GetUser(ctx, &store.FindUser{ user, err := s.Store.GetUser(ctx, &store.FindUser{
Username: &request.Name, Username: &request.Username,
}) })
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to list tags: %v", err) return nil, status.Errorf(codes.Internal, "failed to get user: %v", err)
} }
if user == nil { if user == nil {
return nil, status.Errorf(codes.NotFound, "user not found") return nil, status.Errorf(codes.NotFound, "user not found")
} }
userMessage := convertUserFromStore(user) userMessage := convertUserFromStore(user)
userIDPtr := ctx.Value(UserIDContextKey)
if userIDPtr != nil {
userID := userIDPtr.(int32)
if userID != userMessage.Id {
// Data desensitization. // Data desensitization.
userMessage.OpenId = "" userMessage.OpenId = ""
}
}
response := &apiv2pb.GetUserResponse{ response := &apiv2pb.GetUserResponse{
User: userMessage, User: userMessage,
...@@ -43,12 +55,73 @@ func (s *UserService) GetUser(ctx context.Context, request *apiv2pb.GetUserReque ...@@ -43,12 +55,73 @@ func (s *UserService) GetUser(ctx context.Context, request *apiv2pb.GetUserReque
return response, nil return response, nil
} }
func (s *UserService) UpdateUser(ctx context.Context, request *apiv2pb.UpdateUserRequest) (*apiv2pb.UpdateUserResponse, error) {
userID := ctx.Value(UserIDContextKey).(int32)
currentUser, err := s.Store.GetUser(ctx, &store.FindUser{
ID: &userID,
})
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to get user: %v", err)
}
if currentUser == nil || (currentUser.ID != userID && currentUser.Role != store.RoleAdmin) {
return nil, status.Errorf(codes.PermissionDenied, "permission denied")
}
if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "update mask is empty")
}
currentTs := time.Now().Unix()
update := &store.UpdateUser{
ID: userID,
UpdatedTs: &currentTs,
}
for _, path := range request.UpdateMask.Paths {
if path == "username" {
update.Username = &request.User.Username
} else if path == "nickname" {
update.Nickname = &request.User.Nickname
} else if path == "email" {
update.Email = &request.User.Email
} else if path == "avatar_url" {
update.AvatarURL = &request.User.AvatarUrl
} else if path == "role" {
role := convertUserRoleToStore(request.User.Role)
update.Role = &role
} else if path == "reset_open_id" {
openID := util.GenUUID()
update.OpenID = &openID
} else if path == "password" {
passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)
if err != nil {
return nil, echo.NewHTTPError(http.StatusInternalServerError, "failed to generate password hash").SetInternal(err)
}
passwordHashStr := string(passwordHash)
update.PasswordHash = &passwordHashStr
} else if path == "row_status" {
rowStatus := convertRowStatusToStore(request.User.RowStatus)
update.RowStatus = &rowStatus
} else {
return nil, status.Errorf(codes.InvalidArgument, "invalid update path: %s", path)
}
}
user, err := s.Store.UpdateUser(ctx, update)
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to update user: %v", err)
}
response := &apiv2pb.UpdateUserResponse{
User: convertUserFromStore(user),
}
return response, nil
}
func convertUserFromStore(user *store.User) *apiv2pb.User { func convertUserFromStore(user *store.User) *apiv2pb.User {
return &apiv2pb.User{ return &apiv2pb.User{
Id: int32(user.ID), Id: int32(user.ID),
RowStatus: convertRowStatusFromStore(user.RowStatus), RowStatus: convertRowStatusFromStore(user.RowStatus),
CreatedTs: user.CreatedTs, CreateTime: timestamppb.New(time.Unix(user.CreatedTs, 0)),
UpdatedTs: user.UpdatedTs, UpdateTime: timestamppb.New(time.Unix(user.UpdatedTs, 0)),
Username: user.Username, Username: user.Username,
Role: convertUserRoleFromStore(user.Role), Role: convertUserRoleFromStore(user.Role),
Email: user.Email, Email: user.Email,
...@@ -58,16 +131,29 @@ func convertUserFromStore(user *store.User) *apiv2pb.User { ...@@ -58,16 +131,29 @@ func convertUserFromStore(user *store.User) *apiv2pb.User {
} }
} }
func convertUserRoleFromStore(role store.Role) apiv2pb.Role { func convertUserRoleFromStore(role store.Role) apiv2pb.User_Role {
switch role { switch role {
case store.RoleHost: case store.RoleHost:
return apiv2pb.Role_HOST return apiv2pb.User_HOST
case store.RoleAdmin: case store.RoleAdmin:
return apiv2pb.Role_ADMIN return apiv2pb.User_ADMIN
case store.RoleUser: case store.RoleUser:
return apiv2pb.Role_USER return apiv2pb.User_USER
default:
return apiv2pb.User_ROLE_UNSPECIFIED
}
}
func convertUserRoleToStore(role apiv2pb.User_Role) store.Role {
switch role {
case apiv2pb.User_HOST:
return store.RoleHost
case apiv2pb.User_ADMIN:
return store.RoleAdmin
case apiv2pb.User_USER:
return store.RoleUser
default: default:
return apiv2pb.Role_ROLE_UNSPECIFIED return store.RoleUser
} }
} }
......
...@@ -6,13 +6,20 @@ import "api/v2/common.proto"; ...@@ -6,13 +6,20 @@ import "api/v2/common.proto";
import "api/v2/memo_service.proto"; import "api/v2/memo_service.proto";
import "google/api/annotations.proto"; import "google/api/annotations.proto";
import "google/api/client.proto"; import "google/api/client.proto";
import "google/api/field_behavior.proto";
import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";
option go_package = "gen/api/v2"; option go_package = "gen/api/v2";
service UserService { service UserService {
rpc GetUser(GetUserRequest) returns (GetUserResponse) { rpc GetUser(GetUserRequest) returns (GetUserResponse) {
option (google.api.http) = {get: "/api/v2/users/{name}"}; option (google.api.http) = {get: "/api/v2/users/{username}"};
option (google.api.method_signature) = "name"; option (google.api.method_signature) = "username";
}
rpc UpdateUser(UpdateUserRequest) returns (UpdateUserResponse) {
option (google.api.http) = {patch: "/api/v2/users/{username}"};
option (google.api.method_signature) = "username";
} }
} }
...@@ -21,12 +28,19 @@ message User { ...@@ -21,12 +28,19 @@ message User {
RowStatus row_status = 2; RowStatus row_status = 2;
int64 created_ts = 3; google.protobuf.Timestamp create_time = 3;
int64 updated_ts = 4; google.protobuf.Timestamp update_time = 4;
string username = 5; string username = 5;
enum Role {
ROLE_UNSPECIFIED = 0;
HOST = 1;
ADMIN = 2;
USER = 3;
}
Role role = 6; Role role = 6;
string email = 7; string email = 7;
...@@ -36,23 +50,28 @@ message User { ...@@ -36,23 +50,28 @@ message User {
string open_id = 9; string open_id = 9;
string avatar_url = 10; string avatar_url = 10;
string password = 11 [(google.api.field_behavior) = INPUT_ONLY];
} }
enum Role { message GetUserRequest {
ROLE_UNSPECIFIED = 0; string username = 1;
}
HOST = 1; message GetUserResponse {
User user = 1;
}
ADMIN = 2; message UpdateUserRequest {
string username = 1;
USER = 3; User user = 2;
}
message GetUserRequest { // The update mask applies to the user resource.
string name = 1; google.protobuf.FieldMask update_mask = 3;
} }
message GetUserResponse { message UpdateUserResponse {
User user = 1; User user = 1;
} }
......
...@@ -36,11 +36,13 @@ ...@@ -36,11 +36,13 @@
- [api/v2/user_service.proto](#api_v2_user_service-proto) - [api/v2/user_service.proto](#api_v2_user_service-proto)
- [GetUserRequest](#memos-api-v2-GetUserRequest) - [GetUserRequest](#memos-api-v2-GetUserRequest)
- [GetUserResponse](#memos-api-v2-GetUserResponse) - [GetUserResponse](#memos-api-v2-GetUserResponse)
- [UpdateUserRequest](#memos-api-v2-UpdateUserRequest)
- [UpdateUserResponse](#memos-api-v2-UpdateUserResponse)
- [User](#memos-api-v2-User) - [User](#memos-api-v2-User)
- [UserSetting](#memos-api-v2-UserSetting) - [UserSetting](#memos-api-v2-UserSetting)
- [UserSettingValue](#memos-api-v2-UserSettingValue) - [UserSettingValue](#memos-api-v2-UserSettingValue)
- [Role](#memos-api-v2-Role) - [User.Role](#memos-api-v2-User-Role)
- [UserSetting.Key](#memos-api-v2-UserSetting-Key) - [UserSetting.Key](#memos-api-v2-UserSetting-Key)
- [UserService](#memos-api-v2-UserService) - [UserService](#memos-api-v2-UserService)
...@@ -395,7 +397,7 @@ ...@@ -395,7 +397,7 @@
| Field | Type | Label | Description | | Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- | | ----- | ---- | ----- | ----------- |
| name | [string](#string) | | | | username | [string](#string) | | |
...@@ -417,6 +419,38 @@ ...@@ -417,6 +419,38 @@
<a name="memos-api-v2-UpdateUserRequest"></a>
### UpdateUserRequest
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| username | [string](#string) | | |
| user | [User](#memos-api-v2-User) | | |
| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The update mask applies to the user resource. |
<a name="memos-api-v2-UpdateUserResponse"></a>
### UpdateUserResponse
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| user | [User](#memos-api-v2-User) | | |
<a name="memos-api-v2-User"></a> <a name="memos-api-v2-User"></a>
### User ### User
...@@ -427,14 +461,15 @@ ...@@ -427,14 +461,15 @@
| ----- | ---- | ----- | ----------- | | ----- | ---- | ----- | ----------- |
| id | [int32](#int32) | | | | id | [int32](#int32) | | |
| row_status | [RowStatus](#memos-api-v2-RowStatus) | | | | row_status | [RowStatus](#memos-api-v2-RowStatus) | | |
| created_ts | [int64](#int64) | | | | create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
| updated_ts | [int64](#int64) | | | | update_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
| username | [string](#string) | | | | username | [string](#string) | | |
| role | [Role](#memos-api-v2-Role) | | | | role | [User.Role](#memos-api-v2-User-Role) | | |
| email | [string](#string) | | | | email | [string](#string) | | |
| nickname | [string](#string) | | | | nickname | [string](#string) | | |
| open_id | [string](#string) | | | | open_id | [string](#string) | | |
| avatar_url | [string](#string) | | | | avatar_url | [string](#string) | | |
| password | [string](#string) | | |
...@@ -476,9 +511,9 @@ ...@@ -476,9 +511,9 @@
<a name="memos-api-v2-Role"></a> <a name="memos-api-v2-User-Role"></a>
### Role ### User.Role
| Name | Number | Description | | Name | Number | Description |
...@@ -517,6 +552,7 @@ ...@@ -517,6 +552,7 @@
| Method Name | Request Type | Response Type | Description | | Method Name | Request Type | Response Type | Description |
| ----------- | ------------ | ------------- | ------------| | ----------- | ------------ | ------------- | ------------|
| GetUser | [GetUserRequest](#memos-api-v2-GetUserRequest) | [GetUserResponse](#memos-api-v2-GetUserResponse) | | | GetUser | [GetUserRequest](#memos-api-v2-GetUserRequest) | [GetUserResponse](#memos-api-v2-GetUserResponse) | |
| UpdateUser | [UpdateUserRequest](#memos-api-v2-UpdateUserRequest) | [UpdateUserResponse](#memos-api-v2-UpdateUserResponse) | |
......
This diff is collapsed.
...@@ -42,14 +42,14 @@ func request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marsha ...@@ -42,14 +42,14 @@ func request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marsha
_ = err _ = err
) )
val, ok = pathParams["name"] val, ok = pathParams["username"]
if !ok { if !ok {
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "username")
} }
protoReq.Name, err = runtime.String(val) protoReq.Username, err = runtime.String(val)
if err != nil { if err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "username", err)
} }
msg, err := client.GetUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) msg, err := client.GetUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
...@@ -68,14 +68,14 @@ func local_request_UserService_GetUser_0(ctx context.Context, marshaler runtime. ...@@ -68,14 +68,14 @@ func local_request_UserService_GetUser_0(ctx context.Context, marshaler runtime.
_ = err _ = err
) )
val, ok = pathParams["name"] val, ok = pathParams["username"]
if !ok { if !ok {
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "username")
} }
protoReq.Name, err = runtime.String(val) protoReq.Username, err = runtime.String(val)
if err != nil { if err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "username", err)
} }
msg, err := server.GetUser(ctx, &protoReq) msg, err := server.GetUser(ctx, &protoReq)
...@@ -83,6 +83,76 @@ func local_request_UserService_GetUser_0(ctx context.Context, marshaler runtime. ...@@ -83,6 +83,76 @@ func local_request_UserService_GetUser_0(ctx context.Context, marshaler runtime.
} }
var (
filter_UserService_UpdateUser_0 = &utilities.DoubleArray{Encoding: map[string]int{"username": 0}, Base: []int{1, 2, 0, 0}, Check: []int{0, 1, 2, 2}}
)
func request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var protoReq UpdateUserRequest
var metadata runtime.ServerMetadata
var (
val string
ok bool
err error
_ = err
)
val, ok = pathParams["username"]
if !ok {
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "username")
}
protoReq.Username, err = runtime.String(val)
if err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "username", err)
}
if err := req.ParseForm(); err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_UpdateUser_0); err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
msg, err := client.UpdateUser(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
func local_request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Marshaler, server UserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var protoReq UpdateUserRequest
var metadata runtime.ServerMetadata
var (
val string
ok bool
err error
_ = err
)
val, ok = pathParams["username"]
if !ok {
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "username")
}
protoReq.Username, err = runtime.String(val)
if err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "username", err)
}
if err := req.ParseForm(); err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_UpdateUser_0); err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
msg, err := server.UpdateUser(ctx, &protoReq)
return msg, metadata, err
}
// RegisterUserServiceHandlerServer registers the http handlers for service UserService to "mux". // RegisterUserServiceHandlerServer registers the http handlers for service UserService to "mux".
// UnaryRPC :call UserServiceServer directly. // UnaryRPC :call UserServiceServer directly.
// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
...@@ -97,7 +167,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux ...@@ -97,7 +167,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
var err error var err error
var annotatedContext context.Context var annotatedContext context.Context
annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v2.UserService/GetUser", runtime.WithHTTPPathPattern("/api/v2/users/{name}")) annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v2.UserService/GetUser", runtime.WithHTTPPathPattern("/api/v2/users/{username}"))
if err != nil { if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return return
...@@ -114,6 +184,31 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux ...@@ -114,6 +184,31 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
}) })
mux.Handle("PATCH", pattern_UserService_UpdateUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
var stream runtime.ServerTransportStream
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
var err error
var annotatedContext context.Context
annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v2.UserService/UpdateUser", runtime.WithHTTPPathPattern("/api/v2/users/{username}"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
resp, md, err := local_request_UserService_UpdateUser_0(annotatedContext, inboundMarshaler, server, req, pathParams)
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
if err != nil {
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
return
}
forward_UserService_UpdateUser_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
return nil return nil
} }
...@@ -161,7 +256,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux ...@@ -161,7 +256,7 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
var err error var err error
var annotatedContext context.Context var annotatedContext context.Context
annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/memos.api.v2.UserService/GetUser", runtime.WithHTTPPathPattern("/api/v2/users/{name}")) annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/memos.api.v2.UserService/GetUser", runtime.WithHTTPPathPattern("/api/v2/users/{username}"))
if err != nil { if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return return
...@@ -177,13 +272,39 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux ...@@ -177,13 +272,39 @@ func RegisterUserServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
}) })
mux.Handle("PATCH", pattern_UserService_UpdateUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
var err error
var annotatedContext context.Context
annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/memos.api.v2.UserService/UpdateUser", runtime.WithHTTPPathPattern("/api/v2/users/{username}"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
resp, md, err := request_UserService_UpdateUser_0(annotatedContext, inboundMarshaler, client, req, pathParams)
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
if err != nil {
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
return
}
forward_UserService_UpdateUser_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
return nil return nil
} }
var ( var (
pattern_UserService_GetUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v2", "users", "name"}, "")) pattern_UserService_GetUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v2", "users", "username"}, ""))
pattern_UserService_UpdateUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v2", "users", "username"}, ""))
) )
var ( var (
forward_UserService_GetUser_0 = runtime.ForwardResponseMessage forward_UserService_GetUser_0 = runtime.ForwardResponseMessage
forward_UserService_UpdateUser_0 = runtime.ForwardResponseMessage
) )
...@@ -20,6 +20,7 @@ const _ = grpc.SupportPackageIsVersion7 ...@@ -20,6 +20,7 @@ const _ = grpc.SupportPackageIsVersion7
const ( const (
UserService_GetUser_FullMethodName = "/memos.api.v2.UserService/GetUser" UserService_GetUser_FullMethodName = "/memos.api.v2.UserService/GetUser"
UserService_UpdateUser_FullMethodName = "/memos.api.v2.UserService/UpdateUser"
) )
// UserServiceClient is the client API for UserService service. // UserServiceClient is the client API for UserService service.
...@@ -27,6 +28,7 @@ const ( ...@@ -27,6 +28,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. // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
type UserServiceClient interface { type UserServiceClient interface {
GetUser(ctx context.Context, in *GetUserRequest, opts ...grpc.CallOption) (*GetUserResponse, error) GetUser(ctx context.Context, in *GetUserRequest, opts ...grpc.CallOption) (*GetUserResponse, error)
UpdateUser(ctx context.Context, in *UpdateUserRequest, opts ...grpc.CallOption) (*UpdateUserResponse, error)
} }
type userServiceClient struct { type userServiceClient struct {
...@@ -46,11 +48,21 @@ func (c *userServiceClient) GetUser(ctx context.Context, in *GetUserRequest, opt ...@@ -46,11 +48,21 @@ func (c *userServiceClient) GetUser(ctx context.Context, in *GetUserRequest, opt
return out, nil return out, nil
} }
func (c *userServiceClient) UpdateUser(ctx context.Context, in *UpdateUserRequest, opts ...grpc.CallOption) (*UpdateUserResponse, error) {
out := new(UpdateUserResponse)
err := c.cc.Invoke(ctx, UserService_UpdateUser_FullMethodName, in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
// UserServiceServer is the server API for UserService service. // UserServiceServer is the server API for UserService service.
// All implementations must embed UnimplementedUserServiceServer // All implementations must embed UnimplementedUserServiceServer
// for forward compatibility // for forward compatibility
type UserServiceServer interface { type UserServiceServer interface {
GetUser(context.Context, *GetUserRequest) (*GetUserResponse, error) GetUser(context.Context, *GetUserRequest) (*GetUserResponse, error)
UpdateUser(context.Context, *UpdateUserRequest) (*UpdateUserResponse, error)
mustEmbedUnimplementedUserServiceServer() mustEmbedUnimplementedUserServiceServer()
} }
...@@ -61,6 +73,9 @@ type UnimplementedUserServiceServer struct { ...@@ -61,6 +73,9 @@ type UnimplementedUserServiceServer struct {
func (UnimplementedUserServiceServer) GetUser(context.Context, *GetUserRequest) (*GetUserResponse, error) { func (UnimplementedUserServiceServer) GetUser(context.Context, *GetUserRequest) (*GetUserResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method GetUser not implemented") return nil, status.Errorf(codes.Unimplemented, "method GetUser not implemented")
} }
func (UnimplementedUserServiceServer) UpdateUser(context.Context, *UpdateUserRequest) (*UpdateUserResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method UpdateUser not implemented")
}
func (UnimplementedUserServiceServer) mustEmbedUnimplementedUserServiceServer() {} func (UnimplementedUserServiceServer) mustEmbedUnimplementedUserServiceServer() {}
// UnsafeUserServiceServer may be embedded to opt out of forward compatibility for this service. // UnsafeUserServiceServer may be embedded to opt out of forward compatibility for this service.
...@@ -92,6 +107,24 @@ func _UserService_GetUser_Handler(srv interface{}, ctx context.Context, dec func ...@@ -92,6 +107,24 @@ func _UserService_GetUser_Handler(srv interface{}, ctx context.Context, dec func
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
func _UserService_UpdateUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(UpdateUserRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(UserServiceServer).UpdateUser(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: UserService_UpdateUser_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(UserServiceServer).UpdateUser(ctx, req.(*UpdateUserRequest))
}
return interceptor(ctx, in, info, handler)
}
// UserService_ServiceDesc is the grpc.ServiceDesc for UserService service. // UserService_ServiceDesc is the grpc.ServiceDesc for UserService service.
// It's only intended for direct use with grpc.RegisterService, // It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy) // and not to be introspected or modified (even as a copy)
...@@ -103,6 +136,10 @@ var UserService_ServiceDesc = grpc.ServiceDesc{ ...@@ -103,6 +136,10 @@ var UserService_ServiceDesc = grpc.ServiceDesc{
MethodName: "GetUser", MethodName: "GetUser",
Handler: _UserService_GetUser_Handler, Handler: _UserService_GetUser_Handler,
}, },
{
MethodName: "UpdateUser",
Handler: _UserService_UpdateUser_Handler,
},
}, },
Streams: []grpc.StreamDesc{}, Streams: []grpc.StreamDesc{},
Metadata: "api/v2/user_service.proto", Metadata: "api/v2/user_service.proto",
......
...@@ -52,12 +52,12 @@ type UpdateUser struct { ...@@ -52,12 +52,12 @@ type UpdateUser struct {
UpdatedTs *int64 UpdatedTs *int64
RowStatus *RowStatus RowStatus *RowStatus
Username *string `json:"username"` Username *string
Email *string `json:"email"` Role *Role
Nickname *string `json:"nickname"` Email *string
Password *string `json:"password"` Nickname *string
ResetOpenID *bool `json:"resetOpenId"` Password *string
AvatarURL *string `json:"avatarUrl"` AvatarURL *string
PasswordHash *string PasswordHash *string
OpenID *string OpenID *string
} }
......
...@@ -53,7 +53,7 @@ const UsageHeatMap = () => { ...@@ -53,7 +53,7 @@ const UsageHeatMap = () => {
if (!user) { if (!user) {
return; return;
} }
setCreatedDays(Math.ceil((Date.now() - getTimeStampByDate(user.createdTs)) / 1000 / 3600 / 24)); setCreatedDays(Math.ceil((Date.now() - getTimeStampByDate(user.createTime)) / 1000 / 3600 / 24));
}); });
}, [currentUsername]); }, [currentUsername]);
......
import axios from "axios"; import axios from "axios";
import { GetUserResponse } from "@/types/proto/api/v2/user_service_pb";
export function getSystemStatus() { export function getSystemStatus() {
return axios.get<SystemStatus>("/api/v1/status"); return axios.get<SystemStatus>("/api/v1/status");
...@@ -55,7 +56,7 @@ export function getUserList() { ...@@ -55,7 +56,7 @@ export function getUserList() {
} }
export function getUserByUsername(username: string) { export function getUserByUsername(username: string) {
return axios.get<User>(`/api/v1/user/name/${username}`); return axios.get<GetUserResponse>(`/api/v2/users/${username}`);
} }
export function upsertUserSetting(upsert: UserSettingUpsert) { export function upsertUserSetting(upsert: UserSettingUpsert) {
...@@ -183,12 +184,8 @@ export function deleteMemoResource(memoId: MemoId, resourceId: ResourceId) { ...@@ -183,12 +184,8 @@ export function deleteMemoResource(memoId: MemoId, resourceId: ResourceId) {
return axios.delete(`/api/v1/memo/${memoId}/resource/${resourceId}`); return axios.delete(`/api/v1/memo/${memoId}/resource/${resourceId}`);
} }
export function getTagList(tagFind?: TagFind) { export function getTagList() {
const queryList = []; return axios.get<string[]>(`/api/v1/tag`);
if (tagFind?.creatorUsername) {
queryList.push(`creatorUsername=${tagFind.creatorUsername}`);
}
return axios.get<string[]>(`/api/v1/tag?${queryList.join("&")}`);
} }
export function getTagSuggestionList() { export function getTagSuggestionList() {
......
...@@ -6,10 +6,6 @@ export function convertToMillis(localSetting: LocalSetting) { ...@@ -6,10 +6,6 @@ export function convertToMillis(localSetting: LocalSetting) {
} }
export function getTimeStampByDate(t: Date | number | string): number { export function getTimeStampByDate(t: Date | number | string): number {
if (typeof t === "string") {
t = t.replaceAll("-", "/");
}
return new Date(t).getTime(); return new Date(t).getTime();
} }
......
...@@ -7,6 +7,7 @@ import UserAvatar from "@/components/UserAvatar"; ...@@ -7,6 +7,7 @@ import UserAvatar from "@/components/UserAvatar";
import useLoading from "@/hooks/useLoading"; import useLoading from "@/hooks/useLoading";
import { useMemoStore } from "@/store/module"; import { useMemoStore } from "@/store/module";
import { useUserV1Store } from "@/store/v1"; import { useUserV1Store } from "@/store/v1";
import { User } from "@/types/proto/api/v2/user_service_pb";
const MemoDetail = () => { const MemoDetail = () => {
const params = useParams(); const params = useParams();
......
...@@ -7,6 +7,7 @@ import UserAvatar from "@/components/UserAvatar"; ...@@ -7,6 +7,7 @@ import UserAvatar from "@/components/UserAvatar";
import useLoading from "@/hooks/useLoading"; import useLoading from "@/hooks/useLoading";
import { useUserStore } from "@/store/module"; import { useUserStore } from "@/store/module";
import { useUserV1Store } from "@/store/v1"; import { useUserV1Store } from "@/store/v1";
import { User } from "@/types/proto/api/v2/user_service_pb";
import { useTranslate } from "@/utils/i18n"; import { useTranslate } from "@/utils/i18n";
const UserProfile = () => { const UserProfile = () => {
......
...@@ -4,7 +4,7 @@ import { DEFAULT_MEMO_LIMIT } from "@/helpers/consts"; ...@@ -4,7 +4,7 @@ import { DEFAULT_MEMO_LIMIT } from "@/helpers/consts";
import store, { useAppSelector } from "../"; import store, { useAppSelector } from "../";
import { createMemo, deleteMemo, patchMemo, upsertMemos } from "../reducer/memo"; import { createMemo, deleteMemo, patchMemo, upsertMemos } from "../reducer/memo";
import { useMemoCacheStore } from "../v1"; import { useMemoCacheStore } from "../v1";
import { useUserStore } from "./"; import { getUsernameFromPath, useUserStore } from "./";
export const convertResponseModelMemo = (memo: Memo): Memo => { export const convertResponseModelMemo = (memo: Memo): Memo => {
return { return {
...@@ -40,7 +40,7 @@ export const useMemoStore = () => { ...@@ -40,7 +40,7 @@ export const useMemoStore = () => {
offset, offset,
}; };
if (userStore.isVisitorMode()) { if (userStore.isVisitorMode()) {
memoFind.creatorUsername = userStore.getUsernameFromPath(); memoFind.creatorUsername = getUsernameFromPath();
} }
const { data } = await api.getMemoList(memoFind); const { data } = await api.getMemoList(memoFind);
const fetchedMemos = data.map((m) => convertResponseModelMemo(m)); const fetchedMemos = data.map((m) => convertResponseModelMemo(m));
...@@ -70,9 +70,6 @@ export const useMemoStore = () => { ...@@ -70,9 +70,6 @@ export const useMemoStore = () => {
const memoFind: MemoFind = { const memoFind: MemoFind = {
rowStatus: "ARCHIVED", rowStatus: "ARCHIVED",
}; };
if (userStore.isVisitorMode()) {
memoFind.creatorUsername = userStore.getUsernameFromPath();
}
const { data } = await api.getMemoList(memoFind); const { data } = await api.getMemoList(memoFind);
const archivedMemos = data.map((m) => { const archivedMemos = data.map((m) => {
return convertResponseModelMemo(m); return convertResponseModelMemo(m);
......
import * as api from "@/helpers/api"; import * as api from "@/helpers/api";
import store, { useAppSelector } from ".."; import store, { useAppSelector } from "..";
import { deleteTag, setTags, upsertTag } from "../reducer/tag"; import { deleteTag, setTags, upsertTag } from "../reducer/tag";
import { useUserStore } from "./";
export const useTagStore = () => { export const useTagStore = () => {
const state = useAppSelector((state) => state.tag); const state = useAppSelector((state) => state.tag);
const userStore = useUserStore();
return { return {
state, state,
getState: () => { getState: () => {
return store.getState().tag; return store.getState().tag;
}, },
fetchTags: async () => { fetchTags: async () => {
const tagFind: TagFind = {}; const { data } = await api.getTagList();
if (userStore.isVisitorMode()) {
tagFind.creatorUsername = userStore.getUsernameFromPath();
}
const { data } = await api.getTagList(tagFind);
store.dispatch(setTags(data)); store.dispatch(setTags(data));
}, },
upsertTag: async (tagName: string) => { upsertTag: async (tagName: string) => {
......
...@@ -71,16 +71,6 @@ export const initialUserState = async () => { ...@@ -71,16 +71,6 @@ export const initialUserState = async () => {
} }
}; };
const getUsernameFromPath = () => {
const pathname = window.location.pathname;
const usernameRegex = /^\/u\/(\w+).*/;
const result = pathname.match(usernameRegex);
if (result && result.length === 2) {
return String(result[1]);
}
return undefined;
};
const doSignIn = async () => { const doSignIn = async () => {
const { data: user } = await api.getMyselfUser(); const { data: user } = await api.getMyselfUser();
if (user) { if (user) {
...@@ -95,6 +85,16 @@ const doSignOut = async () => { ...@@ -95,6 +85,16 @@ const doSignOut = async () => {
await api.signout(); await api.signout();
}; };
export const getUsernameFromPath = () => {
const pathname = window.location.pathname;
const usernameRegex = /^\/u\/(\w+).*/;
const result = pathname.match(usernameRegex);
if (result && result.length === 2) {
return String(result[1]);
}
return undefined;
};
export const useUserStore = () => { export const useUserStore = () => {
const state = useAppSelector((state) => state.user); const state = useAppSelector((state) => state.user);
...@@ -108,7 +108,6 @@ export const useUserStore = () => { ...@@ -108,7 +108,6 @@ export const useUserStore = () => {
return store.getState().user; return store.getState().user;
}, },
isVisitorMode, isVisitorMode,
getUsernameFromPath,
doSignIn, doSignIn,
doSignOut, doSignOut,
getCurrentUsername: () => { getCurrentUsername: () => {
......
import { create } from "zustand"; import { create } from "zustand";
import * as api from "@/helpers/api"; import * as api from "@/helpers/api";
import { convertResponseModelUser } from "../module"; import { User } from "@/types/proto/api/v2/user_service_pb";
interface UserV1Store { interface UserV1Store {
userMapByUsername: Record<string, User>; userMapByUsername: Record<string, User>;
...@@ -24,9 +24,13 @@ const useUserV1Store = create<UserV1Store>()((set, get) => ({ ...@@ -24,9 +24,13 @@ const useUserV1Store = create<UserV1Store>()((set, get) => ({
const promise = api.getUserByUsername(username); const promise = api.getUserByUsername(username);
requestCache.set(username, promise); requestCache.set(username, promise);
const { data } = await promise; const {
data: { user: user },
} = await promise;
if (!user) {
throw new Error("User not found");
}
requestCache.delete(username); requestCache.delete(username);
const user = convertResponseModelUser(data);
userMap[username] = user; userMap[username] = user;
set(userMap); set(userMap);
return user; return user;
......
...@@ -3,36 +3,11 @@ ...@@ -3,36 +3,11 @@
/* eslint-disable */ /* eslint-disable */
// @ts-nocheck // @ts-nocheck
import type { BinaryReadOptions, FieldList, JsonReadOptions, JsonValue, PartialMessage, PlainMessage } from "@bufbuild/protobuf"; import type { BinaryReadOptions, FieldList, FieldMask, JsonReadOptions, JsonValue, PartialMessage, PlainMessage, Timestamp } from "@bufbuild/protobuf";
import { Message, proto3 } from "@bufbuild/protobuf"; import { Message, proto3 } from "@bufbuild/protobuf";
import type { RowStatus } from "./common_pb.js"; import type { RowStatus } from "./common_pb.js";
import type { Visibility } from "./memo_service_pb.js"; import type { Visibility } from "./memo_service_pb.js";
/**
* @generated from enum memos.api.v2.Role
*/
export declare enum Role {
/**
* @generated from enum value: ROLE_UNSPECIFIED = 0;
*/
ROLE_UNSPECIFIED = 0,
/**
* @generated from enum value: HOST = 1;
*/
HOST = 1,
/**
* @generated from enum value: ADMIN = 2;
*/
ADMIN = 2,
/**
* @generated from enum value: USER = 3;
*/
USER = 3,
}
/** /**
* @generated from message memos.api.v2.User * @generated from message memos.api.v2.User
*/ */
...@@ -48,14 +23,14 @@ export declare class User extends Message<User> { ...@@ -48,14 +23,14 @@ export declare class User extends Message<User> {
rowStatus: RowStatus; rowStatus: RowStatus;
/** /**
* @generated from field: int64 created_ts = 3; * @generated from field: google.protobuf.Timestamp create_time = 3;
*/ */
createdTs: bigint; createTime?: Timestamp;
/** /**
* @generated from field: int64 updated_ts = 4; * @generated from field: google.protobuf.Timestamp update_time = 4;
*/ */
updatedTs: bigint; updateTime?: Timestamp;
/** /**
* @generated from field: string username = 5; * @generated from field: string username = 5;
...@@ -63,9 +38,9 @@ export declare class User extends Message<User> { ...@@ -63,9 +38,9 @@ export declare class User extends Message<User> {
username: string; username: string;
/** /**
* @generated from field: memos.api.v2.Role role = 6; * @generated from field: memos.api.v2.User.Role role = 6;
*/ */
role: Role; role: User_Role;
/** /**
* @generated from field: string email = 7; * @generated from field: string email = 7;
...@@ -87,6 +62,11 @@ export declare class User extends Message<User> { ...@@ -87,6 +62,11 @@ export declare class User extends Message<User> {
*/ */
avatarUrl: string; avatarUrl: string;
/**
* @generated from field: string password = 11;
*/
password: string;
constructor(data?: PartialMessage<User>); constructor(data?: PartialMessage<User>);
static readonly runtime: typeof proto3; static readonly runtime: typeof proto3;
...@@ -102,14 +82,39 @@ export declare class User extends Message<User> { ...@@ -102,14 +82,39 @@ export declare class User extends Message<User> {
static equals(a: User | PlainMessage<User> | undefined, b: User | PlainMessage<User> | undefined): boolean; static equals(a: User | PlainMessage<User> | undefined, b: User | PlainMessage<User> | undefined): boolean;
} }
/**
* @generated from enum memos.api.v2.User.Role
*/
export declare enum User_Role {
/**
* @generated from enum value: ROLE_UNSPECIFIED = 0;
*/
ROLE_UNSPECIFIED = 0,
/**
* @generated from enum value: HOST = 1;
*/
HOST = 1,
/**
* @generated from enum value: ADMIN = 2;
*/
ADMIN = 2,
/**
* @generated from enum value: USER = 3;
*/
USER = 3,
}
/** /**
* @generated from message memos.api.v2.GetUserRequest * @generated from message memos.api.v2.GetUserRequest
*/ */
export declare class GetUserRequest extends Message<GetUserRequest> { export declare class GetUserRequest extends Message<GetUserRequest> {
/** /**
* @generated from field: string name = 1; * @generated from field: string username = 1;
*/ */
name: string; username: string;
constructor(data?: PartialMessage<GetUserRequest>); constructor(data?: PartialMessage<GetUserRequest>);
...@@ -150,6 +155,66 @@ export declare class GetUserResponse extends Message<GetUserResponse> { ...@@ -150,6 +155,66 @@ export declare class GetUserResponse extends Message<GetUserResponse> {
static equals(a: GetUserResponse | PlainMessage<GetUserResponse> | undefined, b: GetUserResponse | PlainMessage<GetUserResponse> | undefined): boolean; static equals(a: GetUserResponse | PlainMessage<GetUserResponse> | undefined, b: GetUserResponse | PlainMessage<GetUserResponse> | undefined): boolean;
} }
/**
* @generated from message memos.api.v2.UpdateUserRequest
*/
export declare class UpdateUserRequest extends Message<UpdateUserRequest> {
/**
* @generated from field: string username = 1;
*/
username: string;
/**
* @generated from field: memos.api.v2.User user = 2;
*/
user?: User;
/**
* The update mask applies to the user resource.
*
* @generated from field: google.protobuf.FieldMask update_mask = 3;
*/
updateMask?: FieldMask;
constructor(data?: PartialMessage<UpdateUserRequest>);
static readonly runtime: typeof proto3;
static readonly typeName = "memos.api.v2.UpdateUserRequest";
static readonly fields: FieldList;
static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): UpdateUserRequest;
static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): UpdateUserRequest;
static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): UpdateUserRequest;
static equals(a: UpdateUserRequest | PlainMessage<UpdateUserRequest> | undefined, b: UpdateUserRequest | PlainMessage<UpdateUserRequest> | undefined): boolean;
}
/**
* @generated from message memos.api.v2.UpdateUserResponse
*/
export declare class UpdateUserResponse extends Message<UpdateUserResponse> {
/**
* @generated from field: memos.api.v2.User user = 1;
*/
user?: User;
constructor(data?: PartialMessage<UpdateUserResponse>);
static readonly runtime: typeof proto3;
static readonly typeName = "memos.api.v2.UpdateUserResponse";
static readonly fields: FieldList;
static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): UpdateUserResponse;
static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): UpdateUserResponse;
static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): UpdateUserResponse;
static equals(a: UpdateUserResponse | PlainMessage<UpdateUserResponse> | undefined, b: UpdateUserResponse | PlainMessage<UpdateUserResponse> | undefined): boolean;
}
/** /**
* @generated from message memos.api.v2.UserSetting * @generated from message memos.api.v2.UserSetting
*/ */
......
...@@ -3,23 +3,10 @@ ...@@ -3,23 +3,10 @@
/* eslint-disable */ /* eslint-disable */
// @ts-nocheck // @ts-nocheck
import { proto3 } from "@bufbuild/protobuf"; import { FieldMask, proto3, Timestamp } from "@bufbuild/protobuf";
import { RowStatus } from "./common_pb.js"; import { RowStatus } from "./common_pb.js";
import { Visibility } from "./memo_service_pb.js"; import { Visibility } from "./memo_service_pb.js";
/**
* @generated from enum memos.api.v2.Role
*/
export const Role = proto3.makeEnum(
"memos.api.v2.Role",
[
{no: 0, name: "ROLE_UNSPECIFIED"},
{no: 1, name: "HOST"},
{no: 2, name: "ADMIN"},
{no: 3, name: "USER"},
],
);
/** /**
* @generated from message memos.api.v2.User * @generated from message memos.api.v2.User
*/ */
...@@ -28,14 +15,28 @@ export const User = proto3.makeMessageType( ...@@ -28,14 +15,28 @@ export const User = proto3.makeMessageType(
() => [ () => [
{ no: 1, name: "id", kind: "scalar", T: 5 /* ScalarType.INT32 */ }, { no: 1, name: "id", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
{ no: 2, name: "row_status", kind: "enum", T: proto3.getEnumType(RowStatus) }, { no: 2, name: "row_status", kind: "enum", T: proto3.getEnumType(RowStatus) },
{ no: 3, name: "created_ts", kind: "scalar", T: 3 /* ScalarType.INT64 */ }, { no: 3, name: "create_time", kind: "message", T: Timestamp },
{ no: 4, name: "updated_ts", kind: "scalar", T: 3 /* ScalarType.INT64 */ }, { no: 4, name: "update_time", kind: "message", T: Timestamp },
{ no: 5, name: "username", kind: "scalar", T: 9 /* ScalarType.STRING */ }, { no: 5, name: "username", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 6, name: "role", kind: "enum", T: proto3.getEnumType(Role) }, { no: 6, name: "role", kind: "enum", T: proto3.getEnumType(User_Role) },
{ no: 7, name: "email", kind: "scalar", T: 9 /* ScalarType.STRING */ }, { no: 7, name: "email", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 8, name: "nickname", kind: "scalar", T: 9 /* ScalarType.STRING */ }, { no: 8, name: "nickname", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 9, name: "open_id", kind: "scalar", T: 9 /* ScalarType.STRING */ }, { no: 9, name: "open_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 10, name: "avatar_url", kind: "scalar", T: 9 /* ScalarType.STRING */ }, { no: 10, name: "avatar_url", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 11, name: "password", kind: "scalar", T: 9 /* ScalarType.STRING */ },
],
);
/**
* @generated from enum memos.api.v2.User.Role
*/
export const User_Role = proto3.makeEnum(
"memos.api.v2.User.Role",
[
{no: 0, name: "ROLE_UNSPECIFIED"},
{no: 1, name: "HOST"},
{no: 2, name: "ADMIN"},
{no: 3, name: "USER"},
], ],
); );
...@@ -45,7 +46,7 @@ export const User = proto3.makeMessageType( ...@@ -45,7 +46,7 @@ export const User = proto3.makeMessageType(
export const GetUserRequest = proto3.makeMessageType( export const GetUserRequest = proto3.makeMessageType(
"memos.api.v2.GetUserRequest", "memos.api.v2.GetUserRequest",
() => [ () => [
{ no: 1, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ }, { no: 1, name: "username", kind: "scalar", T: 9 /* ScalarType.STRING */ },
], ],
); );
...@@ -59,6 +60,28 @@ export const GetUserResponse = proto3.makeMessageType( ...@@ -59,6 +60,28 @@ export const GetUserResponse = proto3.makeMessageType(
], ],
); );
/**
* @generated from message memos.api.v2.UpdateUserRequest
*/
export const UpdateUserRequest = proto3.makeMessageType(
"memos.api.v2.UpdateUserRequest",
() => [
{ no: 1, name: "username", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 2, name: "user", kind: "message", T: User },
{ no: 3, name: "update_mask", kind: "message", T: FieldMask },
],
);
/**
* @generated from message memos.api.v2.UpdateUserResponse
*/
export const UpdateUserResponse = proto3.makeMessageType(
"memos.api.v2.UpdateUserResponse",
() => [
{ no: 1, name: "user", kind: "message", T: User },
],
);
/** /**
* @generated from message memos.api.v2.UserSetting * @generated from message memos.api.v2.UserSetting
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment