From 3d141cbcdd9f20199a3ca0f027816f869b6042c8 Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Thu, 5 Dec 2024 11:56:18 +0100
Subject: [PATCH 1/6] Use custom api url for external links

---
 src/components/MainList.tsx |  9 ++++++---
 src/components/NavBar.tsx   | 17 ++++++++++-------
 src/core/WakaTimeCore.ts    | 20 ++++++++++----------
 src/reducers/currentUser.ts |  5 +++--
 src/utils/settings.ts       | 18 ++++++++++++++++++
 src/utils/user.ts           | 23 +++++------------------
 6 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/src/components/MainList.tsx b/src/components/MainList.tsx
index 3a84e60..879f177 100644
--- a/src/components/MainList.tsx
+++ b/src/components/MainList.tsx
@@ -6,6 +6,7 @@ import { userLogout } from '../reducers/currentUser';
 import { ReduxSelector } from '../types/store';
 import { User } from '../types/user';
 import changeExtensionState from '../utils/changeExtensionStatus';
+import { getWebsiteUrl } from '../utils/settings';
 
 export interface MainListProps {
   loggingEnabled: boolean;
@@ -15,10 +16,10 @@ const openOptionsPage = async (): Promise<void> => {
   await browser.runtime.openOptionsPage();
 };
 
-export default function MainList({
+export default async function MainList({
   loggingEnabled,
   totalTimeLoggedToday,
-}: MainListProps): JSX.Element {
+}: MainListProps): Promise<JSX.Element> {
   const dispatch = useDispatch();
 
   const user: User | undefined = useSelector(
@@ -53,6 +54,8 @@ export default function MainList({
     </div>
   ) : null;
 
+  const url = await getWebsiteUrl();
+
   return (
     <div>
       {user ? (
@@ -119,7 +122,7 @@ export default function MainList({
           <a
             target="_blank"
             rel="noreferrer"
-            href="https://wakatime.com/login"
+            href={`${url}/login`}
             className="list-group-item text-body-secondary"
           >
             <i className="fa fa-fw fa-sign-in me-2" />
diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
index 05d1f88..305050d 100644
--- a/src/components/NavBar.tsx
+++ b/src/components/NavBar.tsx
@@ -2,8 +2,9 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import { ReduxSelector } from '../types/store';
 import { User } from '../types/user';
+import { getWebsiteUrl } from '../utils/settings';
 
-export default function NavBar(): JSX.Element {
+export default async function NavBar(): Promise<Promise<JSX.Element>> {
   const user: User | undefined = useSelector(
     (selector: ReduxSelector) => selector.currentUser.user,
   );
@@ -20,13 +21,14 @@ export default function NavBar(): JSX.Element {
     }
   };
 
-  const customRules = () => {
+  const customRules = async () => {
     if (user) {
+      const url = await getWebsiteUrl();
       return (
         <li className="mb-2">
           <a
             target="_blank"
-            href="https://wakatime.com/settings/rules"
+            href={`${url}/settings/rules`}
             rel="noreferrer"
             className="text-body-secondary link-underline link-underline-opacity-0 d-flex w-100 align-items-center"
           >
@@ -40,13 +42,14 @@ export default function NavBar(): JSX.Element {
     }
   };
 
-  const dashboard = () => {
+  const dashboard = async () => {
     if (user) {
+      const url = await getWebsiteUrl();
       return (
         <li className="mb-2">
           <a
             target="_blank"
-            href="https://wakatime.com/dashboard"
+            href={url}
             rel="noreferrer"
             className="text-body-secondary link-underline link-underline-opacity-0 d-flex w-100 align-items-center"
           >
@@ -84,8 +87,8 @@ export default function NavBar(): JSX.Element {
       <div className="collapse navbar-collapse mt-4" id="userInfoCollapse">
         {signedInAs()}
         <ul className="nav navbar-nav border-bottom pb-2">
-          {customRules()}
-          {dashboard()}
+          {await customRules()}
+          {await dashboard()}
           <li className="dropdown">
             <a
               href="#"
diff --git a/src/core/WakaTimeCore.ts b/src/core/WakaTimeCore.ts
index af8cddc..a3cb97f 100644
--- a/src/core/WakaTimeCore.ts
+++ b/src/core/WakaTimeCore.ts
@@ -1,18 +1,18 @@
-import { openDB } from 'idb';
 import browser, { Tabs } from 'webextension-polyfill';
-/* eslint-disable no-fallthrough */
-/* eslint-disable default-case */
+import { openDB } from 'idb';
 import moment from 'moment';
 import { v4 as uuid4 } from 'uuid';
+import config, { ExtensionStatus } from '../config/config';
+import { EntityType, Heartbeat, HeartbeatsBulkResponse } from '../types/heartbeats';
+import getDomainFromUrl, { getDomain } from '../utils/getDomainFromUrl';
+import { IS_EDGE, IS_FIREFOX, getOperatingSystem } from '../utils/operatingSystem';
+import { Settings, getApiUrl, getSettings } from '../utils/settings';
+
 import { OptionalHeartbeat } from '../types/sites';
 import { changeExtensionStatus } from '../utils/changeExtensionStatus';
-import getDomainFromUrl, { getDomain } from '../utils/getDomainFromUrl';
-import { getOperatingSystem, IS_EDGE, IS_FIREFOX } from '../utils/operatingSystem';
-import { getSettings, Settings } from '../utils/settings';
-import { getApiUrl } from '../utils/user';
 
-import config, { ExtensionStatus } from '../config/config';
-import { EntityType, Heartbeat, HeartbeatsBulkResponse } from '../types/heartbeats';
+/* eslint-disable no-fallthrough */
+/* eslint-disable default-case */
 
 class WakaTimeCore {
   tabsWithDevtoolsOpen: Tabs.Tab[];
@@ -185,7 +185,7 @@ class WakaTimeCore {
       const request: RequestInit = {
         body: JSON.stringify(
           heartbeats.map((heartbeat) => {
-            return { ...heartbeat, userAgent };
+            return { ...heartbeat, plugin: userAgent };
           }),
         ),
         credentials: 'omit',
diff --git a/src/reducers/currentUser.ts b/src/reducers/currentUser.ts
index de3072d..0e19e23 100644
--- a/src/reducers/currentUser.ts
+++ b/src/reducers/currentUser.ts
@@ -1,9 +1,10 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import axios, { AxiosResponse } from 'axios';
 import browser from 'webextension-polyfill';
-import config from '../config/config';
 import { CurrentUser, User, UserPayload } from '../types/user';
-import { getApiUrl } from '../utils/user';
+
+import config from '../config/config';
+import { getApiUrl } from '../utils/settings';
 
 interface setUserAction {
   payload: User | undefined;
diff --git a/src/utils/settings.ts b/src/utils/settings.ts
index 9e8633d..e835057 100644
--- a/src/utils/settings.ts
+++ b/src/utils/settings.ts
@@ -83,3 +83,21 @@ export const getSettings = async (): Promise<Settings> => {
 export const saveSettings = async (settings: Settings): Promise<void> => {
   return browser.storage.sync.set(settings);
 };
+
+export const getApiUrl = async () => {
+  const settings = await browser.storage.sync.get({
+    apiUrl: config.apiUrl,
+  });
+  let apiUrl = (settings.apiUrl as string) || config.apiUrl;
+  const suffixes = ['/', '.bulk', '/users/current/heartbeats', '/heartbeats', '/heartbeat'];
+  for (const suffix of suffixes) {
+    if (apiUrl.endsWith(suffix)) {
+      apiUrl = apiUrl.slice(0, -suffix.length);
+    }
+  }
+  return apiUrl;
+};
+
+export const getWebsiteUrl = async () => {
+  return (await getApiUrl()).replace('/api/v1', '').replace('://api.', '://');
+};
diff --git a/src/utils/user.ts b/src/utils/user.ts
index 0212cdb..af16789 100644
--- a/src/utils/user.ts
+++ b/src/utils/user.ts
@@ -1,28 +1,15 @@
 import { AnyAction, Dispatch } from '@reduxjs/toolkit';
 import axios, { AxiosResponse } from 'axios';
-import browser from 'webextension-polyfill';
-
 import moment from 'moment';
-import config from '../config/config';
+import browser from 'webextension-polyfill';
 import { setApiKey, setLoggingEnabled, setTotalTimeLoggedToday } from '../reducers/configReducer';
-import { setUser } from '../reducers/currentUser';
 import { GrandTotal, Summaries } from '../types/summaries';
 import { ApiKeyPayload, AxiosUserResponse, User } from '../types/user';
-import changeExtensionState from './changeExtensionStatus';
 
-export const getApiUrl = async () => {
-  const settings = await browser.storage.sync.get({
-    apiUrl: config.apiUrl,
-  });
-  let apiUrl = (settings.apiUrl as string) || config.apiUrl;
-  const suffixes = ['/', '.bulk', '/users/current/heartbeats', '/heartbeats', '/heartbeat'];
-  for (const suffix of suffixes) {
-    if (apiUrl.endsWith(suffix)) {
-      apiUrl = apiUrl.slice(0, -suffix.length);
-    }
-  }
-  return apiUrl;
-};
+import config from '../config/config';
+import { setUser } from '../reducers/currentUser';
+import changeExtensionState from './changeExtensionStatus';
+import { getApiUrl } from './settings';
 
 /**
  * Checks if the user is logged in.

From 7e4c9e06f50fd2d58088486eed83372321159efa Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Thu, 5 Dec 2024 12:18:25 +0100
Subject: [PATCH 2/6] bump v4.0.10

---
 src/manifests/chrome.json  | 2 +-
 src/manifests/edge.json    | 2 +-
 src/manifests/firefox.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/manifests/chrome.json b/src/manifests/chrome.json
index d3a34bc..574c74f 100644
--- a/src/manifests/chrome.json
+++ b/src/manifests/chrome.json
@@ -33,5 +33,5 @@
     "page": "options.html"
   },
   "permissions": ["alarms", "tabs", "storage", "activeTab"],
-  "version": "4.0.9"
+  "version": "4.0.10"
 }
diff --git a/src/manifests/edge.json b/src/manifests/edge.json
index 9e6e782..7f9c219 100644
--- a/src/manifests/edge.json
+++ b/src/manifests/edge.json
@@ -33,5 +33,5 @@
     "page": "options.html"
   },
   "permissions": ["alarms", "tabs", "storage", "activeTab"],
-  "version": "4.0.9"
+  "version": "4.0.10"
 }
diff --git a/src/manifests/firefox.json b/src/manifests/firefox.json
index 0fb2721..dbabeb2 100644
--- a/src/manifests/firefox.json
+++ b/src/manifests/firefox.json
@@ -39,5 +39,5 @@
     "page": "options.html"
   },
   "permissions": ["alarms", "tabs", "storage", "activeTab"],
-  "version": "4.0.9"
+  "version": "4.0.10"
 }

From eee490387f2343006f56391b5accdb498be758c7 Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Thu, 5 Dec 2024 12:35:46 +0100
Subject: [PATCH 3/6] Fix react async component

---
 src/components/MainList.tsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/MainList.tsx b/src/components/MainList.tsx
index 879f177..8803105 100644
--- a/src/components/MainList.tsx
+++ b/src/components/MainList.tsx
@@ -1,12 +1,12 @@
+import React from 'react';
+
 import { useDispatch, useSelector } from 'react-redux';
 
-import React from 'react';
 import { configLogout, setLoggingEnabled } from '../reducers/configReducer';
-import { userLogout } from '../reducers/currentUser';
 import { ReduxSelector } from '../types/store';
 import { User } from '../types/user';
 import changeExtensionState from '../utils/changeExtensionStatus';
-import { getWebsiteUrl } from '../utils/settings';
+import { userLogout } from '../reducers/currentUser';
 
 export interface MainListProps {
   loggingEnabled: boolean;
@@ -16,10 +16,10 @@ const openOptionsPage = async (): Promise<void> => {
   await browser.runtime.openOptionsPage();
 };
 
-export default async function MainList({
+export default function MainList({
   loggingEnabled,
   totalTimeLoggedToday,
-}: MainListProps): Promise<JSX.Element> {
+}: MainListProps): JSX.Element {
   const dispatch = useDispatch();
 
   const user: User | undefined = useSelector(
@@ -54,8 +54,6 @@ export default async function MainList({
     </div>
   ) : null;
 
-  const url = await getWebsiteUrl();
-
   return (
     <div>
       {user ? (
@@ -122,7 +120,7 @@ export default async function MainList({
           <a
             target="_blank"
             rel="noreferrer"
-            href={`${url}/login`}
+            href="https://wakatime.com/login"
             className="list-group-item text-body-secondary"
           >
             <i className="fa fa-fw fa-sign-in me-2" />

From 87d76c97cda5a50d28b00620f4104384d9251fcc Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Thu, 5 Dec 2024 12:36:27 +0100
Subject: [PATCH 4/6] bump v4.0.11

---
 src/manifests/chrome.json  | 2 +-
 src/manifests/edge.json    | 2 +-
 src/manifests/firefox.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/manifests/chrome.json b/src/manifests/chrome.json
index 574c74f..a18227c 100644
--- a/src/manifests/chrome.json
+++ b/src/manifests/chrome.json
@@ -33,5 +33,5 @@
     "page": "options.html"
   },
   "permissions": ["alarms", "tabs", "storage", "activeTab"],
-  "version": "4.0.10"
+  "version": "4.0.11"
 }
diff --git a/src/manifests/edge.json b/src/manifests/edge.json
index 7f9c219..cba4cf7 100644
--- a/src/manifests/edge.json
+++ b/src/manifests/edge.json
@@ -33,5 +33,5 @@
     "page": "options.html"
   },
   "permissions": ["alarms", "tabs", "storage", "activeTab"],
-  "version": "4.0.10"
+  "version": "4.0.11"
 }
diff --git a/src/manifests/firefox.json b/src/manifests/firefox.json
index dbabeb2..6b307f3 100644
--- a/src/manifests/firefox.json
+++ b/src/manifests/firefox.json
@@ -39,5 +39,5 @@
     "page": "options.html"
   },
   "permissions": ["alarms", "tabs", "storage", "activeTab"],
-  "version": "4.0.10"
+  "version": "4.0.11"
 }

From 6e55a43cb5872e5ed1ce1e3f2485e8b0d949e320 Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Thu, 5 Dec 2024 12:44:22 +0100
Subject: [PATCH 5/6] Fix bug in async react component

---
 src/components/NavBar.tsx | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
index 305050d..dfc46b4 100644
--- a/src/components/NavBar.tsx
+++ b/src/components/NavBar.tsx
@@ -2,9 +2,8 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import { ReduxSelector } from '../types/store';
 import { User } from '../types/user';
-import { getWebsiteUrl } from '../utils/settings';
 
-export default async function NavBar(): Promise<Promise<JSX.Element>> {
+export default function NavBar(): JSX.Element {
   const user: User | undefined = useSelector(
     (selector: ReduxSelector) => selector.currentUser.user,
   );
@@ -21,9 +20,9 @@ export default async function NavBar(): Promise<Promise<JSX.Element>> {
     }
   };
 
-  const customRules = async () => {
+  const customRules = () => {
     if (user) {
-      const url = await getWebsiteUrl();
+      const url = 'https://wakatime.com';
       return (
         <li className="mb-2">
           <a
@@ -42,9 +41,9 @@ export default async function NavBar(): Promise<Promise<JSX.Element>> {
     }
   };
 
-  const dashboard = async () => {
+  const dashboard = () => {
     if (user) {
-      const url = await getWebsiteUrl();
+      const url = 'https://wakatime.com';
       return (
         <li className="mb-2">
           <a
@@ -87,8 +86,8 @@ export default async function NavBar(): Promise<Promise<JSX.Element>> {
       <div className="collapse navbar-collapse mt-4" id="userInfoCollapse">
         {signedInAs()}
         <ul className="nav navbar-nav border-bottom pb-2">
-          {await customRules()}
-          {await dashboard()}
+          {customRules()}
+          {dashboard()}
           <li className="dropdown">
             <a
               href="#"

From a1828f4d8311a49cff90d937133b3fb7fd088596 Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Thu, 5 Dec 2024 12:44:51 +0100
Subject: [PATCH 6/6] bump v4.0.12

---
 src/manifests/chrome.json  | 2 +-
 src/manifests/edge.json    | 2 +-
 src/manifests/firefox.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/manifests/chrome.json b/src/manifests/chrome.json
index a18227c..87da597 100644
--- a/src/manifests/chrome.json
+++ b/src/manifests/chrome.json
@@ -33,5 +33,5 @@
     "page": "options.html"
   },
   "permissions": ["alarms", "tabs", "storage", "activeTab"],
-  "version": "4.0.11"
+  "version": "4.0.12"
 }
diff --git a/src/manifests/edge.json b/src/manifests/edge.json
index cba4cf7..c1ed9a2 100644
--- a/src/manifests/edge.json
+++ b/src/manifests/edge.json
@@ -33,5 +33,5 @@
     "page": "options.html"
   },
   "permissions": ["alarms", "tabs", "storage", "activeTab"],
-  "version": "4.0.11"
+  "version": "4.0.12"
 }
diff --git a/src/manifests/firefox.json b/src/manifests/firefox.json
index 6b307f3..c1f6080 100644
--- a/src/manifests/firefox.json
+++ b/src/manifests/firefox.json
@@ -39,5 +39,5 @@
     "page": "options.html"
   },
   "permissions": ["alarms", "tabs", "storage", "activeTab"],
-  "version": "4.0.11"
+  "version": "4.0.12"
 }