@aepstore-dev/contracts 1.33.0 → 1.35.0

package/gen/auth.ts

@@ -119,6 +119,52 @@ export interface TwoFactorStatusResponse {
 export interface Empty {
 }
 
+export interface LogoutCurrentRequest {
+  refreshToken: string;
+}
+
+export interface LogoutAllRequest {
+  userId: string;
+}
+
+export interface LogoutResponse {
+  ok: boolean;
+  /** number of refresh-token rows deleted */
+  removed: number;
+}
+
+export interface RestoreLoginRequest {
+  /** email or username */
+  credentials: string;
+  password: string;
+  userAgent: string;
+  ip: string;
+}
+
+export interface ListLoginHistoryRequest {
+  userId: string;
+  page: number;
+  limit: number;
+}
+
+export interface LoginEventRow {
+  id: string;
+  /** LOGIN | LOGOUT | REFRESH | TWO_FA_FAIL | PASSWORD_FAIL | BLOCKED | RESTORE */
+  type: string;
+  success: boolean;
+  reason: string;
+  ip: string;
+  userAgent: string;
+  createdAt: string;
+}
+
+export interface ListLoginHistoryResponse {
+  items: LoginEventRow[];
+  total: number;
+  page: number;
+  limit: number;
+}
+
 export const AUTH_V1_PACKAGE_NAME = "auth.v1";
 
 /**
@@ -148,6 +194,30 @@ export interface AuthServiceClient {
   getProfile(request: GetProfileRequest): Observable<AuthUser>;
 
   cleanupExpiredTotpSetups(request: Empty): Observable<Empty>;
+
+  /**
+   * Logout — kill refresh tokens. LogoutCurrent kills only the one whose
+   * HMAC matches; LogoutAll wipes every row for the user.
+   */
+
+  logoutCurrent(request: LogoutCurrentRequest): Observable<LogoutResponse>;
+
+  logoutAll(request: LogoutAllRequest): Observable<LogoutResponse>;
+
+  /**
+   * Self-service restore. Verifies credentials + password against a
+   * soft-deleted user, clears deletedAt/scheduledForHardDelete, and issues
+   * fresh tokens — the one auth path that DOES read deletedAt accounts.
+   */
+
+  restoreLogin(request: RestoreLoginRequest): Observable<AuthResult>;
+
+  /**
+   * Login history. Read-only audit feed for the settings page; rows come
+   * from LoginEvent. Internal alternative: tasks-service GC.
+   */
+
+  listLoginHistory(request: ListLoginHistoryRequest): Observable<ListLoginHistoryResponse>;
 }
 
 /**
@@ -179,6 +249,32 @@ export interface AuthServiceController {
   getProfile(request: GetProfileRequest): Promise<AuthUser> | Observable<AuthUser> | AuthUser;
 
   cleanupExpiredTotpSetups(request: Empty): Promise<Empty> | Observable<Empty> | Empty;
+
+  /**
+   * Logout — kill refresh tokens. LogoutCurrent kills only the one whose
+   * HMAC matches; LogoutAll wipes every row for the user.
+   */
+
+  logoutCurrent(request: LogoutCurrentRequest): Promise<LogoutResponse> | Observable<LogoutResponse> | LogoutResponse;
+
+  logoutAll(request: LogoutAllRequest): Promise<LogoutResponse> | Observable<LogoutResponse> | LogoutResponse;
+
+  /**
+   * Self-service restore. Verifies credentials + password against a
+   * soft-deleted user, clears deletedAt/scheduledForHardDelete, and issues
+   * fresh tokens — the one auth path that DOES read deletedAt accounts.
+   */
+
+  restoreLogin(request: RestoreLoginRequest): Promise<AuthResult> | Observable<AuthResult> | AuthResult;
+
+  /**
+   * Login history. Read-only audit feed for the settings page; rows come
+   * from LoginEvent. Internal alternative: tasks-service GC.
+   */
+
+  listLoginHistory(
+    request: ListLoginHistoryRequest,
+  ): Promise<ListLoginHistoryResponse> | Observable<ListLoginHistoryResponse> | ListLoginHistoryResponse;
 }
 
 export function AuthServiceControllerMethods() {
@@ -193,6 +289,10 @@ export function AuthServiceControllerMethods() {
       "get2FaStatus",
       "getProfile",
       "cleanupExpiredTotpSetups",
+      "logoutCurrent",
+      "logoutAll",
+      "restoreLogin",
+      "listLoginHistory",
     ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

package/gen/mail.ts

@@ -39,6 +39,16 @@ export interface SendRegistrationConfirmRequest {
   username: string;
 }
 
+export interface SendDataExportReadyRequest {
+  email: string;
+  username: string;
+  /** signed S3 URL */
+  fileUrl: string;
+  /** for the message body */
+  urlTtlHours: number;
+  fileSize: number;
+}
+
 export const MAIL_V1_PACKAGE_NAME = "mail.v1";
 
 /**
@@ -55,6 +65,13 @@ export interface MailServiceClient {
   sendPasswordReset(request: SendPasswordResetRequest): Observable<MailAck>;
 
   sendRegistrationConfirm(request: SendRegistrationConfirmRequest): Observable<MailAck>;
+
+  /**
+   * GDPR data-export delivery — tasks-service fires after the JSON dump
+   * lands in S3; mail-service sends the signed URL with a sensible TTL note.
+   */
+
+  sendDataExportReady(request: SendDataExportReadyRequest): Observable<MailAck>;
 }
 
 /**
@@ -71,11 +88,24 @@ export interface MailServiceController {
   sendPasswordReset(request: SendPasswordResetRequest): Promise<MailAck> | Observable<MailAck> | MailAck;
 
   sendRegistrationConfirm(request: SendRegistrationConfirmRequest): Promise<MailAck> | Observable<MailAck> | MailAck;
+
+  /**
+   * GDPR data-export delivery — tasks-service fires after the JSON dump
+   * lands in S3; mail-service sends the signed URL with a sensible TTL note.
+   */
+
+  sendDataExportReady(request: SendDataExportReadyRequest): Promise<MailAck> | Observable<MailAck> | MailAck;
 }
 
 export function MailServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = ["sendReg", "send2Fa", "sendPasswordReset", "sendRegistrationConfirm"];
