From 029f88eb940e9bb1d7ff00f74dcb55210cc0ed78 Mon Sep 17 00:00:00 2001
From: Alex Gibson <alexgibson@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:43:13 +0100
Subject: [PATCH] Add URL redirector for VPN mobile app store links (Fixes
 #15286) (#15287)

---
 bedrock/firefox/redirects.py      |  7 ++++---
 bedrock/products/redirects.py     | 28 +++++++++++++++++++++++++++-
 bedrock/settings/appstores.py     |  6 ++++++
 bedrock/settings/base.py          |  2 ++
 tests/redirects/map_globalconf.py | 25 +++++++++++++++++++++++++
 5 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/bedrock/firefox/redirects.py b/bedrock/firefox/redirects.py
index ccdd1fc4336..fb766b2d2a4 100644
--- a/bedrock/firefox/redirects.py
+++ b/bedrock/firefox/redirects.py
@@ -18,7 +18,6 @@ def firefox_channel(*args, **kwargs):
 
 
 def mobile_app(request, *args, **kwargs):
-    qs = request.META.get("QUERY_STRING", "")
     campaign = None
     product = "firefox"
 
@@ -47,12 +46,14 @@ def mobile_app(request, *args, **kwargs):
     ]
 
     for p in product_options:
-        if f"product={p}" in qs:
+        if p == request.GET.get("product"):
             product = p
+            break
 
     for c in campaign_options:
-        if f"campaign={c}" in qs:
+        if c == request.GET.get("campaign"):
             campaign = c
+            break
 
     return mobile_app_redirector(request, product, campaign)
 
diff --git a/bedrock/products/redirects.py b/bedrock/products/redirects.py
index cf0b1b13286..38cac5fbf06 100644
--- a/bedrock/products/redirects.py
+++ b/bedrock/products/redirects.py
@@ -2,7 +2,32 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-from bedrock.redirects.util import redirect
+from bedrock.redirects.util import mobile_app_redirector, redirect
+
+
+def mobile_app(request, *args, **kwargs):
+    campaign = None
+    product = "vpn"
+
+    product_options = ["vpn"]
+
+    campaign_options = [
+        "vpn-landing-page",
+        "vpn-pricing-page",
+    ]
+
+    for p in product_options:
+        if p == request.GET.get("product"):
+            product = p
+            break
+
+    for c in campaign_options:
+        if c == request.GET.get("campaign"):
+            campaign = c
+            break
+
+    return mobile_app_redirector(request, product, campaign)
+
 
 redirectpatterns = (
     # Issue 10335
@@ -15,4 +40,5 @@
     redirect(r"^vpn/download/windows/?$", "products.vpn.windows-download"),
     redirect(r"^vpn/download/mac/?$", "products.vpn.mac-download"),
     redirect(r"^products/mozsocial/invite/?$", "products.landing"),
+    redirect(r"^products/vpn/mobile/app/?$", mobile_app, cache_timeout=0, query=False),
 )
diff --git a/bedrock/settings/appstores.py b/bedrock/settings/appstores.py
index 05a8ab29643..4a7e9ba624b 100644
--- a/bedrock/settings/appstores.py
+++ b/bedrock/settings/appstores.py
@@ -117,3 +117,9 @@
 
 # Link to Firefox Beta on the Microsoft Windows Store with custom protocol handler.
 MICROSOFT_WINDOWS_STORE_FIREFOX_BETA_DIRECT_LINK = "ms-windows-store://pdp/?productid=9nzw26frndln"
+
+# Link to Mozilla VPN on the Google Play Store.
+GOOGLE_PLAY_VPN_LINK = "https://play.google.com/store/apps/details?id=org.mozilla.firefox.vpn"
+
+# Link to Mozilla VPN on the Apple App Store.
+APPLE_APPSTORE_VPN_LINK = "https://apps.apple.com/{country}/app/apple-store/id1489407738"
diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py
index 737727c0392..6213f4d400f 100644
--- a/bedrock/settings/base.py
+++ b/bedrock/settings/base.py
@@ -999,6 +999,7 @@ def _is_bedrock_custom_app(app_name):
     APPLE_APPSTORE_FOCUS_LINK,
     APPLE_APPSTORE_KLAR_LINK,
     APPLE_APPSTORE_POCKET_LINK,
+    APPLE_APPSTORE_VPN_LINK,
     GOOGLE_PLAY_FIREFOX_BETA_LINK,
     GOOGLE_PLAY_FIREFOX_LINK,
     GOOGLE_PLAY_FIREFOX_LINK_UTMS,
@@ -1007,6 +1008,7 @@ def _is_bedrock_custom_app(app_name):
     GOOGLE_PLAY_FOCUS_LINK,
     GOOGLE_PLAY_KLAR_LINK,
     GOOGLE_PLAY_POCKET_LINK,
+    GOOGLE_PLAY_VPN_LINK,
     MICROSOFT_WINDOWS_STORE_FIREFOX_BETA_DIRECT_LINK,
     MICROSOFT_WINDOWS_STORE_FIREFOX_BETA_WEB_LINK,
     MICROSOFT_WINDOWS_STORE_FIREFOX_DIRECT_LINK,
diff --git a/tests/redirects/map_globalconf.py b/tests/redirects/map_globalconf.py
index 22b4354a116..295d971e149 100644
--- a/tests/redirects/map_globalconf.py
+++ b/tests/redirects/map_globalconf.py
@@ -1302,5 +1302,30 @@
         # issue 15075
         url_test("/newsletter/knowledge-is-power{,/,/confirm,/confirm/token}", "/newsletter/firefox/"),
         url_test("/products/mozsocial/invite/", "/products/"),
+        # Issue 15262
+        url_test(
+            "/products/vpn/mobile/app/?product=vpn",
+            "https://play.google.com/store/apps/details?id=org.mozilla.firefox.vpn",
+            req_headers=UA_ANDROID,
+            resp_headers={"Cache-Control": "max-age=0"},
+        ),
+        url_test(
+            "/products/vpn/mobile/app/?product=vpn",
+            "https://apps.apple.com/app/apple-store/id1489407738",
+            req_headers=UA_IOS,
+            resp_headers={"Cache-Control": "max-age=0"},
+        ),
+        url_test(
+            "/products/vpn/mobile/app/?product=vpn&campaign=vpn-landing-page",
+            "https://play.google.com/store/apps/details?id=org.mozilla.firefox.vpn&referrer=utm_source%3Dwww.mozilla.org%26utm_medium%3Dreferral%26utm_campaign%3Dvpn-landing-page",
+            req_headers=UA_ANDROID,
+            resp_headers={"Cache-Control": "max-age=0"},
+        ),
+        url_test(
+            "/products/vpn/mobile/app/?product=vpn&campaign=vpn-landing-page",
+            "https://apps.apple.com/app/apple-store/id1489407738?pt=373246&ct=vpn-landing-page&mt=8",
+            req_headers=UA_IOS,
+            resp_headers={"Cache-Control": "max-age=0"},
+        ),
     )
 )