@aepstore-dev/contracts 1.57.0 → 1.59.0

package/gen/payments.d.ts

@@ -406,15 +406,19 @@ export interface PurchasePremiumRequest {
     userId: string;
     /** MONTH_1 | MONTH_3 | MONTH_6 | MONTH_12 */
     period: string;
-    /** BALANCE | YOOKASSA */
+    /** BALANCE | YOOKASSA | SAVED_CARD (empty = smart default) */
     paymentMethod: string;
     /** YooKassa only */
     returnUrl: string;
     /**
      * Save the YooKassa payment_method for future auto-renewals. Ignored for
-     * BALANCE. Default true — the UI surfaces a checkbox.
+     * BALANCE. Kept for backwards compatibility; auto_renew=true implies save.
      */
     savePaymentMethod: boolean;
+    /** default false; requires off-session-capable method */
+    autoRenew: boolean;
+    /** optional for SAVED_CARD; empty = default card */
+    savedCardId: string;
 }
 export interface PurchasePremiumResponse {
     /** PremiumPayment.id */
@@ -433,6 +437,20 @@ export interface RunPremiumRenewalsResponse {
     succeeded: number;
     failed: number;
 }
+export interface SetPremiumPaymentMethodRequest {
+    userId: string;
+    /** BALANCE | YOOKASSA | SAVED_CARD */
+    method: string;
+    /** optional for SAVED_CARD; empty = default card */
+    savedCardId: string;
+}
+export interface PremiumPaymentMethodResponse {
+    /** BALANCE | YOOKASSA | SAVED_CARD */
+    method: string;
+    /** empty unless SAVED_CARD */
+    savedCardId: string;
+    autoRenew: boolean;
+}
 export interface PremiumPaymentRow {
     id: string;
     userId: string;
@@ -561,6 +579,7 @@ export interface PaymentsServiceClient {
     /** ----- premium ----- */
     getPremiumPlans(request: GetPremiumPlansRequest): Observable<PremiumPlansResponse>;
     purchasePremium(request: PurchasePremiumRequest): Observable<PurchasePremiumResponse>;
+    setPremiumPaymentMethod(request: SetPremiumPaymentMethodRequest): Observable<PremiumPaymentMethodResponse>;
     /**
      * 7-day refund window from completedAt. Reverses ledger, calls YooKassa for
      * card purchases, rolls back the subscription's expiresAt by the period.
@@ -623,6 +642,7 @@ export interface PaymentsServiceController {
     /** ----- premium ----- */
     getPremiumPlans(request: GetPremiumPlansRequest): Promise<PremiumPlansResponse> | Observable<PremiumPlansResponse> | PremiumPlansResponse;
     purchasePremium(request: PurchasePremiumRequest): Promise<PurchasePremiumResponse> | Observable<PurchasePremiumResponse> | PurchasePremiumResponse;
+    setPremiumPaymentMethod(request: SetPremiumPaymentMethodRequest): Promise<PremiumPaymentMethodResponse> | Observable<PremiumPaymentMethodResponse> | PremiumPaymentMethodResponse;
     /**
      * 7-day refund window from completedAt. Reverses ledger, calls YooKassa for
      * card purchases, rolls back the subscription's expiresAt by the period.

package/gen/payments.js

@@ -28,6 +28,7 @@ function PaymentsServiceControllerMethods() {
             "handlePaymentEvent",
             "getPremiumPlans",
             "purchasePremium",
+            "setPremiumPaymentMethod",
             "refundPremium",
             "getMyPremiumPayments",
             "runPremiumRenewals",

package/gen/payments.ts

@@ -458,15 +458,19 @@ export interface PurchasePremiumRequest {
   userId: string;
   /** MONTH_1 | MONTH_3 | MONTH_6 | MONTH_12 */
   period: string;
-  /** BALANCE | YOOKASSA */
+  /** BALANCE | YOOKASSA | SAVED_CARD (empty = smart default) */
   paymentMethod: string;
   /** YooKassa only */
   returnUrl: string;
   /**
    * Save the YooKassa payment_method for future auto-renewals. Ignored for
-   * BALANCE. Default true — the UI surfaces a checkbox.
+   * BALANCE. Kept for backwards compatibility; auto_renew=true implies save.
    */
   savePaymentMethod: boolean;
+  /** default false; requires off-session-capable method */
+  autoRenew: boolean;
+  /** optional for SAVED_CARD; empty = default card */
+  savedCardId: string;
 }
 
 export interface PurchasePremiumResponse {
@@ -489,6 +493,22 @@ export interface RunPremiumRenewalsResponse {
   failed: number;
 }
 
+export interface SetPremiumPaymentMethodRequest {
+  userId: string;
+  /** BALANCE | YOOKASSA | SAVED_CARD */
+  method: string;
+  /** optional for SAVED_CARD; empty = default card */
+  savedCardId: string;
+}
+
+export interface PremiumPaymentMethodResponse {
+  /** BALANCE | YOOKASSA | SAVED_CARD */
+  method: string;
+  /** empty unless SAVED_CARD */
+  savedCardId: string;
+  autoRenew: boolean;
+}
+
 export interface PremiumPaymentRow {
   id: string;
   userId: string;
@@ -654,6 +674,8 @@ export interface PaymentsServiceClient {
 
   purchasePremium(request: PurchasePremiumRequest): Observable<PurchasePremiumResponse>;
 
+  setPremiumPaymentMethod(request: SetPremiumPaymentMethodRequest): Observable<PremiumPaymentMethodResponse>;
+
   /**
    * 7-day refund window from completedAt. Reverses ledger, calls YooKassa for
    * card purchases, rolls back the subscription's expiresAt by the period.
@@ -773,6 +795,10 @@ export interface PaymentsServiceController {
     request: PurchasePremiumRequest,
   ): Promise<PurchasePremiumResponse> | Observable<PurchasePremiumResponse> | PurchasePremiumResponse;
 
+  setPremiumPaymentMethod(
+    request: SetPremiumPaymentMethodRequest,
+  ): Promise<PremiumPaymentMethodResponse> | Observable<PremiumPaymentMethodResponse> | PremiumPaymentMethodResponse;
+
   /**
    * 7-day refund window from completedAt. Reverses ledger, calls YooKassa for
    * card purchases, rolls back the subscription's expiresAt by the period.
@@ -872,6 +898,7 @@ export function PaymentsServiceControllerMethods() {
       "handlePaymentEvent",
       "getPremiumPlans",
       "purchasePremium",
+      "setPremiumPaymentMethod",
       "refundPremium",
       "getMyPremiumPayments",
       "runPremiumRenewals",

package/gen/users.d.ts

@@ -305,7 +305,26 @@ export interface PremiumStateResponse {
     /** ISO 8601 */
     expiresAt: string;
     autoRenew: boolean;
-    hasSavedPaymentMethod: boolean;
+    /** null when not active */
+    plan: PremiumPlanInfo | undefined;
+    /** null when no premium payment method preference */
+    savedPaymentMethod: PremiumSavedPaymentMethod | undefined;
+}
+export interface PremiumSavedPaymentMethod {
+    /** BALANCE | YOOKASSA | SAVED_CARD */
+    method: string;
+    /** null unless method=SAVED_CARD */
+    card: PremiumSavedPaymentCard | undefined;
+}
+export interface PremiumSavedPaymentCard {
+    id: string;
+    brand: string;
+    last4: string;
+    expMonth: number;
+    expYear: number;
+    isDefault: boolean;
+    nickname: string;
+    createdAt: string;
 }
 export interface SetPremiumAutoRenewRequest {
     userId: string;
@@ -322,6 +341,8 @@ export interface ActivatePremiumRequest {
     paymentMethodId: string;
     /** false = first purchase; true = cron-driven renewal */
     isRenewal: boolean;
+    /** set by the purchase flow; renewals keep true */
+    autoRenew: boolean;
 }
 export interface IsPremiumActiveRequest {
     userId: string;
@@ -520,16 +541,6 @@ export interface PremiumPlanInfo {
     discountPercent: string;
     currency: string;
 }
-export interface PremiumInfo {
-    /** status==ACTIVE AND not past expires_at */
-    isActive: boolean;
-    /** ACTIVE | EXPIRED | CANCELED | '' (never had) */
-    status: string;
-    expiresAt: string;
-    autoRenew: boolean;
-    /** null when not active */
-    plan: PremiumPlanInfo | undefined;
-}
 export interface AccountSettingsResponse {
     /** Identity */
     id: string;
@@ -559,7 +570,7 @@ export interface AccountSettingsResponse {
     /** Payout defaults */
     payoutMethod: string;
     payoutDetails: string;
-    premium: PremiumInfo | undefined;
+    premiumIsActive: boolean;
     /** Soft-delete state */
     deletedAt: string;
     scheduledForHardDelete: string;

package/gen/users.ts

@@ -352,7 +352,30 @@ export interface PremiumStateResponse {
   /** ISO 8601 */
   expiresAt: string;
   autoRenew: boolean;
-  hasSavedPaymentMethod: boolean;
+  /** null when not active */
+  plan:
+    | PremiumPlanInfo
+    | undefined;
+  /** null when no premium payment method preference */
+  savedPaymentMethod: PremiumSavedPaymentMethod | undefined;
+}
+
+export interface PremiumSavedPaymentMethod {
+  /** BALANCE | YOOKASSA | SAVED_CARD */
+  method: string;
+  /** null unless method=SAVED_CARD */
+  card: PremiumSavedPaymentCard | undefined;
+}
+
+export interface PremiumSavedPaymentCard {
+  id: string;
+  brand: string;
+  last4: string;
+  expMonth: number;
+  expYear: number;
+  isDefault: boolean;
+  nickname: string;
+  createdAt: string;
 }
 
 export interface SetPremiumAutoRenewRequest {
@@ -371,6 +394,8 @@ export interface ActivatePremiumRequest {
   paymentMethodId: string;
   /** false = first purchase; true = cron-driven renewal */
   isRenewal: boolean;
+  /** set by the purchase flow; renewals keep true */
+  autoRenew: boolean;
 }
 
 export interface IsPremiumActiveRequest {
@@ -606,17 +631,6 @@ export interface PremiumPlanInfo {
   currency: string;
 }
 
-export interface PremiumInfo {
-  /** status==ACTIVE AND not past expires_at */
-  isActive: boolean;
-  /** ACTIVE | EXPIRED | CANCELED | '' (never had) */
-  status: string;
-  expiresAt: string;
-  autoRenew: boolean;
-  /** null when not active */
-  plan: PremiumPlanInfo | undefined;
-}
-
 export interface AccountSettingsResponse {
   /** Identity */
   id: string;
@@ -646,9 +660,7 @@ export interface AccountSettingsResponse {
   /** Payout defaults */
   payoutMethod: string;
   payoutDetails: string;
-  premium:
-    | PremiumInfo
-    | undefined;
+  premiumIsActive: boolean;
   /** Soft-delete state */
   deletedAt: string;
   scheduledForHardDelete: string;

package/package.json

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

package/proto/payments.proto

@@ -26,12 +26,13 @@ service PaymentsService {
     // ----- provider webhook (gateway forwards a verified event) -----
     rpc HandlePaymentEvent(PaymentEventRequest) returns (Ok);
 
-    // ----- premium -----
-    rpc GetPremiumPlans(GetPremiumPlansRequest) returns (PremiumPlansResponse);
-    rpc PurchasePremium(PurchasePremiumRequest) returns (PurchasePremiumResponse);
-    // 7-day refund window from completedAt. Reverses ledger, calls YooKassa for
-    // card purchases, rolls back the subscription's expiresAt by the period.
-    rpc RefundPremium(RefundPremiumRequest) returns (RefundPremiumResponse);
+    // ----- premium -----
+    rpc GetPremiumPlans(GetPremiumPlansRequest) returns (PremiumPlansResponse);
+    rpc PurchasePremium(PurchasePremiumRequest) returns (PurchasePremiumResponse);
+    rpc SetPremiumPaymentMethod(SetPremiumPaymentMethodRequest) returns (PremiumPaymentMethodResponse);
+    // 7-day refund window from completedAt. Reverses ledger, calls YooKassa for
+    // card purchases, rolls back the subscription's expiresAt by the period.
+    rpc RefundPremium(RefundPremiumRequest) returns (RefundPremiumResponse);
     rpc GetMyPremiumPayments(GetMyPremiumPaymentsRequest) returns (PremiumPaymentsListResponse);
     // Internal — InternalServiceGuard. tasks-service cron triggers due renewals;
     // payments-service iterates ACTIVE subscriptions with autoRenew+savedCard.
@@ -333,15 +334,17 @@ message PremiumPlansResponse {
     string base_monthly_price = 2;
 }
 
-message PurchasePremiumRequest {
-    string user_id = 1;
-    string period = 2;           // MONTH_1 | MONTH_3 | MONTH_6 | MONTH_12
-    string payment_method = 3;   // BALANCE | YOOKASSA
-    string return_url = 4;       // YooKassa only
-    // Save the YooKassa payment_method for future auto-renewals. Ignored for
-    // BALANCE. Default true — the UI surfaces a checkbox.
-    bool save_payment_method = 5;
-}
+message PurchasePremiumRequest {
+    string user_id = 1;
+    string period = 2;           // MONTH_1 | MONTH_3 | MONTH_6 | MONTH_12
+    string payment_method = 3;   // BALANCE | YOOKASSA | SAVED_CARD (empty = smart default)
+    string return_url = 4;       // YooKassa only
+    // Save the YooKassa payment_method for future auto-renewals. Ignored for
+    // BALANCE. Kept for backwards compatibility; auto_renew=true implies save.
+    bool save_payment_method = 5;
+    bool auto_renew = 6;         // default false; requires off-session-capable method
+    string saved_card_id = 7;    // optional for SAVED_CARD; empty = default card
+}
 
 message PurchasePremiumResponse {
     string payment_id = 1;       // PremiumPayment.id
@@ -353,13 +356,25 @@ message RunPremiumRenewalsRequest {
     int32 max_batch = 1;         // safety cap; default 100
 }
 
-message RunPremiumRenewalsResponse {
-    int32 attempted = 1;
-    int32 succeeded = 2;
-    int32 failed = 3;
-}
-
-message PremiumPaymentRow {
+message RunPremiumRenewalsResponse {
+    int32 attempted = 1;
+    int32 succeeded = 2;
+    int32 failed = 3;
+}
+
+message SetPremiumPaymentMethodRequest {
+    string user_id = 1;
+    string method = 2;           // BALANCE | YOOKASSA | SAVED_CARD
+    string saved_card_id = 3;    // optional for SAVED_CARD; empty = default card
+}
+
+message PremiumPaymentMethodResponse {
+    string method = 1;           // BALANCE | YOOKASSA | SAVED_CARD
+    string saved_card_id = 2;    // empty unless SAVED_CARD
+    bool auto_renew = 3;
+}
+
+message PremiumPaymentRow {
     string id = 1;
     string user_id = 2;
     string amount = 3;

package/proto/users.proto

@@ -397,15 +397,35 @@ message GetMyPremiumRequest {
     string user_id = 1;
 }
 
-message PremiumStateResponse {
-    bool is_active = 1;
-    string status = 2;              // ACTIVE | EXPIRED | CANCELED | empty (never purchased)
-    PremiumPeriod current_period = 3;
-    string started_at = 4;          // ISO 8601, empty when never purchased
-    string expires_at = 5;          // ISO 8601
-    bool auto_renew = 6;
-    bool has_saved_payment_method = 7;
-}
+message PremiumStateResponse {
+    bool is_active = 1;
+    string status = 2;              // ACTIVE | EXPIRED | CANCELED | empty (never purchased)
+    PremiumPeriod current_period = 3;
+    string started_at = 4;          // ISO 8601, empty when never purchased
+    string expires_at = 5;          // ISO 8601
+    bool auto_renew = 6;
+    PremiumPlanInfo plan = 8;       // null when not active
+    PremiumSavedPaymentMethod saved_payment_method = 9; // null when no premium payment method preference
+
+    reserved 7;
+    reserved "has_saved_payment_method";
+}
+
+message PremiumSavedPaymentMethod {
+    string method = 1;              // BALANCE | YOOKASSA | SAVED_CARD
+    PremiumSavedPaymentCard card = 2; // null unless method=SAVED_CARD
+}
+
+message PremiumSavedPaymentCard {
+    string id = 1;
+    string brand = 2;
+    string last4 = 3;
+    int32 exp_month = 4;
+    int32 exp_year = 5;
+    bool is_default = 6;
+    string nickname = 7;
+    string created_at = 8;
+}
 
 message SetPremiumAutoRenewRequest {
     string user_id = 1;
@@ -414,12 +434,13 @@ message SetPremiumAutoRenewRequest {
 
 // Internal — payments-service hands us the period that was just paid for, plus
 // the YooKassa payment_method id (empty for balance/non-recurring purchases).
-message ActivatePremiumRequest {
-    string user_id = 1;
-    PremiumPeriod period = 2;
-    string payment_method_id = 3;   // empty for BALANCE / one-shot
-    bool is_renewal = 4;            // false = first purchase; true = cron-driven renewal
-}
+message ActivatePremiumRequest {
+    string user_id = 1;
+    PremiumPeriod period = 2;
+    string payment_method_id = 3;   // empty for BALANCE / one-shot
+    bool is_renewal = 4;            // false = first purchase; true = cron-driven renewal
+    bool auto_renew = 5;            // set by the purchase flow; renewals keep true
+}
 
 message IsPremiumActiveRequest {
     string user_id = 1;
@@ -655,15 +676,7 @@ message PremiumPlanInfo {
     string currency = 6;
 }
 
-message PremiumInfo {
-    bool is_active = 1;        // status==ACTIVE AND not past expires_at
-    string status = 2;         // ACTIVE | EXPIRED | CANCELED | '' (never had)
-    string expires_at = 3;
-    bool auto_renew = 4;
-    PremiumPlanInfo plan = 5;  // null when not active
-}
-
-message AccountSettingsResponse {
+message AccountSettingsResponse {
     // Identity
     string id = 1;
     string username = 2;
@@ -697,10 +710,12 @@ message AccountSettingsResponse {
     string payout_method = 22;
     string payout_details = 23;
 
-    // Premium snapshot — grouped under one object (was flat fields 24-27).
-    reserved 24, 25, 26, 27;
-    reserved "premium_is_active", "premium_status", "premium_expires_at", "premium_auto_renew";
-    PremiumInfo premium = 36;
+    // Premium snapshot — flat flag only. Rich subscription state lives at
+    // /premium/me.
+    reserved 24, 25, 26, 27;
+    reserved "premium_status", "premium_expires_at", "premium_auto_renew";
+    reserved 36;
+    bool premium_is_active = 37;
 
     // Soft-delete state
     string deleted_at = 28;