fix: ensure protocol is the same to avoid mixed content

docker-compose.dev.yml

@@ -43,6 +43,8 @@ services:
     container_name: tipi-redis
     image: redis:alpine
     restart: unless-stopped
+    ports:
+      - 6379:6379
     volumes:
       - ./data/redis:/data
     networks:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "runtipi",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "A homeserver for everyone",
   "scripts": {
     "prepare": "husky install",

packages/dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "private": true,
   "scripts": {
     "test": "jest --colors",

packages/dashboard/src/components/Layout/SideMenu.tsx

@@ -11,6 +11,7 @@ import { IconType } from 'react-icons';
 import { useLogoutMutation, useVersionQuery } from '../../generated/graphql';
 import { getUrl } from '../../core/helpers/url-helpers';
 import { BsHeart } from 'react-icons/bs';
+import semver from 'semver';
 
 const SideMenu: React.FC = () => {
   const router = useRouter();
@@ -19,7 +20,8 @@ const SideMenu: React.FC = () => {
   const versionQuery = useVersionQuery();
   const path = router.pathname.split('/')[1];
 
-  const isLatest = versionQuery.data?.version.latest === versionQuery.data?.version.current;
+  const defaultVersion = '0.0.0';
+  const isLatest = semver.gte(versionQuery.data?.version.current || defaultVersion, versionQuery.data?.version.latest || defaultVersion);
 
   const renderMenuItem = (title: string, name: string, Icon: IconType) => {
     const selected = path === name;

packages/dashboard/src/hooks/useCachedRessources.ts

@@ -29,11 +29,12 @@ export default function useCachedResources(): IReturnProps {
   useEffect(() => {
     const hostname = window.location.hostname;
     const port = window.location.port;
+    const protocol = window.location.protocol;
 
     if (!port) {
-      setBaseUrl(`http://${hostname}/api`);
+      setBaseUrl(`${protocol}://${hostname}/api`);
     } else {
-      setBaseUrl(`http://${hostname}:${port}/api`);
+      setBaseUrl(`${protocol}//${hostname}:${port}/api`);
     }
   }, [setBaseUrl]);
 

packages/dashboard/src/pages/settings.tsx

@@ -18,7 +18,7 @@ const Settings: NextPage = () => {
   const [logout] = useLogoutMutation({ refetchQueries: ['Me'] });
 
   const defaultVersion = '0.0.0';
-  const isLatest = semver.gte(data?.version.latest || defaultVersion, data?.version.current || defaultVersion);
+  const isLatest = semver.gte(data?.version.current || defaultVersion, data?.version.latest || defaultVersion);
 
   const handleError = (error: unknown) => {
     if (error instanceof Error) {

packages/system-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-api",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "",
   "exports": "./dist/server.js",
   "type": "module",

packages/system-api/src/modules/system/system.service.ts

@@ -43,9 +43,8 @@ const getVersion = async (): Promise<{ current: string; latest?: string }> => {
       const { data } = await axios.get('https://api.github.com/repos/meienberger/runtipi/releases/latest');
 
       version = data.name.replace('v', '');
-    }
-
       await TipiCache.set('latestVersion', version?.replace('v', '') || '', 60 * 60);
+    }
 
     return { current: getConfig().version, latest: version?.replace('v', '') };
   } catch (e) {

packages/system-api/src/server.ts

@@ -19,6 +19,7 @@ import startJobs from './core/jobs/jobs';
 import { applyJsonConfig, getConfig, setConfig } from './core/config/TipiConfig';
 import systemController from './modules/system/system.controller';
 import { eventDispatcher, EventTypes } from './core/config/EventDispatcher';
+import TipiCache from './config/TipiCache';
 
 const applyCustomConfig = () => {
   try {