VPN/remnawave-bedolaga-telegram-bot
1
0
Fork 0
mirror of https://github.com/BEDOLAGA-DEV/remnawave-bedolaga-telegram-bot.git synced 2026-02-21 03:40:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1899 from Fr1ngg/dev4

Browse Source 
Allow trial users to renew from miniapp
This commit is contained in:
Egor
2025-11-14 01:17:04 +03:00
committed by GitHub
parent 77c9c19806 0187adb6f9
commit a2009cae39
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/webapi/routes/miniapp.py
View File

@@ -4862,7 +4862,10 @@ async def get_subscription_settings_endpoint(
db: AsyncSession = Depends(get_db_session),
) -> MiniAppSubscriptionSettingsResponse:
user = await _authorize_miniapp_user(payload.init_data, db)
subscription = _ensure_paid_subscription(user)
subscription = _ensure_paid_subscription(
user,
allowed_statuses={"active", "trial"},
)
_validate_subscription_id(payload.subscription_id, subscription)
settings_payload = await _build_subscription_settings(db, user, subscription)
@@ -4879,7 +4882,10 @@ async def update_subscription_servers_endpoint(
db: AsyncSession = Depends(get_db_session),
) -> MiniAppSubscriptionUpdateResponse:
user = await _authorize_miniapp_user(payload.init_data, db)
subscription = _ensure_paid_subscription(user)
subscription = _ensure_paid_subscription(
user,
allowed_statuses={"active", "trial"},
)
_validate_subscription_id(payload.subscription_id, subscription)
old_servers = list(getattr(subscription, "connected_squads", []) or [])
@@ -5085,7 +5091,10 @@ async def update_subscription_traffic_endpoint(
db: AsyncSession = Depends(get_db_session),
) -> MiniAppSubscriptionUpdateResponse:
user = await _authorize_miniapp_user(payload.init_data, db)
subscription = _ensure_paid_subscription(user)
subscription = _ensure_paid_subscription(
user,
allowed_statuses={"active", "trial"},
)
_validate_subscription_id(payload.subscription_id, subscription)
old_traffic = subscription.traffic_limit_gb
@@ -5249,7 +5258,10 @@ async def update_subscription_devices_endpoint(
db: AsyncSession = Depends(get_db_session),
) -> MiniAppSubscriptionUpdateResponse:
user = await _authorize_miniapp_user(payload.init_data, db)
subscription = _ensure_paid_subscription(user)
subscription = _ensure_paid_subscription(
user,
allowed_statuses={"active", "trial"},
)
_validate_subscription_id(payload.subscription_id, subscription)
raw_value = payload.devices if payload.devices is not None else payload.device_limit

10
miniapp/index.html
View File

@@ -13955,7 +13955,7 @@
function ensureSubscriptionRenewalData(options = {}) {
const { force = false } = options;
if (!hasPaidSubscription()) {
if (!hasActiveSubscription()) {
resetSubscriptionRenewalState(null);
renderSubscriptionRenewalCard();
return Promise.resolve(null);
@@ -14484,7 +14484,7 @@
return;
}
const shouldShow = hasPaidSubscription();
const shouldShow = hasActiveSubscription();
card.classList.toggle('hidden', !shouldShow);
if (!shouldShow) {
return;
@@ -14601,7 +14601,7 @@
return;
}
if (!hasPaidSubscription()) {
if (!hasActiveSubscription()) {
handleSubscriptionRenewalError(createError('Subscription renewal', t('subscription_renewal.error.validation')));
return;
}
@@ -14784,7 +14784,7 @@
function ensureSubscriptionSettingsLoaded(options = {}) {
const { force = false } = options;
if (!hasPaidSubscription()) {
if (!hasActiveSubscription()) {
subscriptionSettingsData = null;
subscriptionSettingsPromise = null;
subscriptionSettingsError = null;
@@ -14912,7 +14912,7 @@
return;
}
const shouldShow = hasPaidSubscription();
const shouldShow = hasActiveSubscription();
card.classList.toggle('hidden', !shouldShow);
if (!shouldShow) {
return;