Merge pull request #1274 from Fr1ngg/owmhgs-bedolaga/update-redirect-link-in-miniapp/index.html

Use configured Happ redirect template in miniapp

app/webapi/routes/miniapp.py

@@ -2559,6 +2559,7 @@ async def get_subscription_details(
         happ_link=links_payload.get("happ_link") if subscription else None,
         happ_crypto_link=links_payload.get("happ_crypto_link") if subscription else None,
         happ_cryptolink_redirect_link=happ_redirect_link,
+        happ_cryptolink_redirect_template=settings.get_happ_cryptolink_redirect_template(),
         balance_kopeks=user.balance_kopeks,
         balance_rubles=round(user.balance_rubles, 2),
         balance_currency=balance_currency,

app/webapi/schemas/miniapp.py

@@ -439,6 +439,7 @@ class MiniAppSubscriptionResponse(BaseModel):
     happ_link: Optional[str] = None
     happ_crypto_link: Optional[str] = None
     happ_cryptolink_redirect_link: Optional[str] = None
+    happ_cryptolink_redirect_template: Optional[str] = None
     balance_kopeks: int = 0
     balance_rubles: float = 0.0
     balance_currency: Optional[str] = None

miniapp/index.html

@@ -17954,7 +17954,11 @@
             }
 
             if (isPCDevice && !redirectTemplate) {
-                redirectTemplate = 'https://miniapp.fring.tech/redirect/?redirect_to=';
+                redirectTemplate = normalizeUrl(
+                    userData?.happ_cryptolink_redirect_template
+                    || userData?.happCryptolinkRedirectTemplate
+                    || null,
+                );
             }
 
             const templatedRedirectLink = (isPCDevice && redirectTemplate && redirectTarget)