From be93b5a2907d2c9290185830a33144675a9b47bd Mon Sep 17 00:00:00 2001
From: dr-frmr <docterformer@protonmail.com>
Date: Tue, 5 Nov 2024 14:48:01 -0500
Subject: [PATCH] fix: remove app store secure subdomain from links

---
 kinode/packages/app_store/ui/src/components/Header.tsx  | 2 +-
 kinode/packages/app_store/ui/src/pages/AppPage.tsx      | 2 +-
 kinode/packages/app_store/ui/src/pages/DownloadPage.tsx | 2 +-
 kinode/packages/contacts/pkg/ui/script.js               | 7 +------
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/kinode/packages/app_store/ui/src/components/Header.tsx b/kinode/packages/app_store/ui/src/components/Header.tsx
index 14cc9d6d..4bcc28e5 100644
--- a/kinode/packages/app_store/ui/src/components/Header.tsx
+++ b/kinode/packages/app_store/ui/src/components/Header.tsx
@@ -9,7 +9,7 @@ const Header: React.FC = () => {
         <header className="app-header">
             <div className="header-left">
                 <nav>
-                    <button onClick={() => window.location.href = '/'} className="home-button">
+                    <button onClick={() => window.location.href = window.location.origin.replace('//app-store-sys.', '//') + '/'} className="home-button">
                         <FaHome />
                     </button>
                     <Link to={STORE_PATH} className={location.pathname === STORE_PATH ? 'active' : ''}>Apps</Link>
diff --git a/kinode/packages/app_store/ui/src/pages/AppPage.tsx b/kinode/packages/app_store/ui/src/pages/AppPage.tsx
index 44ce3f32..b37fa0cb 100644
--- a/kinode/packages/app_store/ui/src/pages/AppPage.tsx
+++ b/kinode/packages/app_store/ui/src/pages/AppPage.tsx
@@ -62,7 +62,7 @@ export default function AppPage() {
     if (app) {
       const launchUrl = getLaunchUrl(`${app.package_id.package_name}:${app.package_id.publisher_node}`);
       if (launchUrl) {
-        window.location.href = launchUrl;
+        window.location.href = window.location.origin.replace('//app-store-sys.', '//') + launchUrl;
       }
     }
   }, [app, getLaunchUrl]);
diff --git a/kinode/packages/app_store/ui/src/pages/DownloadPage.tsx b/kinode/packages/app_store/ui/src/pages/DownloadPage.tsx
index c933d3a7..994e2c9c 100644
--- a/kinode/packages/app_store/ui/src/pages/DownloadPage.tsx
+++ b/kinode/packages/app_store/ui/src/pages/DownloadPage.tsx
@@ -178,7 +178,7 @@ export default function DownloadPage() {
 
     const handleLaunch = useCallback(() => {
         if (launchPath) {
-            window.location.href = launchPath;
+            window.location.href = window.location.origin.replace('//app-store-sys.', '//') + launchPath;
         }
     }, [launchPath]);
 
diff --git a/kinode/packages/contacts/pkg/ui/script.js b/kinode/packages/contacts/pkg/ui/script.js
index 153ff50a..2ea7dd54 100644
--- a/kinode/packages/contacts/pkg/ui/script.js
+++ b/kinode/packages/contacts/pkg/ui/script.js
@@ -77,12 +77,7 @@ function populate_contacts(contacts) {
 
 document.getElementById('back-button').addEventListener('click', () => {
     // set page to `/` while also removing the subdomain
-    const url = new URL(window.location.href);
-    if (url.hostname.split('.')[0] === 'contacts-sys') {
-        url.hostname = url.hostname.split('.').slice(1).join('.');
-    }
-    url.pathname = '/';
-    window.location.href = url.toString();
+    window.location.href = window.location.origin.replace('//contacts-sys.', '//') + '/'
 });
 
 document.getElementById('add-contact').addEventListener('submit', (e) => {