+    const grpcMethods: string[] = [
+      "sendReg",
+      "send2Fa",
+      "sendPasswordReset",
+      "sendRegistrationConfirm",
+      "sendDataExportReady",
+    ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("MailService", method)(constructor.prototype[method], method, descriptor);

package/gen/payments.ts

@@ -429,6 +429,72 @@ export interface PremiumPaymentsListResponse {
   limit: number;
 }
 
+/**
+ * ---------------------------------------------------------------------------
+ * Saved cards (YooKassa payment_method tokens; we never see PAN)
+ * ---------------------------------------------------------------------------
+ */
+export interface SavedCard {
+  id: string;
+  /** "MIR" | "VISA" | "MASTERCARD" | "" */
+  brand: string;
+  /** "0000" etc, display-only */
+  last4: string;
+  expMonth: number;
+  expYear: number;
+  isDefault: boolean;
+  /** user-set label */
+  nickname: string;
+  createdAt: string;
+}
+
+export interface ListSavedCardsRequest {
+  userId: string;
+}
+
+export interface ListSavedCardsResponse {
+  items: SavedCard[];
+}
+
+export interface DeleteSavedCardRequest {
+  userId: string;
+  id: string;
+}
+
+export interface SetDefaultSavedCardRequest {
+  userId: string;
+  id: string;
+}
+
+export interface UpdateSavedCardRequest {
+  userId: string;
+  id: string;
+  /** empty = clear */
+  nickname: string;
+}
+
+/**
+ * ---------------------------------------------------------------------------
+ * Payout details (persistent default; per-withdrawal override still allowed)
+ * ---------------------------------------------------------------------------
+ */
+export interface UpdatePayoutDetailsRequest {
+  userId: string;
+  /** "card" | "sbp" | "bank" | "" (clear) */
+  method: string;
+  /** JSON string — payments-service treats opaquely */
+  details: string;
+}
+
+export interface UpdatePayoutDetailsResponse {
+  method: string;
+  details: string;
+}
+
+export interface GetPayoutDetailsRequest {
+  userId: string;
+}
+
 export const PAYMENTS_V1_PACKAGE_NAME = "payments.v1";
 
 /**
@@ -490,6 +556,22 @@ export interface PaymentsServiceClient {
 
   runPremiumRenewals(request: RunPremiumRenewalsRequest): Observable<RunPremiumRenewalsResponse>;
 
+  /** ----- saved cards ----- */
+
+  listSavedCards(request: ListSavedCardsRequest): Observable<ListSavedCardsResponse>;
+
+  deleteSavedCard(request: DeleteSavedCardRequest): Observable<Ok>;
+
+  setDefaultSavedCard(request: SetDefaultSavedCardRequest): Observable<SavedCard>;
+
+  updateSavedCard(request: UpdateSavedCardRequest): Observable<SavedCard>;
+
+  /** ----- payout details ----- */
+
+  updatePayoutDetails(request: UpdatePayoutDetailsRequest): Observable<UpdatePayoutDetailsResponse>;
+
+  getPayoutDetails(request: GetPayoutDetailsRequest): Observable<UpdatePayoutDetailsResponse>;
+
   /** ----- admin ----- */
 
   getAdminOverview(request: AdminOverviewRequest): Observable<AdminOverviewResponse>;
@@ -580,6 +662,28 @@ export interface PaymentsServiceController {
     request: RunPremiumRenewalsRequest,
   ): Promise<RunPremiumRenewalsResponse> | Observable<RunPremiumRenewalsResponse> | RunPremiumRenewalsResponse;
 
+  /** ----- saved cards ----- */
+
+  listSavedCards(
+    request: ListSavedCardsRequest,
+  ): Promise<ListSavedCardsResponse> | Observable<ListSavedCardsResponse> | ListSavedCardsResponse;
+
+  deleteSavedCard(request: DeleteSavedCardRequest): Promise<Ok> | Observable<Ok> | Ok;
+
+  setDefaultSavedCard(request: SetDefaultSavedCardRequest): Promise<SavedCard> | Observable<SavedCard> | SavedCard;
+
+  updateSavedCard(request: UpdateSavedCardRequest): Promise<SavedCard> | Observable<SavedCard> | SavedCard;
+
+  /** ----- payout details ----- */
+
+  updatePayoutDetails(
+    request: UpdatePayoutDetailsRequest,
+  ): Promise<UpdatePayoutDetailsResponse> | Observable<UpdatePayoutDetailsResponse> | UpdatePayoutDetailsResponse;
+
+  getPayoutDetails(
+    request: GetPayoutDetailsRequest,
+  ): Promise<UpdatePayoutDetailsResponse> | Observable<UpdatePayoutDetailsResponse> | UpdatePayoutDetailsResponse;
+
   /** ----- admin ----- */
 
   getAdminOverview(
@@ -620,6 +724,12 @@ export function PaymentsServiceControllerMethods() {
       "refundPremium",
       "getMyPremiumPayments",
       "runPremiumRenewals",
+      "listSavedCards",
+      "deleteSavedCard",
+      "setDefaultSavedCard",
+      "updateSavedCard",
+      "updatePayoutDetails",
+      "getPayoutDetails",
       "getAdminOverview",
       "adminListTransactions",
       "getUserFinance",

package/gen/users.ts

@@ -29,6 +29,10 @@ export enum PremiumPeriod {
   UNRECOGNIZED = -1,
 }
 
+export interface Ok {
+  ok: boolean;
+}
+
 export interface User {
   id: string;
   email: string;
@@ -378,6 +382,210 @@ export interface DeleteAvatarBorderResponse {
   ok: boolean;
 }
 
+export interface UpdatePrivacyRequest {
+  userId: string;
+  hideEmail: boolean;
+  hideBalance: boolean;
+  hideOnline: boolean;
+}
+
+export interface UpdateEmailPrefsRequest {
+  userId: string;
+  emailOnSales: boolean;
+  emailOnReviews: boolean;
+  emailOnNews: boolean;
+}
+
+export interface UpdateEmailPrefsResponse {
+  emailOnSales: boolean;
+  emailOnReviews: boolean;
+  emailOnNews: boolean;
+}
+
+export interface UpdateLocaleRequest {
+  userId: string;
+  /** "ru" | "en" | ... */
+  locale: string;
+}
+
+export interface UpdateLocaleResponse {
+  locale: string;
+}
+
+export interface SoftDeleteAccountRequest {
+  userId: string;
+  /** optional, for support/audit */
+  reason: string;
+  /** 0 → use server default (30) */
+  cooldownDays: number;
+}
+
+export interface SoftDeleteAccountResponse {
+  /** ISO 8601 */
+  deletedAt: string;
+  scheduledForHardDelete: string;
+}
+
+export interface RestoreAccountRequest {
+  userId: string;
+}
+
+export interface HardDeletePendingRequest {
+  /** 0 → default 100 */
+  maxBatch: number;
+}
+
+export interface HardDeletePendingResponse {
+  deleted: number;
+}
+
+export interface ChangePasswordRequest {
+  userId: string;
+  currentPassword: string;
+  newPassword: string;
+  /** Optional: revoke all other sessions on success. */
+  revokeOtherSessions: boolean;
+}
+
+export interface BlockUserRequest {
+  blockerId: string;
+  blockedId: string;
+  /** optional */
+  reason: string;
+}
+
+export interface BlockUserResponse {
+  blocked: boolean;
+}
+
+export interface BlockedUserRow {
+  id: string;
+  username: string;
+  avatarUrl: string;
+  blockedAt: string;
+  reason: string;
+}
+
+export interface ListBlockedUsersRequest {
+  blockerId: string;
+  page: number;
+  limit: number;
+}
+
+export interface ListBlockedUsersResponse {
+  items: BlockedUserRow[];
+  total: number;
+  page: number;
+  limit: number;
+}
+
+export interface IsBlockedRequest {
+  blockerId: string;
+  blockedId: string;
+}
+
+export interface IsBlockedResponse {
+  isBlocked: boolean;
+}
+
+export interface DataExportRequestRow {
+  id: string;
+  userId: string;
+  /** PENDING | PROCESSING | READY | FAILED */
+  status: string;
+  fileUrl: string;
+  fileSize: number;
+  error: string;
+  createdAt: string;
+  completedAt: string;
+}
+
+export interface RequestDataExportRequest {
+  userId: string;
+}
+
+export interface ListDataExportsRequest {
+  userId: string;
+  page: number;
+  limit: number;
+}
+
+export interface ListDataExportsResponse {
+  items: DataExportRequestRow[];
+  total: number;
+  page: number;
+  limit: number;
+}
+
+export interface PickPendingDataExportRequest {
+  /** tasks-service polls; returns one PENDING row marked PROCESSING, or empty. */
+  Placeholder: boolean;
+}
+
+export interface CompleteDataExportRequest {
+  id: string;
+  fileUrl: string;
+  fileSize: number;
+  /** if set, marks FAILED instead of READY */
+  error: string;
+}
+
+export interface CollectUserExportDataRequest {
+  userId: string;
+}
+
+export interface CollectUserExportDataResponse {
+  /**
+   * Opaque JSON-as-string of user-owned data. tasks-service writes it to
+   * S3 verbatim. Keeps the schema-specific marshaling private to users-service.
+   */
+  payloadJson: string;
+}
+
+export interface GetAccountSettingsRequest {
+  userId: string;
+}
+
+export interface AccountSettingsResponse {
+  /** Identity */
+  id: string;
+  username: string;
+  email: string;
+  fullName: string;
+  aboutMe: string;
+  avatarUrl: string;
+  bannerUrl: string;
+  locale: string;
+  timezone: string;
+  countryId: string;
+  createdAt: string;
+  /** 2FA */
+  twoFactorType: string;
+  twoFactorEnabled: boolean;
+  backupCodesRemaining: number;
+  /** Privacy */
+  hideEmail: boolean;
+  hideBalance: boolean;
+  hideOnline: boolean;
+  hideSubscriptions: boolean;
+  /** Email prefs */
+  emailOnSales: boolean;
+  emailOnReviews: boolean;
+  emailOnNews: boolean;
+  /** Payout defaults */
+  payoutMethod: string;
+  payoutDetails: string;
+  /** Premium snapshot */
+  premiumIsActive: boolean;
+  premiumStatus: string;
+  premiumExpiresAt: string;
+  premiumAutoRenew: boolean;
+  /** Soft-delete state */
+  deletedAt: string;
+  scheduledForHardDelete: string;
+  socialMedia: SocialMedia[];
+}
+
 export const USERS_V1_PACKAGE_NAME = "users.v1";
 
 export interface UsersServiceClient {
@@ -435,6 +643,65 @@ export interface UsersServiceClient {
   upsertAvatarBorder(request: UpsertAvatarBorderRequest): Observable<AvatarBorder>;
 
   deleteAvatarBorder(request: DeleteAvatarBorderRequest): Observable<DeleteAvatarBorderResponse>;
+
+  /** Account settings — bundled write surface for the UI. */
+
+  updatePrivacy(request: UpdatePrivacyRequest): Observable<PublicProfileResponse>;
+
+  updateEmailPrefs(request: UpdateEmailPrefsRequest): Observable<UpdateEmailPrefsResponse>;
+
+  updateLocale(request: UpdateLocaleRequest): Observable<UpdateLocaleResponse>;
+
+  /**
+   * Soft-delete + restore. Internal AuthService also queries the soft-delete
+   * state on login (rejects if deletedAt set).
+   */
+
+  softDeleteAccount(request: SoftDeleteAccountRequest): Observable<SoftDeleteAccountResponse>;
+
+  restoreAccount(request: RestoreAccountRequest): Observable<UserResponse>;
+
+  /** tasks-service cron */
+
+  hardDeletePending(request: HardDeletePendingRequest): Observable<HardDeletePendingResponse>;
+
+  /** Blocks */
+
+  blockUser(request: BlockUserRequest): Observable<BlockUserResponse>;
+
+  unblockUser(request: BlockUserRequest): Observable<BlockUserResponse>;
+
+  listBlockedUsers(request: ListBlockedUsersRequest): Observable<ListBlockedUsersResponse>;
+
+  /** internal lookup */
+
+  isBlocked(request: IsBlockedRequest): Observable<IsBlockedResponse>;
+
+  /** Data export */
+
+  requestDataExport(request: RequestDataExportRequest): Observable<DataExportRequestRow>;
+
+  listDataExports(request: ListDataExportsRequest): Observable<ListDataExportsResponse>;
+
+  /** tasks-service */
+
+  pickPendingDataExport(request: PickPendingDataExportRequest): Observable<DataExportRequestRow>;
+
+  /** tasks-service */
+
+  completeDataExport(request: CompleteDataExportRequest): Observable<DataExportRequestRow>;
+
+  /** tasks-service */
+
+  collectUserExportData(request: CollectUserExportDataRequest): Observable<CollectUserExportDataResponse>;
+
+  /** Unified read for the settings page */
+
+  getAccountSettings(request: GetAccountSettingsRequest): Observable<AccountSettingsResponse>;
+
+  /** Password — separate from generic createCode/verifyCode reset flow. */
+
+  changePassword(request: ChangePasswordRequest): Observable<Ok>;
 }
 
 export interface UsersServiceController {
@@ -520,6 +787,91 @@ export interface UsersServiceController {
   deleteAvatarBorder(
     request: DeleteAvatarBorderRequest,
   ): Promise<DeleteAvatarBorderResponse> | Observable<DeleteAvatarBorderResponse> | DeleteAvatarBorderResponse;
+
+  /** Account settings — bundled write surface for the UI. */
+
+  updatePrivacy(
+    request: UpdatePrivacyRequest,
+  ): Promise<PublicProfileResponse> | Observable<PublicProfileResponse> | PublicProfileResponse;
+
+  updateEmailPrefs(
+    request: UpdateEmailPrefsRequest,
+  ): Promise<UpdateEmailPrefsResponse> | Observable<UpdateEmailPrefsResponse> | UpdateEmailPrefsResponse;
+
+  updateLocale(
+    request: UpdateLocaleRequest,
+  ): Promise<UpdateLocaleResponse> | Observable<UpdateLocaleResponse> | UpdateLocaleResponse;
+
+  /**
+   * Soft-delete + restore. Internal AuthService also queries the soft-delete
+   * state on login (rejects if deletedAt set).
+   */
+
+  softDeleteAccount(
+    request: SoftDeleteAccountRequest,
+  ): Promise<SoftDeleteAccountResponse> | Observable<SoftDeleteAccountResponse> | SoftDeleteAccountResponse;
+
+  restoreAccount(request: RestoreAccountRequest): Promise<UserResponse> | Observable<UserResponse> | UserResponse;
+
+  /** tasks-service cron */
+
+  hardDeletePending(
+    request: HardDeletePendingRequest,
+  ): Promise<HardDeletePendingResponse> | Observable<HardDeletePendingResponse> | HardDeletePendingResponse;
+
+  /** Blocks */
+
+  blockUser(request: BlockUserRequest): Promise<BlockUserResponse> | Observable<BlockUserResponse> | BlockUserResponse;
+
+  unblockUser(
+    request: BlockUserRequest,
+  ): Promise<BlockUserResponse> | Observable<BlockUserResponse> | BlockUserResponse;
+
+  listBlockedUsers(
+    request: ListBlockedUsersRequest,
+  ): Promise<ListBlockedUsersResponse> | Observable<ListBlockedUsersResponse> | ListBlockedUsersResponse;
+
+  /** internal lookup */
+
+  isBlocked(request: IsBlockedRequest): Promise<IsBlockedResponse> | Observable<IsBlockedResponse> | IsBlockedResponse;
+
+  /** Data export */
+
+  requestDataExport(
+    request: RequestDataExportRequest,
+  ): Promise<DataExportRequestRow> | Observable<DataExportRequestRow> | DataExportRequestRow;
+
+  listDataExports(
+    request: ListDataExportsRequest,
+  ): Promise<ListDataExportsResponse> | Observable<ListDataExportsResponse> | ListDataExportsResponse;
+
+  /** tasks-service */
+
+  pickPendingDataExport(
+    request: PickPendingDataExportRequest,
+  ): Promise<DataExportRequestRow> | Observable<DataExportRequestRow> | DataExportRequestRow;
+
+  /** tasks-service */
+
+  completeDataExport(
+    request: CompleteDataExportRequest,
+  ): Promise<DataExportRequestRow> | Observable<DataExportRequestRow> | DataExportRequestRow;
+
+  /** tasks-service */
+
+  collectUserExportData(
+    request: CollectUserExportDataRequest,
+  ): Promise<CollectUserExportDataResponse> | Observable<CollectUserExportDataResponse> | CollectUserExportDataResponse;
+
+  /** Unified read for the settings page */
+
+  getAccountSettings(
+    request: GetAccountSettingsRequest,
+  ): Promise<AccountSettingsResponse> | Observable<AccountSettingsResponse> | AccountSettingsResponse;
+
+  /** Password — separate from generic createCode/verifyCode reset flow. */
+
+  changePassword(request: ChangePasswordRequest): Promise<Ok> | Observable<Ok> | Ok;
 }
 
 export function UsersServiceControllerMethods() {
@@ -544,6 +896,23 @@ export function UsersServiceControllerMethods() {
       "listAvatarBorders",
       "upsertAvatarBorder",
       "deleteAvatarBorder",
+      "updatePrivacy",
+      "updateEmailPrefs",
+      "updateLocale",
+      "softDeleteAccount",
+      "restoreAccount",
+      "hardDeletePending",
+      "blockUser",
+      "unblockUser",
+      "listBlockedUsers",
+      "isBlocked",
+      "requestDataExport",
+      "listDataExports",
+      "pickPendingDataExport",
+      "completeDataExport",
+      "collectUserExportData",
+      "getAccountSettings",
+      "changePassword",
     ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aepstore-dev/contracts",
-  "version": "1.33.0",
+  "version": "1.35.0",
   "description": "Protobuf definitions for aepstore microservices",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/proto/auth.proto

@@ -18,6 +18,20 @@ service AuthService {
     rpc Get2faStatus(Get2faStatusRequest) returns (TwoFactorStatusResponse);
     rpc GetProfile(GetProfileRequest) returns (AuthUser);
     rpc CleanupExpiredTotpSetups(Empty) returns (Empty);
+
+    // Logout — kill refresh tokens. LogoutCurrent kills only the one whose
+    // HMAC matches; LogoutAll wipes every row for the user.
+    rpc LogoutCurrent(LogoutCurrentRequest) returns (LogoutResponse);
+    rpc LogoutAll(LogoutAllRequest) returns (LogoutResponse);
+
+    // Self-service restore. Verifies credentials + password against a
+    // soft-deleted user, clears deletedAt/scheduledForHardDelete, and issues
+    // fresh tokens — the one auth path that DOES read deletedAt accounts.
+    rpc RestoreLogin(RestoreLoginRequest) returns (AuthResult);
+
+    // Login history. Read-only audit feed for the settings page; rows come
+    // from LoginEvent. Internal alternative: tasks-service GC.
+    rpc ListLoginHistory(ListLoginHistoryRequest) returns (ListLoginHistoryResponse);
 }
 
 enum TwoFactorType {
@@ -124,3 +138,46 @@ message TwoFactorStatusResponse {
 }
 
 message Empty {}
+
+message LogoutCurrentRequest {
+    string refresh_token = 1;
+}
+
+message LogoutAllRequest {
+    string user_id = 1;
+}
+
+message LogoutResponse {
+    bool ok = 1;
+    int32 removed = 2; // number of refresh-token rows deleted
+}
+
+message RestoreLoginRequest {
+    string credentials = 1; // email or username
+    string password = 2;
+    string user_agent = 3;
+    string ip = 4;
+}
+
+message ListLoginHistoryRequest {
+    string user_id = 1;
+    int32 page = 2;
+    int32 limit = 3;
+}
+
+message LoginEventRow {
+    string id = 1;
+    string type = 2;       // LOGIN | LOGOUT | REFRESH | TWO_FA_FAIL | PASSWORD_FAIL | BLOCKED | RESTORE
+    bool success = 3;
+    string reason = 4;
+    string ip = 5;
+    string user_agent = 6;
+    string created_at = 7;
+}
+
+message ListLoginHistoryResponse {
+    repeated LoginEventRow items = 1;
+    int32 total = 2;
+    int32 page = 3;
+    int32 limit = 4;
+}

package/proto/mail.proto

@@ -10,6 +10,10 @@ service MailService {
     rpc Send2fa(Send2faRequest) returns (MailAck);
     rpc SendPasswordReset(SendPasswordResetRequest) returns (MailAck);
     rpc SendRegistrationConfirm(SendRegistrationConfirmRequest) returns (MailAck);
+
+    // GDPR data-export delivery — tasks-service fires after the JSON dump
+    // lands in S3; mail-service sends the signed URL with a sensible TTL note.
+    rpc SendDataExportReady(SendDataExportReadyRequest) returns (MailAck);
 }
 
 message MailAck {
@@ -40,3 +44,11 @@ message SendRegistrationConfirmRequest {
     string code = 2;
     string username = 3;
 }
+
+message SendDataExportReadyRequest {
+    string email = 1;
+    string username = 2;
+    string file_url = 3;     // signed S3 URL
+    int32 url_ttl_hours = 4; // for the message body
+    int32 file_size = 5;
+}

package/proto/payments.proto

@@ -36,6 +36,16 @@ service PaymentsService {
     // payments-service iterates ACTIVE subscriptions with autoRenew+savedCard.
     rpc RunPremiumRenewals(RunPremiumRenewalsRequest) returns (RunPremiumRenewalsResponse);
 
+    // ----- saved cards -----
+    rpc ListSavedCards(ListSavedCardsRequest) returns (ListSavedCardsResponse);
+    rpc DeleteSavedCard(DeleteSavedCardRequest) returns (Ok);
+    rpc SetDefaultSavedCard(SetDefaultSavedCardRequest) returns (SavedCard);
+    rpc UpdateSavedCard(UpdateSavedCardRequest) returns (SavedCard);
+
+    // ----- payout details -----
+    rpc UpdatePayoutDetails(UpdatePayoutDetailsRequest) returns (UpdatePayoutDetailsResponse);
+    rpc GetPayoutDetails(GetPayoutDetailsRequest) returns (UpdatePayoutDetailsResponse);
+
     // ----- admin -----
     rpc GetAdminOverview(AdminOverviewRequest) returns (AdminOverviewResponse);
     rpc AdminListTransactions(AdminListTransactionsRequest) returns (AdminTransactionsListResponse);
@@ -301,3 +311,46 @@ message PremiumPaymentsListResponse {
     int32 page = 3;
     int32 limit = 4;
 }
+
+// ---------------------------------------------------------------------------
+// Saved cards (YooKassa payment_method tokens; we never see PAN)
+// ---------------------------------------------------------------------------
+message SavedCard {
+    string id = 1;
+    string brand = 2;       // "MIR" | "VISA" | "MASTERCARD" | ""
+    string last4 = 3;       // "0000" etc, display-only
+    int32 exp_month = 4;
+    int32 exp_year = 5;
+    bool is_default = 6;
+    string nickname = 7;    // user-set label
+    string created_at = 8;
+}
+
+message ListSavedCardsRequest { string user_id = 1; }
+message ListSavedCardsResponse { repeated SavedCard items = 1; }
+
+message DeleteSavedCardRequest { string user_id = 1; string id = 2; }
+
+message SetDefaultSavedCardRequest { string user_id = 1; string id = 2; }
+
+message UpdateSavedCardRequest {
+    string user_id = 1;
+    string id = 2;
+    string nickname = 3; // empty = clear
+}
+
+// ---------------------------------------------------------------------------
+// Payout details (persistent default; per-withdrawal override still allowed)
+// ---------------------------------------------------------------------------
+message UpdatePayoutDetailsRequest {
+    string user_id = 1;
+    string method = 2;  // "card" | "sbp" | "bank" | "" (clear)
+    string details = 3; // JSON string — payments-service treats opaquely
+}
+
+message UpdatePayoutDetailsResponse {
+    string method = 1;
+    string details = 2;
+}
+
+message GetPayoutDetailsRequest { string user_id = 1; }

package/proto/users.proto

@@ -33,8 +33,40 @@ service UsersService {
     rpc ListAvatarBorders(ListAvatarBordersRequest) returns (ListAvatarBordersResponse);
     rpc UpsertAvatarBorder(UpsertAvatarBorderRequest) returns (AvatarBorder);
     rpc DeleteAvatarBorder(DeleteAvatarBorderRequest) returns (DeleteAvatarBorderResponse);
+
+    // Account settings — bundled write surface for the UI.
+    rpc UpdatePrivacy(UpdatePrivacyRequest) returns (PublicProfileResponse);
+    rpc UpdateEmailPrefs(UpdateEmailPrefsRequest) returns (UpdateEmailPrefsResponse);
+    rpc UpdateLocale(UpdateLocaleRequest) returns (UpdateLocaleResponse);
+
+    // Soft-delete + restore. Internal AuthService also queries the soft-delete
+    // state on login (rejects if deletedAt set).
+    rpc SoftDeleteAccount(SoftDeleteAccountRequest) returns (SoftDeleteAccountResponse);
+    rpc RestoreAccount(RestoreAccountRequest) returns (UserResponse);
+    rpc HardDeletePending(HardDeletePendingRequest) returns (HardDeletePendingResponse); // tasks-service cron
+
+    // Blocks
+    rpc BlockUser(BlockUserRequest) returns (BlockUserResponse);
+    rpc UnblockUser(BlockUserRequest) returns (BlockUserResponse);
+    rpc ListBlockedUsers(ListBlockedUsersRequest) returns (ListBlockedUsersResponse);
+    rpc IsBlocked(IsBlockedRequest) returns (IsBlockedResponse); // internal lookup
+
+    // Data export
+    rpc RequestDataExport(RequestDataExportRequest) returns (DataExportRequestRow);
+    rpc ListDataExports(ListDataExportsRequest) returns (ListDataExportsResponse);
+    rpc PickPendingDataExport(PickPendingDataExportRequest) returns (DataExportRequestRow); // tasks-service
+    rpc CompleteDataExport(CompleteDataExportRequest) returns (DataExportRequestRow); // tasks-service
+    rpc CollectUserExportData(CollectUserExportDataRequest) returns (CollectUserExportDataResponse); // tasks-service
+
+    // Unified read for the settings page
+    rpc GetAccountSettings(GetAccountSettingsRequest) returns (AccountSettingsResponse);
+
+    // Password — separate from generic createCode/verifyCode reset flow.
+    rpc ChangePassword(ChangePasswordRequest) returns (Ok);
 }
 
+message Ok { bool ok = 1; }
+
 // =================================================================
 // Common types
 // =================================================================
@@ -409,3 +441,220 @@ message DeleteAvatarBorderRequest {
 message DeleteAvatarBorderResponse {
     bool ok = 1;
 }
+
+// =================================================================
+// Account settings
+// =================================================================
+
+message UpdatePrivacyRequest {
+    string user_id = 1;
+    bool hide_email = 2;
+    bool hide_balance = 3;
+    bool hide_online = 4;
+}
+
+message UpdateEmailPrefsRequest {
+    string user_id = 1;
+    bool email_on_sales = 2;
+    bool email_on_reviews = 3;
+    bool email_on_news = 4;
+}
+
+message UpdateEmailPrefsResponse {
+    bool email_on_sales = 1;
+    bool email_on_reviews = 2;
+    bool email_on_news = 3;
+}
+
+message UpdateLocaleRequest {
+    string user_id = 1;
+    string locale = 2; // "ru" | "en" | ...
+}
+
+message UpdateLocaleResponse {
+    string locale = 1;
+}
+
+message SoftDeleteAccountRequest {
+    string user_id = 1;
+    string reason = 2;     // optional, for support/audit
+    int32 cooldown_days = 3; // 0 → use server default (30)
+}
+
+message SoftDeleteAccountResponse {
+    string deleted_at = 1;             // ISO 8601
+    string scheduled_for_hard_delete = 2;
+}
+
+message RestoreAccountRequest {
+    string user_id = 1;
+}
+
+message HardDeletePendingRequest {
+    int32 max_batch = 1; // 0 → default 100
+}
+
+message HardDeletePendingResponse {
+    int32 deleted = 1;
+}
+
+message ChangePasswordRequest {
+    string user_id = 1;
+    string current_password = 2;
+    string new_password = 3;
+    // Optional: revoke all other sessions on success.
+    bool revoke_other_sessions = 4;
+}
+
+// =================================================================
+// Blocks
+// =================================================================
+
+message BlockUserRequest {
+    string blocker_id = 1;
+    string blocked_id = 2;
+    string reason = 3; // optional
+}
+
+message BlockUserResponse {
+    bool blocked = 1;
+}
+
+message BlockedUserRow {
+    string id = 1;
+    string username = 2;
+    string avatar_url = 3;
+    string blocked_at = 4;
+    string reason = 5;
+}
+
+message ListBlockedUsersRequest {
+    string blocker_id = 1;
+    int32 page = 2;
+    int32 limit = 3;
+}
+
+message ListBlockedUsersResponse {
+    repeated BlockedUserRow items = 1;
+    int32 total = 2;
+    int32 page = 3;
+    int32 limit = 4;
+}
+
+message IsBlockedRequest {
+    string blocker_id = 1;
+    string blocked_id = 2;
+}
+
+message IsBlockedResponse {
+    bool is_blocked = 1;
+}
+
+// =================================================================
+// Data export
+// =================================================================
+
+message DataExportRequestRow {
+    string id = 1;
+    string user_id = 2;
+    string status = 3; // PENDING | PROCESSING | READY | FAILED
+    string file_url = 4;
+    int32 file_size = 5;
+    string error = 6;
+    string created_at = 7;
+    string completed_at = 8;
+}
+
+message RequestDataExportRequest {
+    string user_id = 1;
+}
+
+message ListDataExportsRequest {
+    string user_id = 1;
+    int32 page = 2;
+    int32 limit = 3;
+}
+
+message ListDataExportsResponse {
+    repeated DataExportRequestRow items = 1;
+    int32 total = 2;
+    int32 page = 3;
+    int32 limit = 4;
+}
+
+message PickPendingDataExportRequest {
+    // tasks-service polls; returns one PENDING row marked PROCESSING, or empty.
+    bool _placeholder = 1;
+}
+
+message CompleteDataExportRequest {
+    string id = 1;
+    string file_url = 2;
+    int32 file_size = 3;
+    string error = 4; // if set, marks FAILED instead of READY
+}
+
+message CollectUserExportDataRequest {
+    string user_id = 1;
+}
+
+message CollectUserExportDataResponse {
+    // Opaque JSON-as-string of user-owned data. tasks-service writes it to
+    // S3 verbatim. Keeps the schema-specific marshaling private to users-service.
+    string payload_json = 1;
+}
+
+// =================================================================
+// Settings — unified read
+// =================================================================
+
+message GetAccountSettingsRequest {
+    string user_id = 1;
+}
+
+message AccountSettingsResponse {
+    // Identity
+    string id = 1;
+    string username = 2;
+    string email = 3;
+    string full_name = 4;
+    string about_me = 5;
+    string avatar_url = 6;
+    string banner_url = 7;
+    string locale = 8;
+    string timezone = 9;
+    string country_id = 10;
+    string created_at = 11;
+
+    // 2FA
+    string two_factor_type = 12; // NONE | APP | EMAIL
+    bool two_factor_enabled = 13;
+    int32 backup_codes_remaining = 14;
+
+    // Privacy
+    bool hide_email = 15;
+    bool hide_balance = 16;
+    bool hide_online = 17;
+    bool hide_subscriptions = 18;
+
+    // Email prefs
+    bool email_on_sales = 19;
+    bool email_on_reviews = 20;
+    bool email_on_news = 21;
+
+    // Payout defaults
+    string payout_method = 22;
+    string payout_details = 23;
+
+    // Premium snapshot
+    bool premium_is_active = 24;
+    string premium_status = 25;
+    string premium_expires_at = 26;
+    bool premium_auto_renew = 27;
+
+    // Soft-delete state
+    string deleted_at = 28;
+    string scheduled_for_hard_delete = 29;
+
+    repeated SocialMedia social_media = 30;
+}