From 783f004ac2b195cabb325baffcc55e9b47e6ad3c Mon Sep 17 00:00:00 2001
From: Natanael Rodriguez Ramos <nathan@Natanaels-MacBook-Pro.local>
Date: Thu, 28 Sep 2023 11:34:20 +0100
Subject: [PATCH] Remove port forwarding menu link and route from client area

---
 src/themes/ivpn-v3/assets/js/app.js           |  2 +-
 .../assets/js/components/AccountInfo.vue      |  9 --------
 .../assets/js/components/AccountMenu.vue      | 23 +++----------------
 src/themes/ivpn-v3/assets/js/router/index.js  |  9 --------
 src/themes/ivpn-v3/assets/js/store/index.js   |  2 --
 5 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/src/themes/ivpn-v3/assets/js/app.js b/src/themes/ivpn-v3/assets/js/app.js
index 3b2580899..5175acdac 100644
--- a/src/themes/ivpn-v3/assets/js/app.js
+++ b/src/themes/ivpn-v3/assets/js/app.js
@@ -26,7 +26,7 @@ let products = {
         name: 'IVPN Pro',
         capabilities: {
             hasWireGuard: true,
-            hasPortForwarding: true,
+            hasPortForwarding: false,
         },
         prices: [
             { id: 'pro-1week', name: '1 Week', price: 4 },
diff --git a/src/themes/ivpn-v3/assets/js/components/AccountInfo.vue b/src/themes/ivpn-v3/assets/js/components/AccountInfo.vue
index f310cd6ba..23f8917d2 100644
--- a/src/themes/ivpn-v3/assets/js/components/AccountInfo.vue
+++ b/src/themes/ivpn-v3/assets/js/components/AccountInfo.vue
@@ -1,12 +1,5 @@
 <template>
     <div>
-        <div class="note" v-if="
-            account.is_active &&
-            account.product.capabilities.has_port_forwarding &&
-            isPortForwardingEnabled
-        ">
-            <p>Note: port forwarding is being phased out from the IVPN service. Read our <a href="https://www.ivpn.net/blog/gradual-removal-of-port-forwarding/">blog post</a> about this change, and <a href="https://www.ivpn.net/contactus/">contact us</a> if you have any questions.</p>
-        </div>
         <div class="account-id-section">
             <div class="details">
                 <label class="header">Account ID</label>
@@ -58,11 +51,9 @@ export default {
         this.qrCode = qr.createSvgTag(3);
     },
     mounted() {
-        this.$store.dispatch("portForwarding/load");
     },
     computed: {
         ...mapState({
-            isPortForwardingEnabled: (state) => state.portForwarding.isEnabled,
         }),
     },
     methods: {
diff --git a/src/themes/ivpn-v3/assets/js/components/AccountMenu.vue b/src/themes/ivpn-v3/assets/js/components/AccountMenu.vue
index 998be3703..183dbbdca 100644
--- a/src/themes/ivpn-v3/assets/js/components/AccountMenu.vue
+++ b/src/themes/ivpn-v3/assets/js/components/AccountMenu.vue
@@ -7,16 +7,11 @@
                         >IVPN Account</router-link
                     >
                 </li>
-                <li v-id="allowPortForwarding" :class="{ 'is-active': isWireGuardRoute() }">
+                <li :class="{ 'is-active': isWireGuardRoute() }">
                     <router-link :to="{ name: 'wireguard' }"
                         >WireGuard</router-link
                     >
                 </li>
-                <li v-if="allowPortForwarding" :class="{ 'is-active': isPortWordwarding() }" tag="li">
-                    <router-link :to="{ name: 'port-forwarding' }"
-                        >Port Forwarding</router-link
-                    >
-                </li>
                 <li class="expand"></li>
                 <li>
                     <router-link
@@ -42,33 +37,21 @@ export default {
             return this.$route.path;
         },
         shouldDisplay() {
-            return ["account", "port-forwarding", "wireguard", "wireguard-config"].includes(
+            return ["account", "wireguard", "wireguard-config"].includes(
                 this.$route.name
             );
         },
-        allowPortForwarding(){
-            //Disable port forwarding starting from 29th June 2023
-            if( new Date(this.account.created_at).setHours(0, 0, 0, 0) >= new Date('2023-06-29').setHours(0, 0, 0, 0) ){
-                return false;
-            } else {
-                return true;
-            }
-        }
     },
     methods: {
         isAccountRoute() {
             return (
                 this.currentRouteName.startsWith("/account") &&
-                !this.isWireGuardRoute() &&
-                !this.isPortWordwarding()
+                !this.isWireGuardRoute() 
             );
         },
         isWireGuardRoute() {
             return this.currentRouteName.startsWith("/account/wireguard");
         },
-        isPortWordwarding() {
-            return this.currentRouteName.startsWith("/account/port-forwarding");
-        },
     },
 };
 </script>
diff --git a/src/themes/ivpn-v3/assets/js/router/index.js b/src/themes/ivpn-v3/assets/js/router/index.js
index fe315431a..a496cdf0a 100644
--- a/src/themes/ivpn-v3/assets/js/router/index.js
+++ b/src/themes/ivpn-v3/assets/js/router/index.js
@@ -15,7 +15,6 @@ import AddFundsGiftCard from '@/views/Account/AddFunds/GiftCard.vue'
 
 import WireguardView from '@/views/Account/Wireguard.vue'
 import WireguardConfigView from '@/views/Account/WireguardConfig.vue'
-import PortForwardingView from '@/views/Account/PortForwarding.vue'
 import Settings from '@/views/Account/Settings.vue'
 import SettingsAuthentication from '@/views/Account/Settings/Authentication.vue'
 import SettingsBilling from '@/views/Account/Settings/Billing.vue'
@@ -280,14 +279,6 @@ const routes = [
             title: 'IVPN Account - WireGuard Configuration',
         }
     },
-    {
-        path: '/account/port-forwarding',
-        name: 'port-forwarding',
-        component: PortForwardingView,
-        meta: {
-            title: 'IVPN Account - Port Forwarding',
-        }
-    },
     {
         path: '/404',
         name: '404',
diff --git a/src/themes/ivpn-v3/assets/js/store/index.js b/src/themes/ivpn-v3/assets/js/store/index.js
index 05d9e2519..6449322e2 100644
--- a/src/themes/ivpn-v3/assets/js/store/index.js
+++ b/src/themes/ivpn-v3/assets/js/store/index.js
@@ -3,7 +3,6 @@ import Vuex from "vuex"
 import auth from "./module_auth.js"
 import popup from "./module_popup.js"
 import wireguard from "./module_wireguard.js"
-import portForwarding from "./module_port_forwarding.js"
 import payments from "./module_payments.js"
 import product from "./module_product.js"
 import deleteAccount from "./module_delete_account.js"
@@ -18,7 +17,6 @@ export default new Vuex.Store({
         popup,
         payments,
         wireguard,
-        portForwarding,
         deleteAccount,        
         product,
         braintree,