From 2437419b7f7a011d3d8cba5f349252a79b2171a4 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 30 Nov 2023 20:58:36 +0800 Subject: [PATCH] fix: add auth status checks --- api/v2/acl.go | 3 + api/v2/acl_config.go | 1 + api/v2/auth_service.go | 18 ++ proto/api/v2/auth_service.proto | 19 ++ proto/gen/api/v2/README.md | 57 ++++++ proto/gen/api/v2/auth_service.pb.go | 219 +++++++++++++++++++++++ proto/gen/api/v2/auth_service.pb.gw.go | 155 ++++++++++++++++ proto/gen/api/v2/auth_service_grpc.pb.go | 109 +++++++++++ web/src/grpcweb.ts | 3 + web/src/store/module/user.ts | 7 +- 10 files changed, 590 insertions(+), 1 deletion(-) create mode 100644 api/v2/auth_service.go create mode 100644 proto/api/v2/auth_service.proto create mode 100644 proto/gen/api/v2/auth_service.pb.go create mode 100644 proto/gen/api/v2/auth_service.pb.gw.go create mode 100644 proto/gen/api/v2/auth_service_grpc.pb.go diff --git a/api/v2/acl.go b/api/v2/acl.go index cb3f1405..6abbc256 100644 --- a/api/v2/acl.go +++ b/api/v2/acl.go @@ -68,6 +68,9 @@ func (in *GRPCAuthInterceptor) AuthenticationInterceptor(ctx context.Context, re if user == nil { return nil, errors.Errorf("user %q not exists", username) } + if user.RowStatus == store.Archived { + return nil, errors.Errorf("user %q is archived", username) + } if isOnlyForAdminAllowedMethod(serverInfo.FullMethod) && user.Role != store.RoleHost && user.Role != store.RoleAdmin { return nil, errors.Errorf("user %q is not admin", username) } diff --git a/api/v2/acl_config.go b/api/v2/acl_config.go index 489bc50a..6b09d8fb 100644 --- a/api/v2/acl_config.go +++ b/api/v2/acl_config.go @@ -4,6 +4,7 @@ import "strings" var authenticationAllowlistMethods = map[string]bool{ "/memos.api.v2.SystemService/GetSystemInfo": true, + "/memos.api.v2.AuthService/GetAuthStatus": true, "/memos.api.v2.UserService/GetUser": true, "/memos.api.v2.MemoService/ListMemos": true, } diff --git a/api/v2/auth_service.go b/api/v2/auth_service.go new file mode 100644 index 00000000..6e7419ac --- /dev/null +++ b/api/v2/auth_service.go @@ -0,0 +1,18 @@ +package v2 + +import ( + "context" + + apiv2pb "github.com/usememos/memos/proto/gen/api/v2" +) + +func (s *APIV2Service) GetAuthStatus(ctx context.Context, _ *apiv2pb.GetAuthStatusRequest) (*apiv2pb.GetAuthStatusResponse, error) { + ok := true + user, err := getCurrentUser(ctx, s.Store) + if err != nil || user == nil { + ok = false + } + return &apiv2pb.GetAuthStatusResponse{ + Ok: ok, + }, nil +} diff --git a/proto/api/v2/auth_service.proto b/proto/api/v2/auth_service.proto new file mode 100644 index 00000000..f11ee6f8 --- /dev/null +++ b/proto/api/v2/auth_service.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; + +package memos.api.v2; + +import "google/api/annotations.proto"; + +option go_package = "gen/api/v2"; + +service AuthService { + rpc GetAuthStatus(GetAuthStatusRequest) returns (GetAuthStatusResponse) { + option (google.api.http) = {post: "/api/v2/auth/status"}; + } +} + +message GetAuthStatusRequest {} + +message GetAuthStatusResponse { + bool ok = 1; +} diff --git a/proto/gen/api/v2/README.md b/proto/gen/api/v2/README.md index b441429b..9db9aa8e 100644 --- a/proto/gen/api/v2/README.md +++ b/proto/gen/api/v2/README.md @@ -13,6 +13,12 @@ - [ActivityService](#memos-api-v2-ActivityService) +- [api/v2/auth_service.proto](#api_v2_auth_service-proto) + - [GetAuthStatusRequest](#memos-api-v2-GetAuthStatusRequest) + - [GetAuthStatusResponse](#memos-api-v2-GetAuthStatusResponse) + + - [AuthService](#memos-api-v2-AuthService) + - [api/v2/common.proto](#api_v2_common-proto) - [RowStatus](#memos-api-v2-RowStatus) @@ -246,6 +252,57 @@ + +

Top

+ +## api/v2/auth_service.proto + + + + + +### GetAuthStatusRequest + + + + + + + + + +### GetAuthStatusResponse + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| ok | [bool](#bool) | | | + + + + + + + + + + + + + + +### AuthService + + +| Method Name | Request Type | Response Type | Description | +| ----------- | ------------ | ------------- | ------------| +| GetAuthStatus | [GetAuthStatusRequest](#memos-api-v2-GetAuthStatusRequest) | [GetAuthStatusResponse](#memos-api-v2-GetAuthStatusResponse) | | + + + + +

Top

diff --git a/proto/gen/api/v2/auth_service.pb.go b/proto/gen/api/v2/auth_service.pb.go new file mode 100644 index 00000000..99c310e5 --- /dev/null +++ b/proto/gen/api/v2/auth_service.pb.go @@ -0,0 +1,219 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.31.0 +// protoc (unknown) +// source: api/v2/auth_service.proto + +package apiv2 + +import ( + _ "google.golang.org/genproto/googleapis/api/annotations" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type GetAuthStatusRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *GetAuthStatusRequest) Reset() { + *x = GetAuthStatusRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_api_v2_auth_service_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetAuthStatusRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetAuthStatusRequest) ProtoMessage() {} + +func (x *GetAuthStatusRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_v2_auth_service_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetAuthStatusRequest.ProtoReflect.Descriptor instead. +func (*GetAuthStatusRequest) Descriptor() ([]byte, []int) { + return file_api_v2_auth_service_proto_rawDescGZIP(), []int{0} +} + +type GetAuthStatusResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Ok bool `protobuf:"varint,1,opt,name=ok,proto3" json:"ok,omitempty"` +} + +func (x *GetAuthStatusResponse) Reset() { + *x = GetAuthStatusResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_api_v2_auth_service_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetAuthStatusResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetAuthStatusResponse) ProtoMessage() {} + +func (x *GetAuthStatusResponse) ProtoReflect() protoreflect.Message { + mi := &file_api_v2_auth_service_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetAuthStatusResponse.ProtoReflect.Descriptor instead. +func (*GetAuthStatusResponse) Descriptor() ([]byte, []int) { + return file_api_v2_auth_service_proto_rawDescGZIP(), []int{1} +} + +func (x *GetAuthStatusResponse) GetOk() bool { + if x != nil { + return x.Ok + } + return false +} + +var File_api_v2_auth_service_proto protoreflect.FileDescriptor + +var file_api_v2_auth_service_proto_rawDesc = []byte{ + 0x0a, 0x19, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x6d, 0x65, 0x6d, + 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x16, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x41, 0x75, + 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, + 0x27, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6f, 0x6b, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x02, 0x6f, 0x6b, 0x32, 0x84, 0x01, 0x0a, 0x0b, 0x41, 0x75, 0x74, + 0x68, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x75, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, + 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x22, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, + 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x75, 0x74, 0x68, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, + 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, + 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x22, 0x13, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, + 0xa8, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, + 0x69, 0x2e, 0x76, 0x32, 0x42, 0x10, 0x41, 0x75, 0x74, 0x68, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, + 0x6d, 0x6f, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, + 0xaa, 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0xca, + 0x02, 0x0c, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0xe2, 0x02, + 0x18, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, + 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, + 0x73, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, +} + +var ( + file_api_v2_auth_service_proto_rawDescOnce sync.Once + file_api_v2_auth_service_proto_rawDescData = file_api_v2_auth_service_proto_rawDesc +) + +func file_api_v2_auth_service_proto_rawDescGZIP() []byte { + file_api_v2_auth_service_proto_rawDescOnce.Do(func() { + file_api_v2_auth_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_api_v2_auth_service_proto_rawDescData) + }) + return file_api_v2_auth_service_proto_rawDescData +} + +var file_api_v2_auth_service_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_api_v2_auth_service_proto_goTypes = []interface{}{ + (*GetAuthStatusRequest)(nil), // 0: memos.api.v2.GetAuthStatusRequest + (*GetAuthStatusResponse)(nil), // 1: memos.api.v2.GetAuthStatusResponse +} +var file_api_v2_auth_service_proto_depIdxs = []int32{ + 0, // 0: memos.api.v2.AuthService.GetAuthStatus:input_type -> memos.api.v2.GetAuthStatusRequest + 1, // 1: memos.api.v2.AuthService.GetAuthStatus:output_type -> memos.api.v2.GetAuthStatusResponse + 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_auth_service_proto_init() } +func file_api_v2_auth_service_proto_init() { + if File_api_v2_auth_service_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_api_v2_auth_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetAuthStatusRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_api_v2_auth_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetAuthStatusResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_api_v2_auth_service_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_api_v2_auth_service_proto_goTypes, + DependencyIndexes: file_api_v2_auth_service_proto_depIdxs, + MessageInfos: file_api_v2_auth_service_proto_msgTypes, + }.Build() + File_api_v2_auth_service_proto = out.File + file_api_v2_auth_service_proto_rawDesc = nil + file_api_v2_auth_service_proto_goTypes = nil + file_api_v2_auth_service_proto_depIdxs = nil +} diff --git a/proto/gen/api/v2/auth_service.pb.gw.go b/proto/gen/api/v2/auth_service.pb.gw.go new file mode 100644 index 00000000..247a3a5b --- /dev/null +++ b/proto/gen/api/v2/auth_service.pb.gw.go @@ -0,0 +1,155 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: api/v2/auth_service.proto + +/* +Package apiv2 is a reverse proxy. + +It translates gRPC into RESTful JSON APIs. +*/ +package apiv2 + +import ( + "context" + "io" + "net/http" + + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" + "google.golang.org/protobuf/proto" +) + +// Suppress "imported and not used" errors +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = metadata.Join + +func request_AuthService_GetAuthStatus_0(ctx context.Context, marshaler runtime.Marshaler, client AuthServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetAuthStatusRequest + var metadata runtime.ServerMetadata + + msg, err := client.GetAuthStatus(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_AuthService_GetAuthStatus_0(ctx context.Context, marshaler runtime.Marshaler, server AuthServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetAuthStatusRequest + var metadata runtime.ServerMetadata + + msg, err := server.GetAuthStatus(ctx, &protoReq) + return msg, metadata, err + +} + +// RegisterAuthServiceHandlerServer registers the http handlers for service AuthService to "mux". +// UnaryRPC :call AuthServiceServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterAuthServiceHandlerFromEndpoint instead. +func RegisterAuthServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server AuthServiceServer) error { + + mux.Handle("POST", pattern_AuthService_GetAuthStatus_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.AuthService/GetAuthStatus", runtime.WithHTTPPathPattern("/api/v2/auth/status")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_AuthService_GetAuthStatus_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_AuthService_GetAuthStatus_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +// RegisterAuthServiceHandlerFromEndpoint is same as RegisterAuthServiceHandler but +// automatically dials to "endpoint" and closes the connection when "ctx" gets done. +func RegisterAuthServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { + conn, err := grpc.DialContext(ctx, endpoint, opts...) + if err != nil { + return err + } + defer func() { + if err != nil { + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + return + } + go func() { + <-ctx.Done() + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + }() + }() + + return RegisterAuthServiceHandler(ctx, mux, conn) +} + +// RegisterAuthServiceHandler registers the http handlers for service AuthService to "mux". +// The handlers forward requests to the grpc endpoint over "conn". +func RegisterAuthServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterAuthServiceHandlerClient(ctx, mux, NewAuthServiceClient(conn)) +} + +// RegisterAuthServiceHandlerClient registers the http handlers for service AuthService +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "AuthServiceClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "AuthServiceClient" +// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in +// "AuthServiceClient" to call the correct interceptors. +func RegisterAuthServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client AuthServiceClient) error { + + mux.Handle("POST", pattern_AuthService_GetAuthStatus_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.AuthService/GetAuthStatus", runtime.WithHTTPPathPattern("/api/v2/auth/status")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_AuthService_GetAuthStatus_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + + forward_AuthService_GetAuthStatus_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_AuthService_GetAuthStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "auth", "status"}, "")) +) + +var ( + forward_AuthService_GetAuthStatus_0 = runtime.ForwardResponseMessage +) diff --git a/proto/gen/api/v2/auth_service_grpc.pb.go b/proto/gen/api/v2/auth_service_grpc.pb.go new file mode 100644 index 00000000..7b89669b --- /dev/null +++ b/proto/gen/api/v2/auth_service_grpc.pb.go @@ -0,0 +1,109 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc (unknown) +// source: api/v2/auth_service.proto + +package apiv2 + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 + +const ( + AuthService_GetAuthStatus_FullMethodName = "/memos.api.v2.AuthService/GetAuthStatus" +) + +// AuthServiceClient is the client API for AuthService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type AuthServiceClient interface { + GetAuthStatus(ctx context.Context, in *GetAuthStatusRequest, opts ...grpc.CallOption) (*GetAuthStatusResponse, error) +} + +type authServiceClient struct { + cc grpc.ClientConnInterface +} + +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) + err := c.cc.Invoke(ctx, AuthService_GetAuthStatus_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// AuthServiceServer is the server API for AuthService service. +// All implementations must embed UnimplementedAuthServiceServer +// for forward compatibility +type AuthServiceServer interface { + GetAuthStatus(context.Context, *GetAuthStatusRequest) (*GetAuthStatusResponse, error) + mustEmbedUnimplementedAuthServiceServer() +} + +// UnimplementedAuthServiceServer must be embedded to have forward compatible implementations. +type UnimplementedAuthServiceServer struct { +} + +func (UnimplementedAuthServiceServer) GetAuthStatus(context.Context, *GetAuthStatusRequest) (*GetAuthStatusResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetAuthStatus not implemented") +} +func (UnimplementedAuthServiceServer) mustEmbedUnimplementedAuthServiceServer() {} + +// UnsafeAuthServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to AuthServiceServer will +// result in compilation errors. +type UnsafeAuthServiceServer interface { + mustEmbedUnimplementedAuthServiceServer() +} + +func RegisterAuthServiceServer(s grpc.ServiceRegistrar, srv AuthServiceServer) { + s.RegisterService(&AuthService_ServiceDesc, srv) +} + +func _AuthService_GetAuthStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetAuthStatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AuthServiceServer).GetAuthStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AuthService_GetAuthStatus_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AuthServiceServer).GetAuthStatus(ctx, req.(*GetAuthStatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// AuthService_ServiceDesc is the grpc.ServiceDesc for AuthService service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var AuthService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "memos.api.v2.AuthService", + HandlerType: (*AuthServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "GetAuthStatus", + Handler: _AuthService_GetAuthStatus_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "api/v2/auth_service.proto", +} diff --git a/web/src/grpcweb.ts b/web/src/grpcweb.ts index 5aa75e32..975184b7 100644 --- a/web/src/grpcweb.ts +++ b/web/src/grpcweb.ts @@ -1,5 +1,6 @@ import { createChannel, createClientFactory, FetchTransport } from "nice-grpc-web"; import { ActivityServiceDefinition } from "./types/proto/api/v2/activity_service"; +import { AuthServiceDefinition } from "./types/proto/api/v2/auth_service"; import { InboxServiceDefinition } from "./types/proto/api/v2/inbox_service"; import { MemoServiceDefinition } from "./types/proto/api/v2/memo_service"; import { ResourceServiceDefinition } from "./types/proto/api/v2/resource_service"; @@ -17,6 +18,8 @@ const channel = createChannel( const clientFactory = createClientFactory(); +export const authServiceClient = clientFactory.create(AuthServiceDefinition, channel); + export const userServiceClient = clientFactory.create(UserServiceDefinition, channel); export const memoServiceClient = clientFactory.create(MemoServiceDefinition, channel); diff --git a/web/src/store/module/user.ts b/web/src/store/module/user.ts index d95319f0..2d2afceb 100644 --- a/web/src/store/module/user.ts +++ b/web/src/store/module/user.ts @@ -1,5 +1,5 @@ import { camelCase } from "lodash-es"; -import { userServiceClient } from "@/grpcweb"; +import { authServiceClient, userServiceClient } from "@/grpcweb"; import * as api from "@/helpers/api"; import storage from "@/helpers/storage"; import { getSystemColorScheme } from "@/helpers/utils"; @@ -78,6 +78,11 @@ const doSignOut = async () => { const fetchCurrentUser = async () => { const userId = localStorage.getItem("userId"); if (userId) { + const { ok } = await authServiceClient.getAuthStatus({}); + if (!ok) { + localStorage.removeItem("userId"); + return; + } const { data } = await api.getUserById(Number(userId)); const user = convertResponseModelUser(data); if (user) {