@aepstore-dev/contracts 1.34.0 → 1.36.0

package/gen/auth.ts

@@ -133,6 +133,38 @@ export interface LogoutResponse {
   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";
 
 /**
@@ -171,6 +203,21 @@ export interface AuthServiceClient {
   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>;
 }
 
 /**
@@ -211,6 +258,23 @@ export interface AuthServiceController {
   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() {
@@ -227,6 +291,8 @@ export function AuthServiceControllerMethods() {
       "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

@@ -109,25 +109,66 @@ export interface WalletResponse {
 
 export interface ListTransactionsRequest {
   userId: string;
-  /** optional filter (TOPUP|PURCHASE|SALE_CLEAR|WITHDRAWAL|REFUND|ADJUSTMENT) */
+  /**
+   * Legacy low-level filter (one of LedgerTxType). Kept for backward
+   * compatibility — admin tooling still uses it directly.
+   */
   type: string;
   page: number;
   limit: number;
+  /**
+   * ↓ added for the wallet statement page (Round 3)
+   * UI-semantic filter mapped onto displayKind:
+   *   ALL | INCOME | OUTCOME | REFUND | WITHDRAWAL | PREMIUM
+   */
+  flow: string;
+  /**
+   * Period selection. `month` is the convenience form (YYYY-MM) used by the
+   * month dropdown; from/to override it for an arbitrary range.
+   */
+  month: string;
+  from: string;
+  to: string;
+  /**
+   * Filter wallet to purchases/refunds of a specific Product category. Has
+   * no effect on TOPUP/WITHDRAWAL/PREMIUM/ADJUSTMENT entries (they have no
+   * product).
+   */
+  productCategoryId: string;
+  /** sort_by ∈ { date | amount | type }. Default: date. */
+  sortBy: string;
+  /** order ∈ { asc | desc }. Default: desc. */
+  order: string;
 }
 
 export interface StatementEntry {
-  /** ledger entry id */
   id: string;
   txId: string;
-  /** tx type */
+  /** raw tx type (TOPUP|PURCHASE|...) */
   type: string;
-  /** which of the user's accounts */
   accountKind: string;
   /** DEBIT | CREDIT */
   direction: string;
   amount: string;
   description: string;
   createdAt: string;
+  /**
+   * ↓ added for the wallet statement page (Round 3)
+   * UI-friendly classification computed server-side:
+   *   TOPUP | PURCHASE | REFUND | PREMIUM | WITHDRAWAL | SALE_CLEAR | ADJUSTMENT
+   * PREMIUM is split out of PURCHASE/REFUND so the UI can show
+   * "Продление Premium" / refund-of-premium in their own filter bucket.
+   */
+  displayKind: string;
+  /** running USER_SPENDING-style balance, Decimal-as-string */
+  balanceAfter: string;
+  /** empty for non-product entries */
+  productId: string;
+  productName: string;
+  /** "Assets" | "Project File" | "Templates" */
+  productCategory: string;
+  /** optional thumbnail URL for richer rows */
+  productPreview: string;
 }
 
 export interface TransactionsListResponse {
@@ -137,6 +178,18 @@ export interface TransactionsListResponse {
   limit: number;
 }
 
+export interface GetTransactionMonthsRequest {
+  userId: string;
+}
+
+export interface GetTransactionMonthsResponse {
+  /**
+   * Newest first. "YYYY-MM" strings; the dropdown renders them
+   * localized client-side.
+   */
+  months: string[];
+}
+
 /**
  * ---------------------------------------------------------------------------
  * Withdrawals
@@ -522,6 +575,8 @@ export interface PaymentsServiceClient {
 
   listTransactions(request: ListTransactionsRequest): Observable<TransactionsListResponse>;
 
+  getTransactionMonths(request: GetTransactionMonthsRequest): Observable<GetTransactionMonthsResponse>;
+
   /** ----- withdrawals ----- */
 
   requestWithdrawal(request: RequestWithdrawalRequest): Observable<Withdrawal>;
@@ -616,6 +671,10 @@ export interface PaymentsServiceController {
     request: ListTransactionsRequest,
   ): Promise<TransactionsListResponse> | Observable<TransactionsListResponse> | TransactionsListResponse;
 
+  getTransactionMonths(
+    request: GetTransactionMonthsRequest,
+  ): Promise<GetTransactionMonthsResponse> | Observable<GetTransactionMonthsResponse> | GetTransactionMonthsResponse;
+
   /** ----- withdrawals ----- */
 
   requestWithdrawal(request: RequestWithdrawalRequest): Promise<Withdrawal> | Observable<Withdrawal> | Withdrawal;
@@ -715,6 +774,7 @@ export function PaymentsServiceControllerMethods() {
       "refundPurchase",
       "getWallet",
       "listTransactions",
+      "getTransactionMonths",
       "requestWithdrawal",
       "listWithdrawals",
       "processWithdrawal",

package/package.json

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

package/proto/auth.proto

@@ -23,6 +23,15 @@ service AuthService {
     // 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 {
@@ -142,3 +151,33 @@ 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

@@ -16,6 +16,7 @@ service PaymentsService {
     // ----- wallet -----
     rpc GetWallet(GetWalletRequest) returns (WalletResponse);
     rpc ListTransactions(ListTransactionsRequest) returns (TransactionsListResponse);
+    rpc GetTransactionMonths(GetTransactionMonthsRequest) returns (GetTransactionMonthsResponse);
 
     // ----- withdrawals -----
     rpc RequestWithdrawal(RequestWithdrawalRequest) returns (Withdrawal);
@@ -116,22 +117,59 @@ message WalletResponse {
 
 message ListTransactionsRequest {
     string user_id = 1;
-    string type = 2;  // optional filter (TOPUP|PURCHASE|SALE_CLEAR|WITHDRAWAL|REFUND|ADJUSTMENT)
+    // Legacy low-level filter (one of LedgerTxType). Kept for backward
+    // compatibility — admin tooling still uses it directly.
+    string type = 2;
     int32 page = 3;
     int32 limit = 4;
+    // ↓ added for the wallet statement page (Round 3)
+    // UI-semantic filter mapped onto displayKind:
+    //   ALL | INCOME | OUTCOME | REFUND | WITHDRAWAL | PREMIUM
+    string flow = 5;
+    // Period selection. `month` is the convenience form (YYYY-MM) used by the
+    // month dropdown; from/to override it for an arbitrary range.
+    string month = 6;
+    string from = 7;
+    string to = 8;
+    // Filter wallet to purchases/refunds of a specific Product category. Has
+    // no effect on TOPUP/WITHDRAWAL/PREMIUM/ADJUSTMENT entries (they have no
+    // product).
+    string product_category_id = 9;
+    // sort_by ∈ { date | amount | type }. Default: date.
+    string sort_by = 10;
+    // order ∈ { asc | desc }. Default: desc.
+    string order = 11;
 }
 message StatementEntry {
-    string id = 1;            // ledger entry id
+    string id = 1;
     string tx_id = 2;
-    string type = 3;          // tx type
-    string account_kind = 4;  // which of the user's accounts
+    string type = 3;          // raw tx type (TOPUP|PURCHASE|...)
+    string account_kind = 4;
     string direction = 5;     // DEBIT | CREDIT
     string amount = 6;
     string description = 7;
     string created_at = 8;
+    // ↓ added for the wallet statement page (Round 3)
+    // UI-friendly classification computed server-side:
+    //   TOPUP | PURCHASE | REFUND | PREMIUM | WITHDRAWAL | SALE_CLEAR | ADJUSTMENT
+    // PREMIUM is split out of PURCHASE/REFUND so the UI can show
+    // "Продление Premium" / refund-of-premium in their own filter bucket.
+    string display_kind = 9;
+    string balance_after = 10;       // running USER_SPENDING-style balance, Decimal-as-string
+    string product_id = 11;          // empty for non-product entries
+    string product_name = 12;
+    string product_category = 13;    // "Assets" | "Project File" | "Templates"
+    string product_preview = 14;     // optional thumbnail URL for richer rows
 }
 message TransactionsListResponse { repeated StatementEntry items = 1; int32 total = 2; int32 page = 3; int32 limit = 4; }
 
+message GetTransactionMonthsRequest { string user_id = 1; }
+message GetTransactionMonthsResponse {
+    // Newest first. "YYYY-MM" strings; the dropdown renders them
+    // localized client-side.
+    repeated string months = 1;
+}
+
 // ---------------------------------------------------------------------------
 // Withdrawals
 // ---------------------------------------------------------------------------