Fix HTTPS Portal Redirect + Add HTTPS Portal Calculated Path

packages/admin-ui/src/pages/packages/components/Network/HttpsMappings.tsx

@@ -5,8 +5,8 @@ import { useSelector } from "react-redux";
 import { NavLink, useNavigate } from "react-router-dom";
 import { getDappnodeIdentityClean } from "services/dappnodeStatus/selectors";
 import { getInstallerPath } from "pages/installer";
-import { pathName as systemPathName } from "pages/system";
-import { subPaths as systemSubPaths } from "pages/system/data";
+//import { httpsPortalPath } from "pages/system/data";
+//import { subPaths as systemSubPaths } from "pages/system/data"
 import Alert from "react-bootstrap/esm/Alert";
 import { MdAdd } from "react-icons/md";
 import { MdClose } from "react-icons/md";
@@ -21,10 +21,11 @@ import Ok from "components/Ok";
 import { prettyFullName } from "utils/format";
 import newTabProps from "utils/newTabProps";
 import { HttpsPortalMapping } from "@dappnode/types";
-import { httpsPortalDnpName } from "params";
+import { httpsPortalDnpName, httpsPortalUIPath } from "params";
 import "./https-mapping.scss";
-import { urlJoin } from "utils/url";
+//import { urlJoin } from "utils/url";
 import { ReqStatus } from "types";
+//import { rootPath as systemRootPath } from "pages/system/data";
 
 export function HttpsMappings({
   dnpName,
@@ -167,11 +168,11 @@ export function HttpsMappings({
       <div className="network-mappings">
         <p>
           It recommended to only expose the pre-approved safe services listed in{" "}
-          <NavLink to={urlJoin(systemPathName, systemSubPaths.network)}>
+          <NavLink to={httpsPortalUIPath}>
             System / Network
           </NavLink>
-          . Please, only add custom mappings manually if you understand the
-          security risks
+          . Please, only add custom mappings manually if you Fully understand the
+          security risks involved.
         </p>
 
         <div className="list-grid">

packages/admin-ui/src/pages/support/data.ts

@@ -1,5 +1,6 @@
 // This will be used later in our root reducer and selectors
-export const relativePath = "support/auto-diagnose"; // default redirect to auto-diagnose
-export const rootPath = "support/*";
+export const pathName = "support"
+export const relativePath = `${pathName}/auto-diagnose`; // default redirect to auto-diagnose
+export const rootPath = `${pathName}/*`;
 export const title = "Support";
-export const activityPath = `${rootPath}/activity`;
+export const activityPath = `${pathName}/activity`;

packages/admin-ui/src/pages/system/data.ts

@@ -12,7 +12,7 @@ export const subPaths = {
   identity: "identity",
   security: "security",
   autoUpdates: "auto-updates",
-  repository: "/repository",
+  repository: "repository",
   staticIp: "static-ip",
   network: "network",
   update: "update",

packages/admin-ui/src/params.ts

@@ -1,3 +1,4 @@
+//import { Network } from "pages/system/components/Network";
 import { urlJoin } from "utils/url";
 
 // JSON RPC API
@@ -41,6 +42,9 @@ export const wifiEnvSSID = "SSID";
 // Local proxying
 export const adminUiLocalDomain = "http://dappnode.local";
 
+// HTTPS Portal UI Link (http://my.dappnode/system/network)
+export const httpsPortalUIPath = urlJoin(apiUrl, "system", "network");
+
 // DNP names
 export const ethicalMetricsDnpName = "ethical-metrics.dnp.dappnode.eth";
 export const httpsPortalDnpName = "https.dnp.dappnode.eth";

packages/daemons/src/autoUpdates/formatNotificationBody.ts

@@ -1,8 +1,13 @@
 import { CoreUpdateDataAvailable } from "@dappnode/types";
 import { urlJoin, prettyDnpName } from "@dappnode/utils";
+//import { getInstallerPath } from "../../../admin-ui/src/pages/installer/data.js";
 
 const adminUiUpdateCoreUrl = "http://my.dappnode/system/update";
-const adminUiInstallPackageUrl = "http://my.dappnode/installer";
+//const adminUiInstallPackageUrl = "http://my.dappnode";
+const getInstallerPath = (dnpName: string) => {
+  if (dnpName.includes("public")) return "http://my.dappnode/installer/public";
+  return "http://my.dappnode/installer/dnp";
+};
 
 export function formatPackageUpdateNotification({
   dnpName,
@@ -18,7 +23,7 @@ export function formatPackageUpdateNotification({
   autoUpdatesEnabled: boolean;
 }): string {
   const prettyName = prettyDnpName(dnpName);
-  const installUrl = urlJoin(adminUiInstallPackageUrl, dnpName);
+  const installUrl = urlJoin(getInstallerPath(dnpName), dnpName);
 
   return [
     `New version ready to install for ${prettyName} (current version ${currentVersion})`,

packages/utils/src/urlJoin.ts

@@ -6,5 +6,12 @@
  * @returns "http://ipfs.io/ipfs/Qm"
  */
 export function urlJoin(...args: string[]): string {
-  return args.join("/").replace(/([^:]\/)\/+/g, "$1");
+  return (
+    args
+      .join("/")
+      // Remove duplicated // expect for the protocol
+      .replace(/([^:]\/)\/+/g, "$1")
+      // Remove duplicated // at the start of the string, "//route" => "/route"
+      .replace(/^\/+/, "/")
+  );
 }