diff --git a/gen/admin/admin-account.ts b/gen/admin/admin-account.ts index 6f098d7..02a819b 100644 --- a/gen/admin/admin-account.ts +++ b/gen/admin/admin-account.ts @@ -9,17 +9,7 @@ import type { Metadata } from "@grpc/grpc-js"; import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices"; import { Observable } from "rxjs"; -export const protobufPackage = "admin.account.v1"; - -export interface AdminResetPasswordRequest { - userId: string; - newPassword: string; -} - -export interface AdminResetPasswordResponse { - success: boolean; - message: string; -} +export const protobufPackage = "admin.v1"; export interface CreateUserRequest { username: string; @@ -41,46 +31,6 @@ export interface DeleteUserResponse { message: string; } -export interface ChangeDataRequest { - userId: string; - sessionId: string; - email?: string | undefined; - phone?: string | undefined; - fullName?: string | undefined; - avatarUrl?: string | undefined; - customStatusText?: string | undefined; - customStatusEmoji?: string | undefined; - timezone?: string | undefined; - language?: string | undefined; - isPublic?: boolean | undefined; -} - -export interface ChangeDataResponse { - success: boolean; - message: string; -} - -export interface AssignRoleRequest { - userId: string; - /** В gRPC передаем как string, внутри преобразуем в Int */ - roleId: string; -} - -export interface AssignRoleResponse { - success: boolean; - message: string; -} - -export interface RevokeRoleRequest { - userId: string; - roleId: string; -} - -export interface RevokeRoleResponse { - success: boolean; - message: string; -} - export interface BlockUserRequest { /** Кого блокируем */ userId: string; @@ -104,6 +54,56 @@ export interface UnblockUserResponse { message: string; } +export interface ChangeDataRequest { + userId: string; + sessionId: string; + email?: string | undefined; + phone?: string | undefined; + fullName?: string | undefined; + avatarUrl?: string | undefined; + customStatusText?: string | undefined; + customStatusEmoji?: string | undefined; + timezone?: string | undefined; + language?: string | undefined; + isPublic?: boolean | undefined; +} + +export interface ChangeDataResponse { + success: boolean; + message: string; +} + +export interface AdminResetPasswordRequest { + userId: string; + newPassword: string; +} + +export interface AdminResetPasswordResponse { + success: boolean; + message: string; +} + +export interface AssignRoleRequest { + userId: string; + /** Передаем как string, внутри парсим в Int */ + roleId: string; +} + +export interface AssignRoleResponse { + success: boolean; + message: string; +} + +export interface RevokeRoleRequest { + userId: string; + roleId: string; +} + +export interface RevokeRoleResponse { + success: boolean; + message: string; +} + export interface BlockIpRequest { ipAddress: string; adminId: string; @@ -125,7 +125,7 @@ export interface UnblockIpResponse { message: string; } -/** Можно оставить пустым, так как нам не нужны входные данные */ +/** Пустой запрос, так как параметры не требуются */ export interface SyncUsersToSearchRequest { } @@ -134,37 +134,48 @@ export interface SyncUsersToSearchResponse { message: string; } -export const ADMIN_ACCOUNT_V1_PACKAGE_NAME = "admin.account.v1"; +export const ADMIN_V1_PACKAGE_NAME = "admin.v1"; -export interface AdminAccountServiceClient { - adminResetPassword(request: AdminResetPasswordRequest, metadata?: Metadata): Observable; +/** Единый сервис для всех административных операций */ + +export interface AdminServiceClient { + /** Управление учетными записями */ createUser(request: CreateUserRequest, metadata?: Metadata): Observable; deleteUser(request: DeleteUserRequest, metadata?: Metadata): Observable; + blockUser(request: BlockUserRequest, metadata?: Metadata): Observable; + + unblockUser(request: UnblockUserRequest, metadata?: Metadata): Observable; + + /** Управление данными и безопасностью */ + changeData(request: ChangeDataRequest, metadata?: Metadata): Observable; + adminResetPassword(request: AdminResetPasswordRequest, metadata?: Metadata): Observable; + + /** Управление ролями (RBAC) */ + assignRole(request: AssignRoleRequest, metadata?: Metadata): Observable; revokeRole(request: RevokeRoleRequest, metadata?: Metadata): Observable; - blockUser(request: BlockUserRequest, metadata?: Metadata): Observable; - - unblockUser(request: UnblockUserRequest, metadata?: Metadata): Observable; + /** Управление черным списком IP */ blockIp(request: BlockIpRequest, metadata?: Metadata): Observable; unblockIp(request: UnblockIpRequest, metadata?: Metadata): Observable; + /** Синхронизация с поисковым движком (Elasticsearch) */ + syncUsersToSearch(request: SyncUsersToSearchRequest, metadata?: Metadata): Observable; } -export interface AdminAccountServiceController { - adminResetPassword( - request: AdminResetPasswordRequest, - metadata?: Metadata, - ): Promise | Observable | AdminResetPasswordResponse; +/** Единый сервис для всех административных операций */ + +export interface AdminServiceController { + /** Управление учетными записями */ createUser( request: CreateUserRequest, @@ -176,11 +187,30 @@ export interface AdminAccountServiceController { metadata?: Metadata, ): Promise | Observable | DeleteUserResponse; + blockUser( + request: BlockUserRequest, + metadata?: Metadata, + ): Promise | Observable | BlockUserResponse; + + unblockUser( + request: UnblockUserRequest, + metadata?: Metadata, + ): Promise | Observable | UnblockUserResponse; + + /** Управление данными и безопасностью */ + changeData( request: ChangeDataRequest, metadata?: Metadata, ): Promise | Observable | ChangeDataResponse; + adminResetPassword( + request: AdminResetPasswordRequest, + metadata?: Metadata, + ): Promise | Observable | AdminResetPasswordResponse; + + /** Управление ролями (RBAC) */ + assignRole( request: AssignRoleRequest, metadata?: Metadata, @@ -191,15 +221,7 @@ export interface AdminAccountServiceController { metadata?: Metadata, ): Promise | Observable | RevokeRoleResponse; - blockUser( - request: BlockUserRequest, - metadata?: Metadata, - ): Promise | Observable | BlockUserResponse; - - unblockUser( - request: UnblockUserRequest, - metadata?: Metadata, - ): Promise | Observable | UnblockUserResponse; + /** Управление черным списком IP */ blockIp( request: BlockIpRequest, @@ -211,37 +233,39 @@ export interface AdminAccountServiceController { metadata?: Metadata, ): Promise | Observable | UnblockIpResponse; + /** Синхронизация с поисковым движком (Elasticsearch) */ + syncUsersToSearch( request: SyncUsersToSearchRequest, metadata?: Metadata, ): Promise | Observable | SyncUsersToSearchResponse; } -export function AdminAccountServiceControllerMethods() { +export function AdminServiceControllerMethods() { return function (constructor: Function) { const grpcMethods: string[] = [ - "adminResetPassword", "createUser", "deleteUser", - "changeData", - "assignRole", - "revokeRole", "blockUser", "unblockUser", + "changeData", + "adminResetPassword", + "assignRole", + "revokeRole", "blockIp", "unblockIp", "syncUsersToSearch", ]; for (const method of grpcMethods) { const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method); - GrpcMethod("AdminAccountService", method)(constructor.prototype[method], method, descriptor); + GrpcMethod("AdminService", method)(constructor.prototype[method], method, descriptor); } const grpcStreamMethods: string[] = []; for (const method of grpcStreamMethods) { const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method); - GrpcStreamMethod("AdminAccountService", method)(constructor.prototype[method], method, descriptor); + GrpcStreamMethod("AdminService", method)(constructor.prototype[method], method, descriptor); } }; } -export const ADMIN_ACCOUNT_SERVICE_NAME = "AdminAccountService"; +export const ADMIN_SERVICE_NAME = "AdminService"; diff --git a/gen/go/admin/admin-account.pb.go b/gen/go/admin/admin-account.pb.go index ea0a37f..441c460 100644 --- a/gen/go/admin/admin-account.pb.go +++ b/gen/go/admin/admin-account.pb.go @@ -21,110 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type AdminResetPasswordRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - UserId string `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` - NewPassword string `protobuf:"bytes,2,opt,name=new_password,json=newPassword,proto3" json:"new_password,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *AdminResetPasswordRequest) Reset() { - *x = AdminResetPasswordRequest{} - mi := &file_admin_admin_account_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *AdminResetPasswordRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AdminResetPasswordRequest) ProtoMessage() {} - -func (x *AdminResetPasswordRequest) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[0] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AdminResetPasswordRequest.ProtoReflect.Descriptor instead. -func (*AdminResetPasswordRequest) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{0} -} - -func (x *AdminResetPasswordRequest) GetUserId() string { - if x != nil { - return x.UserId - } - return "" -} - -func (x *AdminResetPasswordRequest) GetNewPassword() string { - if x != nil { - return x.NewPassword - } - return "" -} - -type AdminResetPasswordResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` - Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` - Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *AdminResetPasswordResponse) Reset() { - *x = AdminResetPasswordResponse{} - mi := &file_admin_admin_account_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *AdminResetPasswordResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AdminResetPasswordResponse) ProtoMessage() {} - -func (x *AdminResetPasswordResponse) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[1] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AdminResetPasswordResponse.ProtoReflect.Descriptor instead. -func (*AdminResetPasswordResponse) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{1} -} - -func (x *AdminResetPasswordResponse) GetSuccess() bool { - if x != nil { - return x.Success - } - return false -} - -func (x *AdminResetPasswordResponse) GetMessage() string { - if x != nil { - return x.Message - } - return "" -} - type CreateUserRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` @@ -136,7 +32,7 @@ type CreateUserRequest struct { func (x *CreateUserRequest) Reset() { *x = CreateUserRequest{} - mi := &file_admin_admin_account_proto_msgTypes[2] + mi := &file_admin_admin_account_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -148,7 +44,7 @@ func (x *CreateUserRequest) String() string { func (*CreateUserRequest) ProtoMessage() {} func (x *CreateUserRequest) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[2] + mi := &file_admin_admin_account_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -161,7 +57,7 @@ func (x *CreateUserRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateUserRequest.ProtoReflect.Descriptor instead. func (*CreateUserRequest) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{2} + return file_admin_admin_account_proto_rawDescGZIP(), []int{0} } func (x *CreateUserRequest) GetUsername() string { @@ -195,7 +91,7 @@ type CreateUserResponse struct { func (x *CreateUserResponse) Reset() { *x = CreateUserResponse{} - mi := &file_admin_admin_account_proto_msgTypes[3] + mi := &file_admin_admin_account_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -207,7 +103,7 @@ func (x *CreateUserResponse) String() string { func (*CreateUserResponse) ProtoMessage() {} func (x *CreateUserResponse) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[3] + mi := &file_admin_admin_account_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -220,7 +116,7 @@ func (x *CreateUserResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateUserResponse.ProtoReflect.Descriptor instead. func (*CreateUserResponse) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{3} + return file_admin_admin_account_proto_rawDescGZIP(), []int{1} } func (x *CreateUserResponse) GetSuccess() bool { @@ -246,7 +142,7 @@ type DeleteUserRequest struct { func (x *DeleteUserRequest) Reset() { *x = DeleteUserRequest{} - mi := &file_admin_admin_account_proto_msgTypes[4] + mi := &file_admin_admin_account_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -258,7 +154,7 @@ func (x *DeleteUserRequest) String() string { func (*DeleteUserRequest) ProtoMessage() {} func (x *DeleteUserRequest) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[4] + mi := &file_admin_admin_account_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -271,7 +167,7 @@ func (x *DeleteUserRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteUserRequest.ProtoReflect.Descriptor instead. func (*DeleteUserRequest) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{4} + return file_admin_admin_account_proto_rawDescGZIP(), []int{2} } func (x *DeleteUserRequest) GetUserId() string { @@ -291,7 +187,7 @@ type DeleteUserResponse struct { func (x *DeleteUserResponse) Reset() { *x = DeleteUserResponse{} - mi := &file_admin_admin_account_proto_msgTypes[5] + mi := &file_admin_admin_account_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -303,7 +199,7 @@ func (x *DeleteUserResponse) String() string { func (*DeleteUserResponse) ProtoMessage() {} func (x *DeleteUserResponse) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[5] + mi := &file_admin_admin_account_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -316,7 +212,7 @@ func (x *DeleteUserResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteUserResponse.ProtoReflect.Descriptor instead. func (*DeleteUserResponse) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{5} + return file_admin_admin_account_proto_rawDescGZIP(), []int{3} } func (x *DeleteUserResponse) GetSuccess() bool { @@ -333,6 +229,222 @@ func (x *DeleteUserResponse) GetMessage() string { return "" } +type BlockUserRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + UserId string `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` // Кого блокируем + AdminId string `protobuf:"bytes,2,opt,name=admin_id,json=adminId,proto3" json:"admin_id,omitempty"` // Кто блокирует + Reason *string `protobuf:"bytes,3,opt,name=reason,proto3,oneof" json:"reason,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *BlockUserRequest) Reset() { + *x = BlockUserRequest{} + mi := &file_admin_admin_account_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *BlockUserRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*BlockUserRequest) ProtoMessage() {} + +func (x *BlockUserRequest) ProtoReflect() protoreflect.Message { + mi := &file_admin_admin_account_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use BlockUserRequest.ProtoReflect.Descriptor instead. +func (*BlockUserRequest) Descriptor() ([]byte, []int) { + return file_admin_admin_account_proto_rawDescGZIP(), []int{4} +} + +func (x *BlockUserRequest) GetUserId() string { + if x != nil { + return x.UserId + } + return "" +} + +func (x *BlockUserRequest) GetAdminId() string { + if x != nil { + return x.AdminId + } + return "" +} + +func (x *BlockUserRequest) GetReason() string { + if x != nil && x.Reason != nil { + return *x.Reason + } + return "" +} + +type BlockUserResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *BlockUserResponse) Reset() { + *x = BlockUserResponse{} + mi := &file_admin_admin_account_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *BlockUserResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*BlockUserResponse) ProtoMessage() {} + +func (x *BlockUserResponse) ProtoReflect() protoreflect.Message { + mi := &file_admin_admin_account_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use BlockUserResponse.ProtoReflect.Descriptor instead. +func (*BlockUserResponse) Descriptor() ([]byte, []int) { + return file_admin_admin_account_proto_rawDescGZIP(), []int{5} +} + +func (x *BlockUserResponse) GetSuccess() bool { + if x != nil { + return x.Success + } + return false +} + +func (x *BlockUserResponse) GetMessage() string { + if x != nil { + return x.Message + } + return "" +} + +type UnblockUserRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + UserId string `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` + AdminId string `protobuf:"bytes,2,opt,name=admin_id,json=adminId,proto3" json:"admin_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UnblockUserRequest) Reset() { + *x = UnblockUserRequest{} + mi := &file_admin_admin_account_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UnblockUserRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UnblockUserRequest) ProtoMessage() {} + +func (x *UnblockUserRequest) ProtoReflect() protoreflect.Message { + mi := &file_admin_admin_account_proto_msgTypes[6] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UnblockUserRequest.ProtoReflect.Descriptor instead. +func (*UnblockUserRequest) Descriptor() ([]byte, []int) { + return file_admin_admin_account_proto_rawDescGZIP(), []int{6} +} + +func (x *UnblockUserRequest) GetUserId() string { + if x != nil { + return x.UserId + } + return "" +} + +func (x *UnblockUserRequest) GetAdminId() string { + if x != nil { + return x.AdminId + } + return "" +} + +type UnblockUserResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UnblockUserResponse) Reset() { + *x = UnblockUserResponse{} + mi := &file_admin_admin_account_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UnblockUserResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UnblockUserResponse) ProtoMessage() {} + +func (x *UnblockUserResponse) ProtoReflect() protoreflect.Message { + mi := &file_admin_admin_account_proto_msgTypes[7] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UnblockUserResponse.ProtoReflect.Descriptor instead. +func (*UnblockUserResponse) Descriptor() ([]byte, []int) { + return file_admin_admin_account_proto_rawDescGZIP(), []int{7} +} + +func (x *UnblockUserResponse) GetSuccess() bool { + if x != nil { + return x.Success + } + return false +} + +func (x *UnblockUserResponse) GetMessage() string { + if x != nil { + return x.Message + } + return "" +} + type ChangeDataRequest struct { state protoimpl.MessageState `protogen:"open.v1"` UserId string `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` @@ -352,7 +464,7 @@ type ChangeDataRequest struct { func (x *ChangeDataRequest) Reset() { *x = ChangeDataRequest{} - mi := &file_admin_admin_account_proto_msgTypes[6] + mi := &file_admin_admin_account_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -364,7 +476,7 @@ func (x *ChangeDataRequest) String() string { func (*ChangeDataRequest) ProtoMessage() {} func (x *ChangeDataRequest) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[6] + mi := &file_admin_admin_account_proto_msgTypes[8] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -377,7 +489,7 @@ func (x *ChangeDataRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ChangeDataRequest.ProtoReflect.Descriptor instead. func (*ChangeDataRequest) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{6} + return file_admin_admin_account_proto_rawDescGZIP(), []int{8} } func (x *ChangeDataRequest) GetUserId() string { @@ -467,7 +579,7 @@ type ChangeDataResponse struct { func (x *ChangeDataResponse) Reset() { *x = ChangeDataResponse{} - mi := &file_admin_admin_account_proto_msgTypes[7] + mi := &file_admin_admin_account_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -479,7 +591,7 @@ func (x *ChangeDataResponse) String() string { func (*ChangeDataResponse) ProtoMessage() {} func (x *ChangeDataResponse) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[7] + mi := &file_admin_admin_account_proto_msgTypes[9] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -492,7 +604,7 @@ func (x *ChangeDataResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ChangeDataResponse.ProtoReflect.Descriptor instead. func (*ChangeDataResponse) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{7} + return file_admin_admin_account_proto_rawDescGZIP(), []int{9} } func (x *ChangeDataResponse) GetSuccess() bool { @@ -509,17 +621,121 @@ func (x *ChangeDataResponse) GetMessage() string { return "" } +type AdminResetPasswordRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + UserId string `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` + NewPassword string `protobuf:"bytes,2,opt,name=new_password,json=newPassword,proto3" json:"new_password,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *AdminResetPasswordRequest) Reset() { + *x = AdminResetPasswordRequest{} + mi := &file_admin_admin_account_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *AdminResetPasswordRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AdminResetPasswordRequest) ProtoMessage() {} + +func (x *AdminResetPasswordRequest) ProtoReflect() protoreflect.Message { + mi := &file_admin_admin_account_proto_msgTypes[10] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use AdminResetPasswordRequest.ProtoReflect.Descriptor instead. +func (*AdminResetPasswordRequest) Descriptor() ([]byte, []int) { + return file_admin_admin_account_proto_rawDescGZIP(), []int{10} +} + +func (x *AdminResetPasswordRequest) GetUserId() string { + if x != nil { + return x.UserId + } + return "" +} + +func (x *AdminResetPasswordRequest) GetNewPassword() string { + if x != nil { + return x.NewPassword + } + return "" +} + +type AdminResetPasswordResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *AdminResetPasswordResponse) Reset() { + *x = AdminResetPasswordResponse{} + mi := &file_admin_admin_account_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *AdminResetPasswordResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AdminResetPasswordResponse) ProtoMessage() {} + +func (x *AdminResetPasswordResponse) ProtoReflect() protoreflect.Message { + mi := &file_admin_admin_account_proto_msgTypes[11] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use AdminResetPasswordResponse.ProtoReflect.Descriptor instead. +func (*AdminResetPasswordResponse) Descriptor() ([]byte, []int) { + return file_admin_admin_account_proto_rawDescGZIP(), []int{11} +} + +func (x *AdminResetPasswordResponse) GetSuccess() bool { + if x != nil { + return x.Success + } + return false +} + +func (x *AdminResetPasswordResponse) GetMessage() string { + if x != nil { + return x.Message + } + return "" +} + type AssignRoleRequest struct { state protoimpl.MessageState `protogen:"open.v1"` UserId string `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` - RoleId string `protobuf:"bytes,2,opt,name=role_id,json=roleId,proto3" json:"role_id,omitempty"` // В gRPC передаем как string, внутри преобразуем в Int + RoleId string `protobuf:"bytes,2,opt,name=role_id,json=roleId,proto3" json:"role_id,omitempty"` // Передаем как string, внутри парсим в Int unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } func (x *AssignRoleRequest) Reset() { *x = AssignRoleRequest{} - mi := &file_admin_admin_account_proto_msgTypes[8] + mi := &file_admin_admin_account_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -531,7 +747,7 @@ func (x *AssignRoleRequest) String() string { func (*AssignRoleRequest) ProtoMessage() {} func (x *AssignRoleRequest) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[8] + mi := &file_admin_admin_account_proto_msgTypes[12] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -544,7 +760,7 @@ func (x *AssignRoleRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AssignRoleRequest.ProtoReflect.Descriptor instead. func (*AssignRoleRequest) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{8} + return file_admin_admin_account_proto_rawDescGZIP(), []int{12} } func (x *AssignRoleRequest) GetUserId() string { @@ -571,7 +787,7 @@ type AssignRoleResponse struct { func (x *AssignRoleResponse) Reset() { *x = AssignRoleResponse{} - mi := &file_admin_admin_account_proto_msgTypes[9] + mi := &file_admin_admin_account_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -583,7 +799,7 @@ func (x *AssignRoleResponse) String() string { func (*AssignRoleResponse) ProtoMessage() {} func (x *AssignRoleResponse) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[9] + mi := &file_admin_admin_account_proto_msgTypes[13] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -596,7 +812,7 @@ func (x *AssignRoleResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use AssignRoleResponse.ProtoReflect.Descriptor instead. func (*AssignRoleResponse) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{9} + return file_admin_admin_account_proto_rawDescGZIP(), []int{13} } func (x *AssignRoleResponse) GetSuccess() bool { @@ -623,7 +839,7 @@ type RevokeRoleRequest struct { func (x *RevokeRoleRequest) Reset() { *x = RevokeRoleRequest{} - mi := &file_admin_admin_account_proto_msgTypes[10] + mi := &file_admin_admin_account_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -635,7 +851,7 @@ func (x *RevokeRoleRequest) String() string { func (*RevokeRoleRequest) ProtoMessage() {} func (x *RevokeRoleRequest) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[10] + mi := &file_admin_admin_account_proto_msgTypes[14] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -648,7 +864,7 @@ func (x *RevokeRoleRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use RevokeRoleRequest.ProtoReflect.Descriptor instead. func (*RevokeRoleRequest) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{10} + return file_admin_admin_account_proto_rawDescGZIP(), []int{14} } func (x *RevokeRoleRequest) GetUserId() string { @@ -675,7 +891,7 @@ type RevokeRoleResponse struct { func (x *RevokeRoleResponse) Reset() { *x = RevokeRoleResponse{} - mi := &file_admin_admin_account_proto_msgTypes[11] + mi := &file_admin_admin_account_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -687,7 +903,7 @@ func (x *RevokeRoleResponse) String() string { func (*RevokeRoleResponse) ProtoMessage() {} func (x *RevokeRoleResponse) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[11] + mi := &file_admin_admin_account_proto_msgTypes[15] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -700,7 +916,7 @@ func (x *RevokeRoleResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use RevokeRoleResponse.ProtoReflect.Descriptor instead. func (*RevokeRoleResponse) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{11} + return file_admin_admin_account_proto_rawDescGZIP(), []int{15} } func (x *RevokeRoleResponse) GetSuccess() bool { @@ -717,222 +933,6 @@ func (x *RevokeRoleResponse) GetMessage() string { return "" } -type BlockUserRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - UserId string `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` // Кого блокируем - AdminId string `protobuf:"bytes,2,opt,name=admin_id,json=adminId,proto3" json:"admin_id,omitempty"` // Кто блокирует - Reason *string `protobuf:"bytes,3,opt,name=reason,proto3,oneof" json:"reason,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *BlockUserRequest) Reset() { - *x = BlockUserRequest{} - mi := &file_admin_admin_account_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *BlockUserRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*BlockUserRequest) ProtoMessage() {} - -func (x *BlockUserRequest) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[12] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use BlockUserRequest.ProtoReflect.Descriptor instead. -func (*BlockUserRequest) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{12} -} - -func (x *BlockUserRequest) GetUserId() string { - if x != nil { - return x.UserId - } - return "" -} - -func (x *BlockUserRequest) GetAdminId() string { - if x != nil { - return x.AdminId - } - return "" -} - -func (x *BlockUserRequest) GetReason() string { - if x != nil && x.Reason != nil { - return *x.Reason - } - return "" -} - -type BlockUserResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` - Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` - Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *BlockUserResponse) Reset() { - *x = BlockUserResponse{} - mi := &file_admin_admin_account_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *BlockUserResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*BlockUserResponse) ProtoMessage() {} - -func (x *BlockUserResponse) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[13] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use BlockUserResponse.ProtoReflect.Descriptor instead. -func (*BlockUserResponse) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{13} -} - -func (x *BlockUserResponse) GetSuccess() bool { - if x != nil { - return x.Success - } - return false -} - -func (x *BlockUserResponse) GetMessage() string { - if x != nil { - return x.Message - } - return "" -} - -type UnblockUserRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - UserId string `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` - AdminId string `protobuf:"bytes,2,opt,name=admin_id,json=adminId,proto3" json:"admin_id,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *UnblockUserRequest) Reset() { - *x = UnblockUserRequest{} - mi := &file_admin_admin_account_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *UnblockUserRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UnblockUserRequest) ProtoMessage() {} - -func (x *UnblockUserRequest) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[14] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use UnblockUserRequest.ProtoReflect.Descriptor instead. -func (*UnblockUserRequest) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{14} -} - -func (x *UnblockUserRequest) GetUserId() string { - if x != nil { - return x.UserId - } - return "" -} - -func (x *UnblockUserRequest) GetAdminId() string { - if x != nil { - return x.AdminId - } - return "" -} - -type UnblockUserResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` - Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` - Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *UnblockUserResponse) Reset() { - *x = UnblockUserResponse{} - mi := &file_admin_admin_account_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *UnblockUserResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UnblockUserResponse) ProtoMessage() {} - -func (x *UnblockUserResponse) ProtoReflect() protoreflect.Message { - mi := &file_admin_admin_account_proto_msgTypes[15] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use UnblockUserResponse.ProtoReflect.Descriptor instead. -func (*UnblockUserResponse) Descriptor() ([]byte, []int) { - return file_admin_admin_account_proto_rawDescGZIP(), []int{15} -} - -func (x *UnblockUserResponse) GetSuccess() bool { - if x != nil { - return x.Success - } - return false -} - -func (x *UnblockUserResponse) GetMessage() string { - if x != nil { - return x.Message - } - return "" -} - type BlockIpRequest struct { state protoimpl.MessageState `protogen:"open.v1"` IpAddress string `protobuf:"bytes,1,opt,name=ip_address,json=ipAddress,proto3" json:"ip_address,omitempty"` @@ -1241,13 +1241,7 @@ var File_admin_admin_account_proto protoreflect.FileDescriptor const file_admin_admin_account_proto_rawDesc = "" + "\n" + - "\x19admin/admin-account.proto\x12\x10admin.account.v1\"W\n" + - "\x19AdminResetPasswordRequest\x12\x17\n" + - "\auser_id\x18\x01 \x01(\tR\x06userId\x12!\n" + - "\fnew_password\x18\x02 \x01(\tR\vnewPassword\"P\n" + - "\x1aAdminResetPasswordResponse\x12\x18\n" + - "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + - "\amessage\x18\x02 \x01(\tR\amessage\"a\n" + + "\x19admin/admin-account.proto\x12\badmin.v1\"a\n" + "\x11CreateUserRequest\x12\x1a\n" + "\busername\x18\x01 \x01(\tR\busername\x12\x1a\n" + "\bpassword\x18\x02 \x01(\tR\bpassword\x12\x14\n" + @@ -1259,6 +1253,20 @@ const file_admin_admin_account_proto_rawDesc = "" + "\auser_id\x18\x01 \x01(\tR\x06userId\"H\n" + "\x12DeleteUserResponse\x12\x18\n" + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + + "\amessage\x18\x02 \x01(\tR\amessage\"n\n" + + "\x10BlockUserRequest\x12\x17\n" + + "\auser_id\x18\x01 \x01(\tR\x06userId\x12\x19\n" + + "\badmin_id\x18\x02 \x01(\tR\aadminId\x12\x1b\n" + + "\x06reason\x18\x03 \x01(\tH\x00R\x06reason\x88\x01\x01B\t\n" + + "\a_reason\"G\n" + + "\x11BlockUserResponse\x12\x18\n" + + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + + "\amessage\x18\x02 \x01(\tR\amessage\"H\n" + + "\x12UnblockUserRequest\x12\x17\n" + + "\auser_id\x18\x01 \x01(\tR\x06userId\x12\x19\n" + + "\badmin_id\x18\x02 \x01(\tR\aadminId\"I\n" + + "\x13UnblockUserResponse\x12\x18\n" + + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + "\amessage\x18\x02 \x01(\tR\amessage\"\x9b\x04\n" + "\x11ChangeDataRequest\x12\x17\n" + "\auser_id\x18\x01 \x01(\tR\x06userId\x12\x1d\n" + @@ -1288,6 +1296,12 @@ const file_admin_admin_account_proto_rawDesc = "" + "_is_public\"H\n" + "\x12ChangeDataResponse\x12\x18\n" + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + + "\amessage\x18\x02 \x01(\tR\amessage\"W\n" + + "\x19AdminResetPasswordRequest\x12\x17\n" + + "\auser_id\x18\x01 \x01(\tR\x06userId\x12!\n" + + "\fnew_password\x18\x02 \x01(\tR\vnewPassword\"P\n" + + "\x1aAdminResetPasswordResponse\x12\x18\n" + + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + "\amessage\x18\x02 \x01(\tR\amessage\"E\n" + "\x11AssignRoleRequest\x12\x17\n" + "\auser_id\x18\x01 \x01(\tR\x06userId\x12\x17\n" + @@ -1300,20 +1314,6 @@ const file_admin_admin_account_proto_rawDesc = "" + "\arole_id\x18\x02 \x01(\tR\x06roleId\"H\n" + "\x12RevokeRoleResponse\x12\x18\n" + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + - "\amessage\x18\x02 \x01(\tR\amessage\"n\n" + - "\x10BlockUserRequest\x12\x17\n" + - "\auser_id\x18\x01 \x01(\tR\x06userId\x12\x19\n" + - "\badmin_id\x18\x02 \x01(\tR\aadminId\x12\x1b\n" + - "\x06reason\x18\x03 \x01(\tH\x00R\x06reason\x88\x01\x01B\t\n" + - "\a_reason\"G\n" + - "\x11BlockUserResponse\x12\x18\n" + - "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + - "\amessage\x18\x02 \x01(\tR\amessage\"H\n" + - "\x12UnblockUserRequest\x12\x17\n" + - "\auser_id\x18\x01 \x01(\tR\x06userId\x12\x19\n" + - "\badmin_id\x18\x02 \x01(\tR\aadminId\"I\n" + - "\x13UnblockUserResponse\x12\x18\n" + - "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + "\amessage\x18\x02 \x01(\tR\amessage\"r\n" + "\x0eBlockIpRequest\x12\x1d\n" + "\n" + @@ -1334,24 +1334,24 @@ const file_admin_admin_account_proto_rawDesc = "" + "\x18SyncUsersToSearchRequest\"O\n" + "\x19SyncUsersToSearchResponse\x12\x18\n" + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + - "\amessage\x18\x02 \x01(\tR\amessage2\x89\b\n" + - "\x13AdminAccountService\x12o\n" + - "\x12AdminResetPassword\x12+.admin.account.v1.AdminResetPasswordRequest\x1a,.admin.account.v1.AdminResetPasswordResponse\x12W\n" + + "\amessage\x18\x02 \x01(\tR\amessage2\xd2\x06\n" + + "\fAdminService\x12G\n" + "\n" + - "CreateUser\x12#.admin.account.v1.CreateUserRequest\x1a$.admin.account.v1.CreateUserResponse\x12W\n" + + "CreateUser\x12\x1b.admin.v1.CreateUserRequest\x1a\x1c.admin.v1.CreateUserResponse\x12G\n" + "\n" + - "DeleteUser\x12#.admin.account.v1.DeleteUserRequest\x1a$.admin.account.v1.DeleteUserResponse\x12W\n" + + "DeleteUser\x12\x1b.admin.v1.DeleteUserRequest\x1a\x1c.admin.v1.DeleteUserResponse\x12D\n" + + "\tBlockUser\x12\x1a.admin.v1.BlockUserRequest\x1a\x1b.admin.v1.BlockUserResponse\x12J\n" + + "\vUnblockUser\x12\x1c.admin.v1.UnblockUserRequest\x1a\x1d.admin.v1.UnblockUserResponse\x12G\n" + "\n" + - "ChangeData\x12#.admin.account.v1.ChangeDataRequest\x1a$.admin.account.v1.ChangeDataResponse\x12W\n" + + "ChangeData\x12\x1b.admin.v1.ChangeDataRequest\x1a\x1c.admin.v1.ChangeDataResponse\x12_\n" + + "\x12AdminResetPassword\x12#.admin.v1.AdminResetPasswordRequest\x1a$.admin.v1.AdminResetPasswordResponse\x12G\n" + "\n" + - "AssignRole\x12#.admin.account.v1.AssignRoleRequest\x1a$.admin.account.v1.AssignRoleResponse\x12W\n" + + "AssignRole\x12\x1b.admin.v1.AssignRoleRequest\x1a\x1c.admin.v1.AssignRoleResponse\x12G\n" + "\n" + - "RevokeRole\x12#.admin.account.v1.RevokeRoleRequest\x1a$.admin.account.v1.RevokeRoleResponse\x12T\n" + - "\tBlockUser\x12\".admin.account.v1.BlockUserRequest\x1a#.admin.account.v1.BlockUserResponse\x12Z\n" + - "\vUnblockUser\x12$.admin.account.v1.UnblockUserRequest\x1a%.admin.account.v1.UnblockUserResponse\x12N\n" + - "\aBlockIp\x12 .admin.account.v1.BlockIpRequest\x1a!.admin.account.v1.BlockIpResponse\x12T\n" + - "\tUnblockIp\x12\".admin.account.v1.UnblockIpRequest\x1a#.admin.account.v1.UnblockIpResponse\x12l\n" + - "\x11SyncUsersToSearch\x12*.admin.account.v1.SyncUsersToSearchRequest\x1a+.admin.account.v1.SyncUsersToSearchResponseB*Z(git.lendry.ru/lendry-erp/proto.git/go;pbb\x06proto3" + "RevokeRole\x12\x1b.admin.v1.RevokeRoleRequest\x1a\x1c.admin.v1.RevokeRoleResponse\x12>\n" + + "\aBlockIp\x12\x18.admin.v1.BlockIpRequest\x1a\x19.admin.v1.BlockIpResponse\x12D\n" + + "\tUnblockIp\x12\x1a.admin.v1.UnblockIpRequest\x1a\x1b.admin.v1.UnblockIpResponse\x12\\\n" + + "\x11SyncUsersToSearch\x12\".admin.v1.SyncUsersToSearchRequest\x1a#.admin.v1.SyncUsersToSearchResponseB*Z(git.lendry.ru/lendry-erp/proto.git/go;pbb\x06proto3" var ( file_admin_admin_account_proto_rawDescOnce sync.Once @@ -1367,52 +1367,52 @@ func file_admin_admin_account_proto_rawDescGZIP() []byte { var file_admin_admin_account_proto_msgTypes = make([]protoimpl.MessageInfo, 22) var file_admin_admin_account_proto_goTypes = []any{ - (*AdminResetPasswordRequest)(nil), // 0: admin.account.v1.AdminResetPasswordRequest - (*AdminResetPasswordResponse)(nil), // 1: admin.account.v1.AdminResetPasswordResponse - (*CreateUserRequest)(nil), // 2: admin.account.v1.CreateUserRequest - (*CreateUserResponse)(nil), // 3: admin.account.v1.CreateUserResponse - (*DeleteUserRequest)(nil), // 4: admin.account.v1.DeleteUserRequest - (*DeleteUserResponse)(nil), // 5: admin.account.v1.DeleteUserResponse - (*ChangeDataRequest)(nil), // 6: admin.account.v1.ChangeDataRequest - (*ChangeDataResponse)(nil), // 7: admin.account.v1.ChangeDataResponse - (*AssignRoleRequest)(nil), // 8: admin.account.v1.AssignRoleRequest - (*AssignRoleResponse)(nil), // 9: admin.account.v1.AssignRoleResponse - (*RevokeRoleRequest)(nil), // 10: admin.account.v1.RevokeRoleRequest - (*RevokeRoleResponse)(nil), // 11: admin.account.v1.RevokeRoleResponse - (*BlockUserRequest)(nil), // 12: admin.account.v1.BlockUserRequest - (*BlockUserResponse)(nil), // 13: admin.account.v1.BlockUserResponse - (*UnblockUserRequest)(nil), // 14: admin.account.v1.UnblockUserRequest - (*UnblockUserResponse)(nil), // 15: admin.account.v1.UnblockUserResponse - (*BlockIpRequest)(nil), // 16: admin.account.v1.BlockIpRequest - (*BlockIpResponse)(nil), // 17: admin.account.v1.BlockIpResponse - (*UnblockIpRequest)(nil), // 18: admin.account.v1.UnblockIpRequest - (*UnblockIpResponse)(nil), // 19: admin.account.v1.UnblockIpResponse - (*SyncUsersToSearchRequest)(nil), // 20: admin.account.v1.SyncUsersToSearchRequest - (*SyncUsersToSearchResponse)(nil), // 21: admin.account.v1.SyncUsersToSearchResponse + (*CreateUserRequest)(nil), // 0: admin.v1.CreateUserRequest + (*CreateUserResponse)(nil), // 1: admin.v1.CreateUserResponse + (*DeleteUserRequest)(nil), // 2: admin.v1.DeleteUserRequest + (*DeleteUserResponse)(nil), // 3: admin.v1.DeleteUserResponse + (*BlockUserRequest)(nil), // 4: admin.v1.BlockUserRequest + (*BlockUserResponse)(nil), // 5: admin.v1.BlockUserResponse + (*UnblockUserRequest)(nil), // 6: admin.v1.UnblockUserRequest + (*UnblockUserResponse)(nil), // 7: admin.v1.UnblockUserResponse + (*ChangeDataRequest)(nil), // 8: admin.v1.ChangeDataRequest + (*ChangeDataResponse)(nil), // 9: admin.v1.ChangeDataResponse + (*AdminResetPasswordRequest)(nil), // 10: admin.v1.AdminResetPasswordRequest + (*AdminResetPasswordResponse)(nil), // 11: admin.v1.AdminResetPasswordResponse + (*AssignRoleRequest)(nil), // 12: admin.v1.AssignRoleRequest + (*AssignRoleResponse)(nil), // 13: admin.v1.AssignRoleResponse + (*RevokeRoleRequest)(nil), // 14: admin.v1.RevokeRoleRequest + (*RevokeRoleResponse)(nil), // 15: admin.v1.RevokeRoleResponse + (*BlockIpRequest)(nil), // 16: admin.v1.BlockIpRequest + (*BlockIpResponse)(nil), // 17: admin.v1.BlockIpResponse + (*UnblockIpRequest)(nil), // 18: admin.v1.UnblockIpRequest + (*UnblockIpResponse)(nil), // 19: admin.v1.UnblockIpResponse + (*SyncUsersToSearchRequest)(nil), // 20: admin.v1.SyncUsersToSearchRequest + (*SyncUsersToSearchResponse)(nil), // 21: admin.v1.SyncUsersToSearchResponse } var file_admin_admin_account_proto_depIdxs = []int32{ - 0, // 0: admin.account.v1.AdminAccountService.AdminResetPassword:input_type -> admin.account.v1.AdminResetPasswordRequest - 2, // 1: admin.account.v1.AdminAccountService.CreateUser:input_type -> admin.account.v1.CreateUserRequest - 4, // 2: admin.account.v1.AdminAccountService.DeleteUser:input_type -> admin.account.v1.DeleteUserRequest - 6, // 3: admin.account.v1.AdminAccountService.ChangeData:input_type -> admin.account.v1.ChangeDataRequest - 8, // 4: admin.account.v1.AdminAccountService.AssignRole:input_type -> admin.account.v1.AssignRoleRequest - 10, // 5: admin.account.v1.AdminAccountService.RevokeRole:input_type -> admin.account.v1.RevokeRoleRequest - 12, // 6: admin.account.v1.AdminAccountService.BlockUser:input_type -> admin.account.v1.BlockUserRequest - 14, // 7: admin.account.v1.AdminAccountService.UnblockUser:input_type -> admin.account.v1.UnblockUserRequest - 16, // 8: admin.account.v1.AdminAccountService.BlockIp:input_type -> admin.account.v1.BlockIpRequest - 18, // 9: admin.account.v1.AdminAccountService.UnblockIp:input_type -> admin.account.v1.UnblockIpRequest - 20, // 10: admin.account.v1.AdminAccountService.SyncUsersToSearch:input_type -> admin.account.v1.SyncUsersToSearchRequest - 1, // 11: admin.account.v1.AdminAccountService.AdminResetPassword:output_type -> admin.account.v1.AdminResetPasswordResponse - 3, // 12: admin.account.v1.AdminAccountService.CreateUser:output_type -> admin.account.v1.CreateUserResponse - 5, // 13: admin.account.v1.AdminAccountService.DeleteUser:output_type -> admin.account.v1.DeleteUserResponse - 7, // 14: admin.account.v1.AdminAccountService.ChangeData:output_type -> admin.account.v1.ChangeDataResponse - 9, // 15: admin.account.v1.AdminAccountService.AssignRole:output_type -> admin.account.v1.AssignRoleResponse - 11, // 16: admin.account.v1.AdminAccountService.RevokeRole:output_type -> admin.account.v1.RevokeRoleResponse - 13, // 17: admin.account.v1.AdminAccountService.BlockUser:output_type -> admin.account.v1.BlockUserResponse - 15, // 18: admin.account.v1.AdminAccountService.UnblockUser:output_type -> admin.account.v1.UnblockUserResponse - 17, // 19: admin.account.v1.AdminAccountService.BlockIp:output_type -> admin.account.v1.BlockIpResponse - 19, // 20: admin.account.v1.AdminAccountService.UnblockIp:output_type -> admin.account.v1.UnblockIpResponse - 21, // 21: admin.account.v1.AdminAccountService.SyncUsersToSearch:output_type -> admin.account.v1.SyncUsersToSearchResponse + 0, // 0: admin.v1.AdminService.CreateUser:input_type -> admin.v1.CreateUserRequest + 2, // 1: admin.v1.AdminService.DeleteUser:input_type -> admin.v1.DeleteUserRequest + 4, // 2: admin.v1.AdminService.BlockUser:input_type -> admin.v1.BlockUserRequest + 6, // 3: admin.v1.AdminService.UnblockUser:input_type -> admin.v1.UnblockUserRequest + 8, // 4: admin.v1.AdminService.ChangeData:input_type -> admin.v1.ChangeDataRequest + 10, // 5: admin.v1.AdminService.AdminResetPassword:input_type -> admin.v1.AdminResetPasswordRequest + 12, // 6: admin.v1.AdminService.AssignRole:input_type -> admin.v1.AssignRoleRequest + 14, // 7: admin.v1.AdminService.RevokeRole:input_type -> admin.v1.RevokeRoleRequest + 16, // 8: admin.v1.AdminService.BlockIp:input_type -> admin.v1.BlockIpRequest + 18, // 9: admin.v1.AdminService.UnblockIp:input_type -> admin.v1.UnblockIpRequest + 20, // 10: admin.v1.AdminService.SyncUsersToSearch:input_type -> admin.v1.SyncUsersToSearchRequest + 1, // 11: admin.v1.AdminService.CreateUser:output_type -> admin.v1.CreateUserResponse + 3, // 12: admin.v1.AdminService.DeleteUser:output_type -> admin.v1.DeleteUserResponse + 5, // 13: admin.v1.AdminService.BlockUser:output_type -> admin.v1.BlockUserResponse + 7, // 14: admin.v1.AdminService.UnblockUser:output_type -> admin.v1.UnblockUserResponse + 9, // 15: admin.v1.AdminService.ChangeData:output_type -> admin.v1.ChangeDataResponse + 11, // 16: admin.v1.AdminService.AdminResetPassword:output_type -> admin.v1.AdminResetPasswordResponse + 13, // 17: admin.v1.AdminService.AssignRole:output_type -> admin.v1.AssignRoleResponse + 15, // 18: admin.v1.AdminService.RevokeRole:output_type -> admin.v1.RevokeRoleResponse + 17, // 19: admin.v1.AdminService.BlockIp:output_type -> admin.v1.BlockIpResponse + 19, // 20: admin.v1.AdminService.UnblockIp:output_type -> admin.v1.UnblockIpResponse + 21, // 21: admin.v1.AdminService.SyncUsersToSearch:output_type -> admin.v1.SyncUsersToSearchResponse 11, // [11:22] is the sub-list for method output_type 0, // [0:11] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -1425,8 +1425,8 @@ func file_admin_admin_account_proto_init() { if File_admin_admin_account_proto != nil { return } - file_admin_admin_account_proto_msgTypes[6].OneofWrappers = []any{} - file_admin_admin_account_proto_msgTypes[12].OneofWrappers = []any{} + file_admin_admin_account_proto_msgTypes[4].OneofWrappers = []any{} + file_admin_admin_account_proto_msgTypes[8].OneofWrappers = []any{} file_admin_admin_account_proto_msgTypes[16].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ diff --git a/gen/go/admin/admin-account_grpc.pb.go b/gen/go/admin/admin-account_grpc.pb.go index a133cf3..9cc0bec 100644 --- a/gen/go/admin/admin-account_grpc.pb.go +++ b/gen/go/admin/admin-account_grpc.pb.go @@ -19,481 +19,495 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - AdminAccountService_AdminResetPassword_FullMethodName = "/admin.account.v1.AdminAccountService/AdminResetPassword" - AdminAccountService_CreateUser_FullMethodName = "/admin.account.v1.AdminAccountService/CreateUser" - AdminAccountService_DeleteUser_FullMethodName = "/admin.account.v1.AdminAccountService/DeleteUser" - AdminAccountService_ChangeData_FullMethodName = "/admin.account.v1.AdminAccountService/ChangeData" - AdminAccountService_AssignRole_FullMethodName = "/admin.account.v1.AdminAccountService/AssignRole" - AdminAccountService_RevokeRole_FullMethodName = "/admin.account.v1.AdminAccountService/RevokeRole" - AdminAccountService_BlockUser_FullMethodName = "/admin.account.v1.AdminAccountService/BlockUser" - AdminAccountService_UnblockUser_FullMethodName = "/admin.account.v1.AdminAccountService/UnblockUser" - AdminAccountService_BlockIp_FullMethodName = "/admin.account.v1.AdminAccountService/BlockIp" - AdminAccountService_UnblockIp_FullMethodName = "/admin.account.v1.AdminAccountService/UnblockIp" - AdminAccountService_SyncUsersToSearch_FullMethodName = "/admin.account.v1.AdminAccountService/SyncUsersToSearch" + AdminService_CreateUser_FullMethodName = "/admin.v1.AdminService/CreateUser" + AdminService_DeleteUser_FullMethodName = "/admin.v1.AdminService/DeleteUser" + AdminService_BlockUser_FullMethodName = "/admin.v1.AdminService/BlockUser" + AdminService_UnblockUser_FullMethodName = "/admin.v1.AdminService/UnblockUser" + AdminService_ChangeData_FullMethodName = "/admin.v1.AdminService/ChangeData" + AdminService_AdminResetPassword_FullMethodName = "/admin.v1.AdminService/AdminResetPassword" + AdminService_AssignRole_FullMethodName = "/admin.v1.AdminService/AssignRole" + AdminService_RevokeRole_FullMethodName = "/admin.v1.AdminService/RevokeRole" + AdminService_BlockIp_FullMethodName = "/admin.v1.AdminService/BlockIp" + AdminService_UnblockIp_FullMethodName = "/admin.v1.AdminService/UnblockIp" + AdminService_SyncUsersToSearch_FullMethodName = "/admin.v1.AdminService/SyncUsersToSearch" ) -// AdminAccountServiceClient is the client API for AdminAccountService service. +// AdminServiceClient is the client API for AdminService 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 AdminAccountServiceClient interface { - AdminResetPassword(ctx context.Context, in *AdminResetPasswordRequest, opts ...grpc.CallOption) (*AdminResetPasswordResponse, error) +// +// Единый сервис для всех административных операций +type AdminServiceClient interface { + // Управление учетными записями CreateUser(ctx context.Context, in *CreateUserRequest, opts ...grpc.CallOption) (*CreateUserResponse, error) DeleteUser(ctx context.Context, in *DeleteUserRequest, opts ...grpc.CallOption) (*DeleteUserResponse, error) - ChangeData(ctx context.Context, in *ChangeDataRequest, opts ...grpc.CallOption) (*ChangeDataResponse, error) - AssignRole(ctx context.Context, in *AssignRoleRequest, opts ...grpc.CallOption) (*AssignRoleResponse, error) - RevokeRole(ctx context.Context, in *RevokeRoleRequest, opts ...grpc.CallOption) (*RevokeRoleResponse, error) BlockUser(ctx context.Context, in *BlockUserRequest, opts ...grpc.CallOption) (*BlockUserResponse, error) UnblockUser(ctx context.Context, in *UnblockUserRequest, opts ...grpc.CallOption) (*UnblockUserResponse, error) + // Управление данными и безопасностью + ChangeData(ctx context.Context, in *ChangeDataRequest, opts ...grpc.CallOption) (*ChangeDataResponse, error) + AdminResetPassword(ctx context.Context, in *AdminResetPasswordRequest, opts ...grpc.CallOption) (*AdminResetPasswordResponse, error) + // Управление ролями (RBAC) + AssignRole(ctx context.Context, in *AssignRoleRequest, opts ...grpc.CallOption) (*AssignRoleResponse, error) + RevokeRole(ctx context.Context, in *RevokeRoleRequest, opts ...grpc.CallOption) (*RevokeRoleResponse, error) + // Управление черным списком IP BlockIp(ctx context.Context, in *BlockIpRequest, opts ...grpc.CallOption) (*BlockIpResponse, error) UnblockIp(ctx context.Context, in *UnblockIpRequest, opts ...grpc.CallOption) (*UnblockIpResponse, error) + // Синхронизация с поисковым движком (Elasticsearch) SyncUsersToSearch(ctx context.Context, in *SyncUsersToSearchRequest, opts ...grpc.CallOption) (*SyncUsersToSearchResponse, error) } -type adminAccountServiceClient struct { +type adminServiceClient struct { cc grpc.ClientConnInterface } -func NewAdminAccountServiceClient(cc grpc.ClientConnInterface) AdminAccountServiceClient { - return &adminAccountServiceClient{cc} +func NewAdminServiceClient(cc grpc.ClientConnInterface) AdminServiceClient { + return &adminServiceClient{cc} } -func (c *adminAccountServiceClient) AdminResetPassword(ctx context.Context, in *AdminResetPasswordRequest, opts ...grpc.CallOption) (*AdminResetPasswordResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(AdminResetPasswordResponse) - err := c.cc.Invoke(ctx, AdminAccountService_AdminResetPassword_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *adminAccountServiceClient) CreateUser(ctx context.Context, in *CreateUserRequest, opts ...grpc.CallOption) (*CreateUserResponse, error) { +func (c *adminServiceClient) CreateUser(ctx context.Context, in *CreateUserRequest, opts ...grpc.CallOption) (*CreateUserResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CreateUserResponse) - err := c.cc.Invoke(ctx, AdminAccountService_CreateUser_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, AdminService_CreateUser_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *adminAccountServiceClient) DeleteUser(ctx context.Context, in *DeleteUserRequest, opts ...grpc.CallOption) (*DeleteUserResponse, error) { +func (c *adminServiceClient) DeleteUser(ctx context.Context, in *DeleteUserRequest, opts ...grpc.CallOption) (*DeleteUserResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DeleteUserResponse) - err := c.cc.Invoke(ctx, AdminAccountService_DeleteUser_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, AdminService_DeleteUser_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *adminAccountServiceClient) ChangeData(ctx context.Context, in *ChangeDataRequest, opts ...grpc.CallOption) (*ChangeDataResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(ChangeDataResponse) - err := c.cc.Invoke(ctx, AdminAccountService_ChangeData_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *adminAccountServiceClient) AssignRole(ctx context.Context, in *AssignRoleRequest, opts ...grpc.CallOption) (*AssignRoleResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(AssignRoleResponse) - err := c.cc.Invoke(ctx, AdminAccountService_AssignRole_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *adminAccountServiceClient) RevokeRole(ctx context.Context, in *RevokeRoleRequest, opts ...grpc.CallOption) (*RevokeRoleResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(RevokeRoleResponse) - err := c.cc.Invoke(ctx, AdminAccountService_RevokeRole_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *adminAccountServiceClient) BlockUser(ctx context.Context, in *BlockUserRequest, opts ...grpc.CallOption) (*BlockUserResponse, error) { +func (c *adminServiceClient) BlockUser(ctx context.Context, in *BlockUserRequest, opts ...grpc.CallOption) (*BlockUserResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BlockUserResponse) - err := c.cc.Invoke(ctx, AdminAccountService_BlockUser_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, AdminService_BlockUser_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *adminAccountServiceClient) UnblockUser(ctx context.Context, in *UnblockUserRequest, opts ...grpc.CallOption) (*UnblockUserResponse, error) { +func (c *adminServiceClient) UnblockUser(ctx context.Context, in *UnblockUserRequest, opts ...grpc.CallOption) (*UnblockUserResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(UnblockUserResponse) - err := c.cc.Invoke(ctx, AdminAccountService_UnblockUser_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, AdminService_UnblockUser_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *adminAccountServiceClient) BlockIp(ctx context.Context, in *BlockIpRequest, opts ...grpc.CallOption) (*BlockIpResponse, error) { +func (c *adminServiceClient) ChangeData(ctx context.Context, in *ChangeDataRequest, opts ...grpc.CallOption) (*ChangeDataResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ChangeDataResponse) + err := c.cc.Invoke(ctx, AdminService_ChangeData_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *adminServiceClient) AdminResetPassword(ctx context.Context, in *AdminResetPasswordRequest, opts ...grpc.CallOption) (*AdminResetPasswordResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(AdminResetPasswordResponse) + err := c.cc.Invoke(ctx, AdminService_AdminResetPassword_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *adminServiceClient) AssignRole(ctx context.Context, in *AssignRoleRequest, opts ...grpc.CallOption) (*AssignRoleResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(AssignRoleResponse) + err := c.cc.Invoke(ctx, AdminService_AssignRole_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *adminServiceClient) RevokeRole(ctx context.Context, in *RevokeRoleRequest, opts ...grpc.CallOption) (*RevokeRoleResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(RevokeRoleResponse) + err := c.cc.Invoke(ctx, AdminService_RevokeRole_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *adminServiceClient) BlockIp(ctx context.Context, in *BlockIpRequest, opts ...grpc.CallOption) (*BlockIpResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BlockIpResponse) - err := c.cc.Invoke(ctx, AdminAccountService_BlockIp_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, AdminService_BlockIp_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *adminAccountServiceClient) UnblockIp(ctx context.Context, in *UnblockIpRequest, opts ...grpc.CallOption) (*UnblockIpResponse, error) { +func (c *adminServiceClient) UnblockIp(ctx context.Context, in *UnblockIpRequest, opts ...grpc.CallOption) (*UnblockIpResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(UnblockIpResponse) - err := c.cc.Invoke(ctx, AdminAccountService_UnblockIp_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, AdminService_UnblockIp_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *adminAccountServiceClient) SyncUsersToSearch(ctx context.Context, in *SyncUsersToSearchRequest, opts ...grpc.CallOption) (*SyncUsersToSearchResponse, error) { +func (c *adminServiceClient) SyncUsersToSearch(ctx context.Context, in *SyncUsersToSearchRequest, opts ...grpc.CallOption) (*SyncUsersToSearchResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SyncUsersToSearchResponse) - err := c.cc.Invoke(ctx, AdminAccountService_SyncUsersToSearch_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, AdminService_SyncUsersToSearch_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -// AdminAccountServiceServer is the server API for AdminAccountService service. -// All implementations must embed UnimplementedAdminAccountServiceServer +// AdminServiceServer is the server API for AdminService service. +// All implementations must embed UnimplementedAdminServiceServer // for forward compatibility. -type AdminAccountServiceServer interface { - AdminResetPassword(context.Context, *AdminResetPasswordRequest) (*AdminResetPasswordResponse, error) +// +// Единый сервис для всех административных операций +type AdminServiceServer interface { + // Управление учетными записями CreateUser(context.Context, *CreateUserRequest) (*CreateUserResponse, error) DeleteUser(context.Context, *DeleteUserRequest) (*DeleteUserResponse, error) - ChangeData(context.Context, *ChangeDataRequest) (*ChangeDataResponse, error) - AssignRole(context.Context, *AssignRoleRequest) (*AssignRoleResponse, error) - RevokeRole(context.Context, *RevokeRoleRequest) (*RevokeRoleResponse, error) BlockUser(context.Context, *BlockUserRequest) (*BlockUserResponse, error) UnblockUser(context.Context, *UnblockUserRequest) (*UnblockUserResponse, error) + // Управление данными и безопасностью + ChangeData(context.Context, *ChangeDataRequest) (*ChangeDataResponse, error) + AdminResetPassword(context.Context, *AdminResetPasswordRequest) (*AdminResetPasswordResponse, error) + // Управление ролями (RBAC) + AssignRole(context.Context, *AssignRoleRequest) (*AssignRoleResponse, error) + RevokeRole(context.Context, *RevokeRoleRequest) (*RevokeRoleResponse, error) + // Управление черным списком IP BlockIp(context.Context, *BlockIpRequest) (*BlockIpResponse, error) UnblockIp(context.Context, *UnblockIpRequest) (*UnblockIpResponse, error) + // Синхронизация с поисковым движком (Elasticsearch) SyncUsersToSearch(context.Context, *SyncUsersToSearchRequest) (*SyncUsersToSearchResponse, error) - mustEmbedUnimplementedAdminAccountServiceServer() + mustEmbedUnimplementedAdminServiceServer() } -// UnimplementedAdminAccountServiceServer must be embedded to have +// UnimplementedAdminServiceServer must be embedded to have // forward compatible implementations. // // NOTE: this should be embedded by value instead of pointer to avoid a nil // pointer dereference when methods are called. -type UnimplementedAdminAccountServiceServer struct{} +type UnimplementedAdminServiceServer struct{} -func (UnimplementedAdminAccountServiceServer) AdminResetPassword(context.Context, *AdminResetPasswordRequest) (*AdminResetPasswordResponse, error) { - return nil, status.Error(codes.Unimplemented, "method AdminResetPassword not implemented") -} -func (UnimplementedAdminAccountServiceServer) CreateUser(context.Context, *CreateUserRequest) (*CreateUserResponse, error) { +func (UnimplementedAdminServiceServer) CreateUser(context.Context, *CreateUserRequest) (*CreateUserResponse, error) { return nil, status.Error(codes.Unimplemented, "method CreateUser not implemented") } -func (UnimplementedAdminAccountServiceServer) DeleteUser(context.Context, *DeleteUserRequest) (*DeleteUserResponse, error) { +func (UnimplementedAdminServiceServer) DeleteUser(context.Context, *DeleteUserRequest) (*DeleteUserResponse, error) { return nil, status.Error(codes.Unimplemented, "method DeleteUser not implemented") } -func (UnimplementedAdminAccountServiceServer) ChangeData(context.Context, *ChangeDataRequest) (*ChangeDataResponse, error) { - return nil, status.Error(codes.Unimplemented, "method ChangeData not implemented") -} -func (UnimplementedAdminAccountServiceServer) AssignRole(context.Context, *AssignRoleRequest) (*AssignRoleResponse, error) { - return nil, status.Error(codes.Unimplemented, "method AssignRole not implemented") -} -func (UnimplementedAdminAccountServiceServer) RevokeRole(context.Context, *RevokeRoleRequest) (*RevokeRoleResponse, error) { - return nil, status.Error(codes.Unimplemented, "method RevokeRole not implemented") -} -func (UnimplementedAdminAccountServiceServer) BlockUser(context.Context, *BlockUserRequest) (*BlockUserResponse, error) { +func (UnimplementedAdminServiceServer) BlockUser(context.Context, *BlockUserRequest) (*BlockUserResponse, error) { return nil, status.Error(codes.Unimplemented, "method BlockUser not implemented") } -func (UnimplementedAdminAccountServiceServer) UnblockUser(context.Context, *UnblockUserRequest) (*UnblockUserResponse, error) { +func (UnimplementedAdminServiceServer) UnblockUser(context.Context, *UnblockUserRequest) (*UnblockUserResponse, error) { return nil, status.Error(codes.Unimplemented, "method UnblockUser not implemented") } -func (UnimplementedAdminAccountServiceServer) BlockIp(context.Context, *BlockIpRequest) (*BlockIpResponse, error) { +func (UnimplementedAdminServiceServer) ChangeData(context.Context, *ChangeDataRequest) (*ChangeDataResponse, error) { + return nil, status.Error(codes.Unimplemented, "method ChangeData not implemented") +} +func (UnimplementedAdminServiceServer) AdminResetPassword(context.Context, *AdminResetPasswordRequest) (*AdminResetPasswordResponse, error) { + return nil, status.Error(codes.Unimplemented, "method AdminResetPassword not implemented") +} +func (UnimplementedAdminServiceServer) AssignRole(context.Context, *AssignRoleRequest) (*AssignRoleResponse, error) { + return nil, status.Error(codes.Unimplemented, "method AssignRole not implemented") +} +func (UnimplementedAdminServiceServer) RevokeRole(context.Context, *RevokeRoleRequest) (*RevokeRoleResponse, error) { + return nil, status.Error(codes.Unimplemented, "method RevokeRole not implemented") +} +func (UnimplementedAdminServiceServer) BlockIp(context.Context, *BlockIpRequest) (*BlockIpResponse, error) { return nil, status.Error(codes.Unimplemented, "method BlockIp not implemented") } -func (UnimplementedAdminAccountServiceServer) UnblockIp(context.Context, *UnblockIpRequest) (*UnblockIpResponse, error) { +func (UnimplementedAdminServiceServer) UnblockIp(context.Context, *UnblockIpRequest) (*UnblockIpResponse, error) { return nil, status.Error(codes.Unimplemented, "method UnblockIp not implemented") } -func (UnimplementedAdminAccountServiceServer) SyncUsersToSearch(context.Context, *SyncUsersToSearchRequest) (*SyncUsersToSearchResponse, error) { +func (UnimplementedAdminServiceServer) SyncUsersToSearch(context.Context, *SyncUsersToSearchRequest) (*SyncUsersToSearchResponse, error) { return nil, status.Error(codes.Unimplemented, "method SyncUsersToSearch not implemented") } -func (UnimplementedAdminAccountServiceServer) mustEmbedUnimplementedAdminAccountServiceServer() {} -func (UnimplementedAdminAccountServiceServer) testEmbeddedByValue() {} +func (UnimplementedAdminServiceServer) mustEmbedUnimplementedAdminServiceServer() {} +func (UnimplementedAdminServiceServer) testEmbeddedByValue() {} -// UnsafeAdminAccountServiceServer may be embedded to opt out of forward compatibility for this service. -// Use of this interface is not recommended, as added methods to AdminAccountServiceServer will +// UnsafeAdminServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to AdminServiceServer will // result in compilation errors. -type UnsafeAdminAccountServiceServer interface { - mustEmbedUnimplementedAdminAccountServiceServer() +type UnsafeAdminServiceServer interface { + mustEmbedUnimplementedAdminServiceServer() } -func RegisterAdminAccountServiceServer(s grpc.ServiceRegistrar, srv AdminAccountServiceServer) { - // If the following call panics, it indicates UnimplementedAdminAccountServiceServer was +func RegisterAdminServiceServer(s grpc.ServiceRegistrar, srv AdminServiceServer) { + // If the following call panics, it indicates UnimplementedAdminServiceServer was // embedded by pointer and is nil. This will cause panics if an // unimplemented method is ever invoked, so we test this at initialization // time to prevent it from happening at runtime later due to I/O. if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { t.testEmbeddedByValue() } - s.RegisterService(&AdminAccountService_ServiceDesc, srv) + s.RegisterService(&AdminService_ServiceDesc, srv) } -func _AdminAccountService_AdminResetPassword_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(AdminResetPasswordRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(AdminAccountServiceServer).AdminResetPassword(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: AdminAccountService_AdminResetPassword_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).AdminResetPassword(ctx, req.(*AdminResetPasswordRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _AdminAccountService_CreateUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AdminService_CreateUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(CreateUserRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(AdminAccountServiceServer).CreateUser(ctx, in) + return srv.(AdminServiceServer).CreateUser(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdminAccountService_CreateUser_FullMethodName, + FullMethod: AdminService_CreateUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).CreateUser(ctx, req.(*CreateUserRequest)) + return srv.(AdminServiceServer).CreateUser(ctx, req.(*CreateUserRequest)) } return interceptor(ctx, in, info, handler) } -func _AdminAccountService_DeleteUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AdminService_DeleteUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(DeleteUserRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(AdminAccountServiceServer).DeleteUser(ctx, in) + return srv.(AdminServiceServer).DeleteUser(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdminAccountService_DeleteUser_FullMethodName, + FullMethod: AdminService_DeleteUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).DeleteUser(ctx, req.(*DeleteUserRequest)) + return srv.(AdminServiceServer).DeleteUser(ctx, req.(*DeleteUserRequest)) } return interceptor(ctx, in, info, handler) } -func _AdminAccountService_ChangeData_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ChangeDataRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(AdminAccountServiceServer).ChangeData(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: AdminAccountService_ChangeData_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).ChangeData(ctx, req.(*ChangeDataRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _AdminAccountService_AssignRole_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(AssignRoleRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(AdminAccountServiceServer).AssignRole(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: AdminAccountService_AssignRole_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).AssignRole(ctx, req.(*AssignRoleRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _AdminAccountService_RevokeRole_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(RevokeRoleRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(AdminAccountServiceServer).RevokeRole(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: AdminAccountService_RevokeRole_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).RevokeRole(ctx, req.(*RevokeRoleRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _AdminAccountService_BlockUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AdminService_BlockUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(BlockUserRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(AdminAccountServiceServer).BlockUser(ctx, in) + return srv.(AdminServiceServer).BlockUser(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdminAccountService_BlockUser_FullMethodName, + FullMethod: AdminService_BlockUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).BlockUser(ctx, req.(*BlockUserRequest)) + return srv.(AdminServiceServer).BlockUser(ctx, req.(*BlockUserRequest)) } return interceptor(ctx, in, info, handler) } -func _AdminAccountService_UnblockUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AdminService_UnblockUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(UnblockUserRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(AdminAccountServiceServer).UnblockUser(ctx, in) + return srv.(AdminServiceServer).UnblockUser(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdminAccountService_UnblockUser_FullMethodName, + FullMethod: AdminService_UnblockUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).UnblockUser(ctx, req.(*UnblockUserRequest)) + return srv.(AdminServiceServer).UnblockUser(ctx, req.(*UnblockUserRequest)) } return interceptor(ctx, in, info, handler) } -func _AdminAccountService_BlockIp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AdminService_ChangeData_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ChangeDataRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AdminServiceServer).ChangeData(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AdminService_ChangeData_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AdminServiceServer).ChangeData(ctx, req.(*ChangeDataRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _AdminService_AdminResetPassword_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AdminResetPasswordRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AdminServiceServer).AdminResetPassword(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AdminService_AdminResetPassword_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AdminServiceServer).AdminResetPassword(ctx, req.(*AdminResetPasswordRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _AdminService_AssignRole_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AssignRoleRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AdminServiceServer).AssignRole(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AdminService_AssignRole_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AdminServiceServer).AssignRole(ctx, req.(*AssignRoleRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _AdminService_RevokeRole_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RevokeRoleRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AdminServiceServer).RevokeRole(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AdminService_RevokeRole_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AdminServiceServer).RevokeRole(ctx, req.(*RevokeRoleRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _AdminService_BlockIp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(BlockIpRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(AdminAccountServiceServer).BlockIp(ctx, in) + return srv.(AdminServiceServer).BlockIp(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdminAccountService_BlockIp_FullMethodName, + FullMethod: AdminService_BlockIp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).BlockIp(ctx, req.(*BlockIpRequest)) + return srv.(AdminServiceServer).BlockIp(ctx, req.(*BlockIpRequest)) } return interceptor(ctx, in, info, handler) } -func _AdminAccountService_UnblockIp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AdminService_UnblockIp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(UnblockIpRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(AdminAccountServiceServer).UnblockIp(ctx, in) + return srv.(AdminServiceServer).UnblockIp(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdminAccountService_UnblockIp_FullMethodName, + FullMethod: AdminService_UnblockIp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).UnblockIp(ctx, req.(*UnblockIpRequest)) + return srv.(AdminServiceServer).UnblockIp(ctx, req.(*UnblockIpRequest)) } return interceptor(ctx, in, info, handler) } -func _AdminAccountService_SyncUsersToSearch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AdminService_SyncUsersToSearch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(SyncUsersToSearchRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(AdminAccountServiceServer).SyncUsersToSearch(ctx, in) + return srv.(AdminServiceServer).SyncUsersToSearch(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdminAccountService_SyncUsersToSearch_FullMethodName, + FullMethod: AdminService_SyncUsersToSearch_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminAccountServiceServer).SyncUsersToSearch(ctx, req.(*SyncUsersToSearchRequest)) + return srv.(AdminServiceServer).SyncUsersToSearch(ctx, req.(*SyncUsersToSearchRequest)) } return interceptor(ctx, in, info, handler) } -// AdminAccountService_ServiceDesc is the grpc.ServiceDesc for AdminAccountService service. +// AdminService_ServiceDesc is the grpc.ServiceDesc for AdminService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) -var AdminAccountService_ServiceDesc = grpc.ServiceDesc{ - ServiceName: "admin.account.v1.AdminAccountService", - HandlerType: (*AdminAccountServiceServer)(nil), +var AdminService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "admin.v1.AdminService", + HandlerType: (*AdminServiceServer)(nil), Methods: []grpc.MethodDesc{ - { - MethodName: "AdminResetPassword", - Handler: _AdminAccountService_AdminResetPassword_Handler, - }, { MethodName: "CreateUser", - Handler: _AdminAccountService_CreateUser_Handler, + Handler: _AdminService_CreateUser_Handler, }, { MethodName: "DeleteUser", - Handler: _AdminAccountService_DeleteUser_Handler, - }, - { - MethodName: "ChangeData", - Handler: _AdminAccountService_ChangeData_Handler, - }, - { - MethodName: "AssignRole", - Handler: _AdminAccountService_AssignRole_Handler, - }, - { - MethodName: "RevokeRole", - Handler: _AdminAccountService_RevokeRole_Handler, + Handler: _AdminService_DeleteUser_Handler, }, { MethodName: "BlockUser", - Handler: _AdminAccountService_BlockUser_Handler, + Handler: _AdminService_BlockUser_Handler, }, { MethodName: "UnblockUser", - Handler: _AdminAccountService_UnblockUser_Handler, + Handler: _AdminService_UnblockUser_Handler, + }, + { + MethodName: "ChangeData", + Handler: _AdminService_ChangeData_Handler, + }, + { + MethodName: "AdminResetPassword", + Handler: _AdminService_AdminResetPassword_Handler, + }, + { + MethodName: "AssignRole", + Handler: _AdminService_AssignRole_Handler, + }, + { + MethodName: "RevokeRole", + Handler: _AdminService_RevokeRole_Handler, }, { MethodName: "BlockIp", - Handler: _AdminAccountService_BlockIp_Handler, + Handler: _AdminService_BlockIp_Handler, }, { MethodName: "UnblockIp", - Handler: _AdminAccountService_UnblockIp_Handler, + Handler: _AdminService_UnblockIp_Handler, }, { MethodName: "SyncUsersToSearch", - Handler: _AdminAccountService_SyncUsersToSearch_Handler, + Handler: _AdminService_SyncUsersToSearch_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/gen/go/sso/auth.pb.go b/gen/go/sso/auth.pb.go index b28a8aa..a94fe96 100644 --- a/gen/go/sso/auth.pb.go +++ b/gen/go/sso/auth.pb.go @@ -881,6 +881,398 @@ func (x *TerminateSessionResponse) GetMessage() string { return "" } +type SystemCreateAccountRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + PasswordHash string `protobuf:"bytes,2,opt,name=password_hash,json=passwordHash,proto3" json:"password_hash,omitempty"` // Хеш пароля генерирует Admin Service и передает сюда + IsLdap bool `protobuf:"varint,3,opt,name=is_ldap,json=isLdap,proto3" json:"is_ldap,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SystemCreateAccountRequest) Reset() { + *x = SystemCreateAccountRequest{} + mi := &file_sso_auth_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SystemCreateAccountRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SystemCreateAccountRequest) ProtoMessage() {} + +func (x *SystemCreateAccountRequest) ProtoReflect() protoreflect.Message { + mi := &file_sso_auth_proto_msgTypes[15] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SystemCreateAccountRequest.ProtoReflect.Descriptor instead. +func (*SystemCreateAccountRequest) Descriptor() ([]byte, []int) { + return file_sso_auth_proto_rawDescGZIP(), []int{15} +} + +func (x *SystemCreateAccountRequest) GetUsername() string { + if x != nil { + return x.Username + } + return "" +} + +func (x *SystemCreateAccountRequest) GetPasswordHash() string { + if x != nil { + return x.PasswordHash + } + return "" +} + +func (x *SystemCreateAccountRequest) GetIsLdap() bool { + if x != nil { + return x.IsLdap + } + return false +} + +type SystemCreateAccountResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + AccountId string `protobuf:"bytes,1,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SystemCreateAccountResponse) Reset() { + *x = SystemCreateAccountResponse{} + mi := &file_sso_auth_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SystemCreateAccountResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SystemCreateAccountResponse) ProtoMessage() {} + +func (x *SystemCreateAccountResponse) ProtoReflect() protoreflect.Message { + mi := &file_sso_auth_proto_msgTypes[16] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SystemCreateAccountResponse.ProtoReflect.Descriptor instead. +func (*SystemCreateAccountResponse) Descriptor() ([]byte, []int) { + return file_sso_auth_proto_rawDescGZIP(), []int{16} +} + +func (x *SystemCreateAccountResponse) GetAccountId() string { + if x != nil { + return x.AccountId + } + return "" +} + +type SystemChangeStatusRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + AccountId string `protobuf:"bytes,1,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"` + Status string `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` // 'ACTIVE', 'BLOCKED', 'DELETED' + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SystemChangeStatusRequest) Reset() { + *x = SystemChangeStatusRequest{} + mi := &file_sso_auth_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SystemChangeStatusRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SystemChangeStatusRequest) ProtoMessage() {} + +func (x *SystemChangeStatusRequest) ProtoReflect() protoreflect.Message { + mi := &file_sso_auth_proto_msgTypes[17] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SystemChangeStatusRequest.ProtoReflect.Descriptor instead. +func (*SystemChangeStatusRequest) Descriptor() ([]byte, []int) { + return file_sso_auth_proto_rawDescGZIP(), []int{17} +} + +func (x *SystemChangeStatusRequest) GetAccountId() string { + if x != nil { + return x.AccountId + } + return "" +} + +func (x *SystemChangeStatusRequest) GetStatus() string { + if x != nil { + return x.Status + } + return "" +} + +type SystemChangeStatusResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SystemChangeStatusResponse) Reset() { + *x = SystemChangeStatusResponse{} + mi := &file_sso_auth_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SystemChangeStatusResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SystemChangeStatusResponse) ProtoMessage() {} + +func (x *SystemChangeStatusResponse) ProtoReflect() protoreflect.Message { + mi := &file_sso_auth_proto_msgTypes[18] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SystemChangeStatusResponse.ProtoReflect.Descriptor instead. +func (*SystemChangeStatusResponse) Descriptor() ([]byte, []int) { + return file_sso_auth_proto_rawDescGZIP(), []int{18} +} + +func (x *SystemChangeStatusResponse) GetSuccess() bool { + if x != nil { + return x.Success + } + return false +} + +type SystemUpdatePasswordRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + AccountId string `protobuf:"bytes,1,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"` + NewPasswordHash string `protobuf:"bytes,2,opt,name=new_password_hash,json=newPasswordHash,proto3" json:"new_password_hash,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SystemUpdatePasswordRequest) Reset() { + *x = SystemUpdatePasswordRequest{} + mi := &file_sso_auth_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SystemUpdatePasswordRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SystemUpdatePasswordRequest) ProtoMessage() {} + +func (x *SystemUpdatePasswordRequest) ProtoReflect() protoreflect.Message { + mi := &file_sso_auth_proto_msgTypes[19] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SystemUpdatePasswordRequest.ProtoReflect.Descriptor instead. +func (*SystemUpdatePasswordRequest) Descriptor() ([]byte, []int) { + return file_sso_auth_proto_rawDescGZIP(), []int{19} +} + +func (x *SystemUpdatePasswordRequest) GetAccountId() string { + if x != nil { + return x.AccountId + } + return "" +} + +func (x *SystemUpdatePasswordRequest) GetNewPasswordHash() string { + if x != nil { + return x.NewPasswordHash + } + return "" +} + +type SystemUpdatePasswordResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SystemUpdatePasswordResponse) Reset() { + *x = SystemUpdatePasswordResponse{} + mi := &file_sso_auth_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SystemUpdatePasswordResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SystemUpdatePasswordResponse) ProtoMessage() {} + +func (x *SystemUpdatePasswordResponse) ProtoReflect() protoreflect.Message { + mi := &file_sso_auth_proto_msgTypes[20] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SystemUpdatePasswordResponse.ProtoReflect.Descriptor instead. +func (*SystemUpdatePasswordResponse) Descriptor() ([]byte, []int) { + return file_sso_auth_proto_rawDescGZIP(), []int{20} +} + +func (x *SystemUpdatePasswordResponse) GetSuccess() bool { + if x != nil { + return x.Success + } + return false +} + +type SystemUpdatePinRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + AccountId string `protobuf:"bytes,1,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"` + PinHash *string `protobuf:"bytes,2,opt,name=pin_hash,json=pinHash,proto3,oneof" json:"pin_hash,omitempty"` // null если удаляем + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SystemUpdatePinRequest) Reset() { + *x = SystemUpdatePinRequest{} + mi := &file_sso_auth_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SystemUpdatePinRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SystemUpdatePinRequest) ProtoMessage() {} + +func (x *SystemUpdatePinRequest) ProtoReflect() protoreflect.Message { + mi := &file_sso_auth_proto_msgTypes[21] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SystemUpdatePinRequest.ProtoReflect.Descriptor instead. +func (*SystemUpdatePinRequest) Descriptor() ([]byte, []int) { + return file_sso_auth_proto_rawDescGZIP(), []int{21} +} + +func (x *SystemUpdatePinRequest) GetAccountId() string { + if x != nil { + return x.AccountId + } + return "" +} + +func (x *SystemUpdatePinRequest) GetPinHash() string { + if x != nil && x.PinHash != nil { + return *x.PinHash + } + return "" +} + +type SystemUpdatePinResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SystemUpdatePinResponse) Reset() { + *x = SystemUpdatePinResponse{} + mi := &file_sso_auth_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SystemUpdatePinResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SystemUpdatePinResponse) ProtoMessage() {} + +func (x *SystemUpdatePinResponse) ProtoReflect() protoreflect.Message { + mi := &file_sso_auth_proto_msgTypes[22] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SystemUpdatePinResponse.ProtoReflect.Descriptor instead. +func (*SystemUpdatePinResponse) Descriptor() ([]byte, []int) { + return file_sso_auth_proto_rawDescGZIP(), []int{22} +} + +func (x *SystemUpdatePinResponse) GetSuccess() bool { + if x != nil { + return x.Success + } + return false +} + var File_sso_auth_proto protoreflect.FileDescriptor const file_sso_auth_proto_rawDesc = "" + @@ -961,7 +1353,33 @@ const file_sso_auth_proto_rawDesc = "" + "targetHash\"N\n" + "\x18TerminateSessionResponse\x12\x18\n" + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" + - "\amessage\x18\x02 \x01(\tR\amessage2\xcc\x04\n" + + "\amessage\x18\x02 \x01(\tR\amessage\"v\n" + + "\x1aSystemCreateAccountRequest\x12\x1a\n" + + "\busername\x18\x01 \x01(\tR\busername\x12#\n" + + "\rpassword_hash\x18\x02 \x01(\tR\fpasswordHash\x12\x17\n" + + "\ais_ldap\x18\x03 \x01(\bR\x06isLdap\"<\n" + + "\x1bSystemCreateAccountResponse\x12\x1d\n" + + "\n" + + "account_id\x18\x01 \x01(\tR\taccountId\"R\n" + + "\x19SystemChangeStatusRequest\x12\x1d\n" + + "\n" + + "account_id\x18\x01 \x01(\tR\taccountId\x12\x16\n" + + "\x06status\x18\x02 \x01(\tR\x06status\"6\n" + + "\x1aSystemChangeStatusResponse\x12\x18\n" + + "\asuccess\x18\x01 \x01(\bR\asuccess\"h\n" + + "\x1bSystemUpdatePasswordRequest\x12\x1d\n" + + "\n" + + "account_id\x18\x01 \x01(\tR\taccountId\x12*\n" + + "\x11new_password_hash\x18\x02 \x01(\tR\x0fnewPasswordHash\"8\n" + + "\x1cSystemUpdatePasswordResponse\x12\x18\n" + + "\asuccess\x18\x01 \x01(\bR\asuccess\"d\n" + + "\x16SystemUpdatePinRequest\x12\x1d\n" + + "\n" + + "account_id\x18\x01 \x01(\tR\taccountId\x12\x1e\n" + + "\bpin_hash\x18\x02 \x01(\tH\x00R\apinHash\x88\x01\x01B\v\n" + + "\t_pin_hash\"3\n" + + "\x17SystemUpdatePinResponse\x12\x18\n" + + "\asuccess\x18\x01 \x01(\bR\asuccess2\xc8\a\n" + "\vAuthService\x126\n" + "\x05Login\x12\x15.auth.v1.LoginRequest\x1a\x16.auth.v1.LoginResponse\x12<\n" + "\aRefresh\x12\x17.auth.v1.RefreshRequest\x1a\x18.auth.v1.RefreshResponse\x12H\n" + @@ -970,7 +1388,11 @@ const file_sso_auth_proto_rawDesc = "" + "\x06Logout\x12\x16.auth.v1.LogoutRequest\x1a\x17.auth.v1.LogoutResponse\x12>\n" + "\vLogoutOther\x12\x16.auth.v1.LogoutRequest\x1a\x17.auth.v1.LogoutResponse\x12G\n" + "\vGetSessions\x12\x1a.auth.v1.GetSessionRequest\x1a\x1c.auth.v1.GetSessionsResponse\x12W\n" + - "\x10TerminateSession\x12 .auth.v1.TerminateSessionRequest\x1a!.auth.v1.TerminateSessionResponseB*Z(git.lendry.ru/lendry-erp/proto.git/go;pbb\x06proto3" + "\x10TerminateSession\x12 .auth.v1.TerminateSessionRequest\x1a!.auth.v1.TerminateSessionResponse\x12`\n" + + "\x13SystemCreateAccount\x12#.auth.v1.SystemCreateAccountRequest\x1a$.auth.v1.SystemCreateAccountResponse\x12]\n" + + "\x12SystemChangeStatus\x12\".auth.v1.SystemChangeStatusRequest\x1a#.auth.v1.SystemChangeStatusResponse\x12c\n" + + "\x14SystemUpdatePassword\x12$.auth.v1.SystemUpdatePasswordRequest\x1a%.auth.v1.SystemUpdatePasswordResponse\x12T\n" + + "\x0fSystemUpdatePin\x12\x1f.auth.v1.SystemUpdatePinRequest\x1a .auth.v1.SystemUpdatePinResponseB*Z(git.lendry.ru/lendry-erp/proto.git/go;pbb\x06proto3" var ( file_sso_auth_proto_rawDescOnce sync.Once @@ -984,23 +1406,31 @@ func file_sso_auth_proto_rawDescGZIP() []byte { return file_sso_auth_proto_rawDescData } -var file_sso_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_sso_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 23) var file_sso_auth_proto_goTypes = []any{ - (*LoginRequest)(nil), // 0: auth.v1.LoginRequest - (*LoginResponse)(nil), // 1: auth.v1.LoginResponse - (*RefreshRequest)(nil), // 2: auth.v1.RefreshRequest - (*RefreshResponse)(nil), // 3: auth.v1.RefreshResponse - (*LogoutRequest)(nil), // 4: auth.v1.LogoutRequest - (*LogoutResponse)(nil), // 5: auth.v1.LogoutResponse - (*VerifyTokenRequest)(nil), // 6: auth.v1.VerifyTokenRequest - (*VerifyTokenResponse)(nil), // 7: auth.v1.VerifyTokenResponse - (*GetAccountRoleLevelRequest)(nil), // 8: auth.v1.GetAccountRoleLevelRequest - (*GetAccountRoleLevelResponse)(nil), // 9: auth.v1.GetAccountRoleLevelResponse - (*GetSessionRequest)(nil), // 10: auth.v1.GetSessionRequest - (*SessionItem)(nil), // 11: auth.v1.SessionItem - (*GetSessionsResponse)(nil), // 12: auth.v1.GetSessionsResponse - (*TerminateSessionRequest)(nil), // 13: auth.v1.TerminateSessionRequest - (*TerminateSessionResponse)(nil), // 14: auth.v1.TerminateSessionResponse + (*LoginRequest)(nil), // 0: auth.v1.LoginRequest + (*LoginResponse)(nil), // 1: auth.v1.LoginResponse + (*RefreshRequest)(nil), // 2: auth.v1.RefreshRequest + (*RefreshResponse)(nil), // 3: auth.v1.RefreshResponse + (*LogoutRequest)(nil), // 4: auth.v1.LogoutRequest + (*LogoutResponse)(nil), // 5: auth.v1.LogoutResponse + (*VerifyTokenRequest)(nil), // 6: auth.v1.VerifyTokenRequest + (*VerifyTokenResponse)(nil), // 7: auth.v1.VerifyTokenResponse + (*GetAccountRoleLevelRequest)(nil), // 8: auth.v1.GetAccountRoleLevelRequest + (*GetAccountRoleLevelResponse)(nil), // 9: auth.v1.GetAccountRoleLevelResponse + (*GetSessionRequest)(nil), // 10: auth.v1.GetSessionRequest + (*SessionItem)(nil), // 11: auth.v1.SessionItem + (*GetSessionsResponse)(nil), // 12: auth.v1.GetSessionsResponse + (*TerminateSessionRequest)(nil), // 13: auth.v1.TerminateSessionRequest + (*TerminateSessionResponse)(nil), // 14: auth.v1.TerminateSessionResponse + (*SystemCreateAccountRequest)(nil), // 15: auth.v1.SystemCreateAccountRequest + (*SystemCreateAccountResponse)(nil), // 16: auth.v1.SystemCreateAccountResponse + (*SystemChangeStatusRequest)(nil), // 17: auth.v1.SystemChangeStatusRequest + (*SystemChangeStatusResponse)(nil), // 18: auth.v1.SystemChangeStatusResponse + (*SystemUpdatePasswordRequest)(nil), // 19: auth.v1.SystemUpdatePasswordRequest + (*SystemUpdatePasswordResponse)(nil), // 20: auth.v1.SystemUpdatePasswordResponse + (*SystemUpdatePinRequest)(nil), // 21: auth.v1.SystemUpdatePinRequest + (*SystemUpdatePinResponse)(nil), // 22: auth.v1.SystemUpdatePinResponse } var file_sso_auth_proto_depIdxs = []int32{ 11, // 0: auth.v1.GetSessionsResponse.sessions:type_name -> auth.v1.SessionItem @@ -1012,16 +1442,24 @@ var file_sso_auth_proto_depIdxs = []int32{ 4, // 6: auth.v1.AuthService.LogoutOther:input_type -> auth.v1.LogoutRequest 10, // 7: auth.v1.AuthService.GetSessions:input_type -> auth.v1.GetSessionRequest 13, // 8: auth.v1.AuthService.TerminateSession:input_type -> auth.v1.TerminateSessionRequest - 1, // 9: auth.v1.AuthService.Login:output_type -> auth.v1.LoginResponse - 3, // 10: auth.v1.AuthService.Refresh:output_type -> auth.v1.RefreshResponse - 7, // 11: auth.v1.AuthService.VerifyToken:output_type -> auth.v1.VerifyTokenResponse - 9, // 12: auth.v1.AuthService.GetAccountRoleLevel:output_type -> auth.v1.GetAccountRoleLevelResponse - 5, // 13: auth.v1.AuthService.Logout:output_type -> auth.v1.LogoutResponse - 5, // 14: auth.v1.AuthService.LogoutOther:output_type -> auth.v1.LogoutResponse - 12, // 15: auth.v1.AuthService.GetSessions:output_type -> auth.v1.GetSessionsResponse - 14, // 16: auth.v1.AuthService.TerminateSession:output_type -> auth.v1.TerminateSessionResponse - 9, // [9:17] is the sub-list for method output_type - 1, // [1:9] is the sub-list for method input_type + 15, // 9: auth.v1.AuthService.SystemCreateAccount:input_type -> auth.v1.SystemCreateAccountRequest + 17, // 10: auth.v1.AuthService.SystemChangeStatus:input_type -> auth.v1.SystemChangeStatusRequest + 19, // 11: auth.v1.AuthService.SystemUpdatePassword:input_type -> auth.v1.SystemUpdatePasswordRequest + 21, // 12: auth.v1.AuthService.SystemUpdatePin:input_type -> auth.v1.SystemUpdatePinRequest + 1, // 13: auth.v1.AuthService.Login:output_type -> auth.v1.LoginResponse + 3, // 14: auth.v1.AuthService.Refresh:output_type -> auth.v1.RefreshResponse + 7, // 15: auth.v1.AuthService.VerifyToken:output_type -> auth.v1.VerifyTokenResponse + 9, // 16: auth.v1.AuthService.GetAccountRoleLevel:output_type -> auth.v1.GetAccountRoleLevelResponse + 5, // 17: auth.v1.AuthService.Logout:output_type -> auth.v1.LogoutResponse + 5, // 18: auth.v1.AuthService.LogoutOther:output_type -> auth.v1.LogoutResponse + 12, // 19: auth.v1.AuthService.GetSessions:output_type -> auth.v1.GetSessionsResponse + 14, // 20: auth.v1.AuthService.TerminateSession:output_type -> auth.v1.TerminateSessionResponse + 16, // 21: auth.v1.AuthService.SystemCreateAccount:output_type -> auth.v1.SystemCreateAccountResponse + 18, // 22: auth.v1.AuthService.SystemChangeStatus:output_type -> auth.v1.SystemChangeStatusResponse + 20, // 23: auth.v1.AuthService.SystemUpdatePassword:output_type -> auth.v1.SystemUpdatePasswordResponse + 22, // 24: auth.v1.AuthService.SystemUpdatePin:output_type -> auth.v1.SystemUpdatePinResponse + 13, // [13:25] is the sub-list for method output_type + 1, // [1:13] 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 @@ -1034,13 +1472,14 @@ func file_sso_auth_proto_init() { } file_sso_auth_proto_msgTypes[1].OneofWrappers = []any{} file_sso_auth_proto_msgTypes[7].OneofWrappers = []any{} + file_sso_auth_proto_msgTypes[21].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_sso_auth_proto_rawDesc), len(file_sso_auth_proto_rawDesc)), NumEnums: 0, - NumMessages: 15, + NumMessages: 23, NumExtensions: 0, NumServices: 1, }, diff --git a/gen/go/sso/auth_grpc.pb.go b/gen/go/sso/auth_grpc.pb.go index 2fc806c..8434c10 100644 --- a/gen/go/sso/auth_grpc.pb.go +++ b/gen/go/sso/auth_grpc.pb.go @@ -19,14 +19,18 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - AuthService_Login_FullMethodName = "/auth.v1.AuthService/Login" - AuthService_Refresh_FullMethodName = "/auth.v1.AuthService/Refresh" - AuthService_VerifyToken_FullMethodName = "/auth.v1.AuthService/VerifyToken" - AuthService_GetAccountRoleLevel_FullMethodName = "/auth.v1.AuthService/GetAccountRoleLevel" - AuthService_Logout_FullMethodName = "/auth.v1.AuthService/Logout" - AuthService_LogoutOther_FullMethodName = "/auth.v1.AuthService/LogoutOther" - AuthService_GetSessions_FullMethodName = "/auth.v1.AuthService/GetSessions" - AuthService_TerminateSession_FullMethodName = "/auth.v1.AuthService/TerminateSession" + AuthService_Login_FullMethodName = "/auth.v1.AuthService/Login" + AuthService_Refresh_FullMethodName = "/auth.v1.AuthService/Refresh" + AuthService_VerifyToken_FullMethodName = "/auth.v1.AuthService/VerifyToken" + AuthService_GetAccountRoleLevel_FullMethodName = "/auth.v1.AuthService/GetAccountRoleLevel" + AuthService_Logout_FullMethodName = "/auth.v1.AuthService/Logout" + AuthService_LogoutOther_FullMethodName = "/auth.v1.AuthService/LogoutOther" + AuthService_GetSessions_FullMethodName = "/auth.v1.AuthService/GetSessions" + AuthService_TerminateSession_FullMethodName = "/auth.v1.AuthService/TerminateSession" + AuthService_SystemCreateAccount_FullMethodName = "/auth.v1.AuthService/SystemCreateAccount" + AuthService_SystemChangeStatus_FullMethodName = "/auth.v1.AuthService/SystemChangeStatus" + AuthService_SystemUpdatePassword_FullMethodName = "/auth.v1.AuthService/SystemUpdatePassword" + AuthService_SystemUpdatePin_FullMethodName = "/auth.v1.AuthService/SystemUpdatePin" ) // AuthServiceClient is the client API for AuthService service. @@ -41,6 +45,10 @@ type AuthServiceClient interface { LogoutOther(ctx context.Context, in *LogoutRequest, opts ...grpc.CallOption) (*LogoutResponse, error) GetSessions(ctx context.Context, in *GetSessionRequest, opts ...grpc.CallOption) (*GetSessionsResponse, error) TerminateSession(ctx context.Context, in *TerminateSessionRequest, opts ...grpc.CallOption) (*TerminateSessionResponse, error) + SystemCreateAccount(ctx context.Context, in *SystemCreateAccountRequest, opts ...grpc.CallOption) (*SystemCreateAccountResponse, error) + SystemChangeStatus(ctx context.Context, in *SystemChangeStatusRequest, opts ...grpc.CallOption) (*SystemChangeStatusResponse, error) + SystemUpdatePassword(ctx context.Context, in *SystemUpdatePasswordRequest, opts ...grpc.CallOption) (*SystemUpdatePasswordResponse, error) + SystemUpdatePin(ctx context.Context, in *SystemUpdatePinRequest, opts ...grpc.CallOption) (*SystemUpdatePinResponse, error) } type authServiceClient struct { @@ -131,6 +139,46 @@ func (c *authServiceClient) TerminateSession(ctx context.Context, in *TerminateS return out, nil } +func (c *authServiceClient) SystemCreateAccount(ctx context.Context, in *SystemCreateAccountRequest, opts ...grpc.CallOption) (*SystemCreateAccountResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(SystemCreateAccountResponse) + err := c.cc.Invoke(ctx, AuthService_SystemCreateAccount_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *authServiceClient) SystemChangeStatus(ctx context.Context, in *SystemChangeStatusRequest, opts ...grpc.CallOption) (*SystemChangeStatusResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(SystemChangeStatusResponse) + err := c.cc.Invoke(ctx, AuthService_SystemChangeStatus_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *authServiceClient) SystemUpdatePassword(ctx context.Context, in *SystemUpdatePasswordRequest, opts ...grpc.CallOption) (*SystemUpdatePasswordResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(SystemUpdatePasswordResponse) + err := c.cc.Invoke(ctx, AuthService_SystemUpdatePassword_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *authServiceClient) SystemUpdatePin(ctx context.Context, in *SystemUpdatePinRequest, opts ...grpc.CallOption) (*SystemUpdatePinResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(SystemUpdatePinResponse) + err := c.cc.Invoke(ctx, AuthService_SystemUpdatePin_FullMethodName, in, out, cOpts...) + 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. @@ -143,6 +191,10 @@ type AuthServiceServer interface { LogoutOther(context.Context, *LogoutRequest) (*LogoutResponse, error) GetSessions(context.Context, *GetSessionRequest) (*GetSessionsResponse, error) TerminateSession(context.Context, *TerminateSessionRequest) (*TerminateSessionResponse, error) + SystemCreateAccount(context.Context, *SystemCreateAccountRequest) (*SystemCreateAccountResponse, error) + SystemChangeStatus(context.Context, *SystemChangeStatusRequest) (*SystemChangeStatusResponse, error) + SystemUpdatePassword(context.Context, *SystemUpdatePasswordRequest) (*SystemUpdatePasswordResponse, error) + SystemUpdatePin(context.Context, *SystemUpdatePinRequest) (*SystemUpdatePinResponse, error) mustEmbedUnimplementedAuthServiceServer() } @@ -177,6 +229,18 @@ func (UnimplementedAuthServiceServer) GetSessions(context.Context, *GetSessionRe func (UnimplementedAuthServiceServer) TerminateSession(context.Context, *TerminateSessionRequest) (*TerminateSessionResponse, error) { return nil, status.Error(codes.Unimplemented, "method TerminateSession not implemented") } +func (UnimplementedAuthServiceServer) SystemCreateAccount(context.Context, *SystemCreateAccountRequest) (*SystemCreateAccountResponse, error) { + return nil, status.Error(codes.Unimplemented, "method SystemCreateAccount not implemented") +} +func (UnimplementedAuthServiceServer) SystemChangeStatus(context.Context, *SystemChangeStatusRequest) (*SystemChangeStatusResponse, error) { + return nil, status.Error(codes.Unimplemented, "method SystemChangeStatus not implemented") +} +func (UnimplementedAuthServiceServer) SystemUpdatePassword(context.Context, *SystemUpdatePasswordRequest) (*SystemUpdatePasswordResponse, error) { + return nil, status.Error(codes.Unimplemented, "method SystemUpdatePassword not implemented") +} +func (UnimplementedAuthServiceServer) SystemUpdatePin(context.Context, *SystemUpdatePinRequest) (*SystemUpdatePinResponse, error) { + return nil, status.Error(codes.Unimplemented, "method SystemUpdatePin not implemented") +} func (UnimplementedAuthServiceServer) mustEmbedUnimplementedAuthServiceServer() {} func (UnimplementedAuthServiceServer) testEmbeddedByValue() {} @@ -342,6 +406,78 @@ func _AuthService_TerminateSession_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } +func _AuthService_SystemCreateAccount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SystemCreateAccountRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AuthServiceServer).SystemCreateAccount(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AuthService_SystemCreateAccount_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AuthServiceServer).SystemCreateAccount(ctx, req.(*SystemCreateAccountRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _AuthService_SystemChangeStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SystemChangeStatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AuthServiceServer).SystemChangeStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AuthService_SystemChangeStatus_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AuthServiceServer).SystemChangeStatus(ctx, req.(*SystemChangeStatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _AuthService_SystemUpdatePassword_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SystemUpdatePasswordRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AuthServiceServer).SystemUpdatePassword(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AuthService_SystemUpdatePassword_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AuthServiceServer).SystemUpdatePassword(ctx, req.(*SystemUpdatePasswordRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _AuthService_SystemUpdatePin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SystemUpdatePinRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AuthServiceServer).SystemUpdatePin(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AuthService_SystemUpdatePin_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AuthServiceServer).SystemUpdatePin(ctx, req.(*SystemUpdatePinRequest)) + } + 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) @@ -381,6 +517,22 @@ var AuthService_ServiceDesc = grpc.ServiceDesc{ MethodName: "TerminateSession", Handler: _AuthService_TerminateSession_Handler, }, + { + MethodName: "SystemCreateAccount", + Handler: _AuthService_SystemCreateAccount_Handler, + }, + { + MethodName: "SystemChangeStatus", + Handler: _AuthService_SystemChangeStatus_Handler, + }, + { + MethodName: "SystemUpdatePassword", + Handler: _AuthService_SystemUpdatePassword_Handler, + }, + { + MethodName: "SystemUpdatePin", + Handler: _AuthService_SystemUpdatePin_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "sso/auth.proto", diff --git a/gen/sso/auth.ts b/gen/sso/auth.ts index fd970aa..a5829cb 100644 --- a/gen/sso/auth.ts +++ b/gen/sso/auth.ts @@ -100,6 +100,46 @@ export interface TerminateSessionResponse { message: string; } +export interface SystemCreateAccountRequest { + username: string; + /** Хеш пароля генерирует Admin Service и передает сюда */ + passwordHash: string; + isLdap: boolean; +} + +export interface SystemCreateAccountResponse { + accountId: string; +} + +export interface SystemChangeStatusRequest { + accountId: string; + /** 'ACTIVE', 'BLOCKED', 'DELETED' */ + status: string; +} + +export interface SystemChangeStatusResponse { + success: boolean; +} + +export interface SystemUpdatePasswordRequest { + accountId: string; + newPasswordHash: string; +} + +export interface SystemUpdatePasswordResponse { + success: boolean; +} + +export interface SystemUpdatePinRequest { + accountId: string; + /** null если удаляем */ + pinHash?: string | undefined; +} + +export interface SystemUpdatePinResponse { + success: boolean; +} + export const AUTH_V1_PACKAGE_NAME = "auth.v1"; export interface AuthServiceClient { @@ -121,6 +161,20 @@ export interface AuthServiceClient { getSessions(request: GetSessionRequest, metadata?: Metadata): Observable; terminateSession(request: TerminateSessionRequest, metadata?: Metadata): Observable; + + systemCreateAccount( + request: SystemCreateAccountRequest, + metadata?: Metadata, + ): Observable; + + systemChangeStatus(request: SystemChangeStatusRequest, metadata?: Metadata): Observable; + + systemUpdatePassword( + request: SystemUpdatePasswordRequest, + metadata?: Metadata, + ): Observable; + + systemUpdatePin(request: SystemUpdatePinRequest, metadata?: Metadata): Observable; } export interface AuthServiceController { @@ -160,6 +214,26 @@ export interface AuthServiceController { request: TerminateSessionRequest, metadata?: Metadata, ): Promise | Observable | TerminateSessionResponse; + + systemCreateAccount( + request: SystemCreateAccountRequest, + metadata?: Metadata, + ): Promise | Observable | SystemCreateAccountResponse; + + systemChangeStatus( + request: SystemChangeStatusRequest, + metadata?: Metadata, + ): Promise | Observable | SystemChangeStatusResponse; + + systemUpdatePassword( + request: SystemUpdatePasswordRequest, + metadata?: Metadata, + ): Promise | Observable | SystemUpdatePasswordResponse; + + systemUpdatePin( + request: SystemUpdatePinRequest, + metadata?: Metadata, + ): Promise | Observable | SystemUpdatePinResponse; } export function AuthServiceControllerMethods() { @@ -173,6 +247,10 @@ export function AuthServiceControllerMethods() { "logoutOther", "getSessions", "terminateSession", + "systemCreateAccount", + "systemChangeStatus", + "systemUpdatePassword", + "systemUpdatePin", ]; for (const method of grpcMethods) { const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);