Merge 93db717749 into 862b54de8c

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **Style**
  * Increased top margin in the OS version header for improved spacing.
* Updated user profile container to use padding instead of margin for
better layout consistency.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

.claude/settings.local.json

@@ -2,7 +2,14 @@
   "permissions": {
     "allow": [
       "Bash(rg:*)",
-      "Bash(find:*)"
+      "Bash(find:*)",
+      "Bash(pnpm codegen:*)",
+      "Bash(pnpm dev:*)",
+      "Bash(pnpm build:*)",
+      "Bash(pnpm test:*)",
+      "Bash(grep:*)",
+      "Bash(pnpm type-check:*)",
+      "Bash(pnpm lint:*)"
     ]
   },
   "enableAllProjectMcpServers": false

.release-please-manifest.json

@@ -1 +1 @@
-{".":"4.8.0"}
+{".":"4.9.0"}

api/CHANGELOG.md

@@ -1,5 +1,92 @@
 # Changelog
 
+## [4.9.0](https://github.com/unraid/api/compare/v4.8.0...v4.9.0) (2025-07-08)
+
+
+### Features
+
+* add graphql resource for API plugins ([#1420](https://github.com/unraid/api/issues/1420)) ([642a220](https://github.com/unraid/api/commit/642a220c3a796829505d8449dc774968c9d5c222))
+* add management page for API keys ([#1408](https://github.com/unraid/api/issues/1408)) ([0788756](https://github.com/unraid/api/commit/0788756b918a8e99be51f34bf6f96bbe5b67395a))
+* add rclone ([#1362](https://github.com/unraid/api/issues/1362)) ([5517e75](https://github.com/unraid/api/commit/5517e7506b05c7bef5012bb9f8d2103e91061997))
+* API key management ([#1407](https://github.com/unraid/api/issues/1407)) ([d37dc3b](https://github.com/unraid/api/commit/d37dc3bce28bad1c893ae7eff96ca5ffd9177648))
+* api plugin management via CLI ([#1416](https://github.com/unraid/api/issues/1416)) ([3dcbfbe](https://github.com/unraid/api/commit/3dcbfbe48973b8047f0c6c560068808d86ac6970))
+* build out docker components  ([#1427](https://github.com/unraid/api/issues/1427)) ([711cc9a](https://github.com/unraid/api/commit/711cc9ac926958bcf2996455b023ad265b041530))
+* docker and info resolver issues ([#1423](https://github.com/unraid/api/issues/1423)) ([9901039](https://github.com/unraid/api/commit/9901039a3863de06b520e23cb2573b610716c673))
+* fix shading in UPC to be less severe ([#1438](https://github.com/unraid/api/issues/1438)) ([b7c2407](https://github.com/unraid/api/commit/b7c240784052276fc60e064bd7d64dd6e801ae90))
+* info resolver cleanup ([#1425](https://github.com/unraid/api/issues/1425)) ([1b279bb](https://github.com/unraid/api/commit/1b279bbab3a51e7d032e7e3c9898feac8bfdbafa))
+* initial codeql setup ([#1390](https://github.com/unraid/api/issues/1390)) ([2ade7eb](https://github.com/unraid/api/commit/2ade7eb52792ef481aaf711dc07029629ea107d9))
+* initialize claude code in codebse ([#1418](https://github.com/unraid/api/issues/1418)) ([b6c4ee6](https://github.com/unraid/api/commit/b6c4ee6eb4b9ebb6d6e59a341e1f51b253578752))
+* move api key fetching to use api key service ([#1439](https://github.com/unraid/api/issues/1439)) ([86bea56](https://github.com/unraid/api/commit/86bea5627270a2a18c5b7db36dd59061ab61e753))
+* move to cron v4 ([#1428](https://github.com/unraid/api/issues/1428)) ([b8035c2](https://github.com/unraid/api/commit/b8035c207a6e387c7af3346593a872664f6c867b))
+* move to iframe for changelog ([#1388](https://github.com/unraid/api/issues/1388)) ([fcd6fbc](https://github.com/unraid/api/commit/fcd6fbcdd48e7f224b3bd8799a668d9e01967f0c))
+* native slackware package ([#1381](https://github.com/unraid/api/issues/1381)) ([4f63b4c](https://github.com/unraid/api/commit/4f63b4cf3bb9391785f07a38defe54ec39071caa))
+* send active unraid theme to docs ([#1400](https://github.com/unraid/api/issues/1400)) ([f71943b](https://github.com/unraid/api/commit/f71943b62b30119e17766e56534962630f52a591))
+* slightly better watch mode ([#1398](https://github.com/unraid/api/issues/1398)) ([881f1e0](https://github.com/unraid/api/commit/881f1e09607d1e4a8606f8d048636ba09d8fcac1))
+* upgrade nuxt-custom-elements ([#1461](https://github.com/unraid/api/issues/1461)) ([345e83b](https://github.com/unraid/api/commit/345e83bfb0904381d784fc77b3dcd3ad7e53d898))
+* use bigint instead of long ([#1403](https://github.com/unraid/api/issues/1403)) ([574d572](https://github.com/unraid/api/commit/574d572d6567c652057b29776694e86267316ca7))
+
+
+### Bug Fixes
+
+* activation indicator removed ([5edfd82](https://github.com/unraid/api/commit/5edfd823b862cfc1f864565021f12334fe9317c6))
+* alignment of settings on ManagementAccess settings page ([#1421](https://github.com/unraid/api/issues/1421)) ([70c790f](https://github.com/unraid/api/commit/70c790ff89075a785d7f0623bbf3c34a3806bbdc))
+* allow rclone to fail to initialize ([#1453](https://github.com/unraid/api/issues/1453)) ([7c6f02a](https://github.com/unraid/api/commit/7c6f02a5cb474fb285db294ec6f80d1c2c57e142))
+* always download 7.1 versioned files for patching ([edc0d15](https://github.com/unraid/api/commit/edc0d1578b89c3b3e56e637de07137e069656fa8))
+* api `pnpm type-check` ([#1442](https://github.com/unraid/api/issues/1442)) ([3122bdb](https://github.com/unraid/api/commit/3122bdb953eec58469fd9cf6f468e75621781040))
+* **api:** connect config `email` validation ([#1454](https://github.com/unraid/api/issues/1454)) ([b9a1b9b](https://github.com/unraid/api/commit/b9a1b9b08746b6d4cb2128d029a3dab7cdd47677))
+* backport unraid/webgui[#2269](https://github.com/unraid/api/issues/2269) rc.nginx update ([#1436](https://github.com/unraid/api/issues/1436)) ([a7ef06e](https://github.com/unraid/api/commit/a7ef06ea252545cef084e21cea741a8ec866e7cc))
+* bigint ([e54d27a](https://github.com/unraid/api/commit/e54d27aede1b1e784971468777c5e65cde66f2ac))
+* config migration from `myservers.cfg` ([#1440](https://github.com/unraid/api/issues/1440)) ([c4c9984](https://github.com/unraid/api/commit/c4c99843c7104414120bffc5dd5ed78ab6c8ba02))
+* **connect:** fatal race-condition in websocket disposal ([#1462](https://github.com/unraid/api/issues/1462)) ([0ec0de9](https://github.com/unraid/api/commit/0ec0de982f017b61a145c7a4176718b484834f41))
+* **connect:** mothership connection ([#1464](https://github.com/unraid/api/issues/1464)) ([7be8bc8](https://github.com/unraid/api/commit/7be8bc84d3831f9cea7ff62d0964612ad366a976))
+* console hidden ([9b85e00](https://github.com/unraid/api/commit/9b85e009b833706294a841a54498e45a8e0204ed))
+* debounce is too long ([#1426](https://github.com/unraid/api/issues/1426)) ([f12d231](https://github.com/unraid/api/commit/f12d231e6376d0f253cee67b7ed690c432c63ec5))
+* delete legacy connect keys and ensure description ([22fe91c](https://github.com/unraid/api/commit/22fe91cd561e88aa24e8f8cfa5a6143e7644e4e0))
+* **deps:** pin dependencies ([#1465](https://github.com/unraid/api/issues/1465)) ([ba75a40](https://github.com/unraid/api/commit/ba75a409a4d3e820308b78fd5a5380021d3757b0))
+* **deps:** pin dependencies ([#1470](https://github.com/unraid/api/issues/1470)) ([412b329](https://github.com/unraid/api/commit/412b32996d9c8352c25309cc0d549a57468d0fb5))
+* **deps:** storybook v9 ([#1476](https://github.com/unraid/api/issues/1476)) ([45bb49b](https://github.com/unraid/api/commit/45bb49bcd60a9753be492203111e489fd37c1a5f))
+* **deps:** update all non-major dependencies ([#1366](https://github.com/unraid/api/issues/1366)) ([291ee47](https://github.com/unraid/api/commit/291ee475fb9ef44f6da7b76a9eb11b7dd29a5d13))
+* **deps:** update all non-major dependencies ([#1379](https://github.com/unraid/api/issues/1379)) ([8f70326](https://github.com/unraid/api/commit/8f70326d0fe3e4c3bcd3e8e4e6566766f1c05eb7))
+* **deps:** update all non-major dependencies ([#1389](https://github.com/unraid/api/issues/1389)) ([cb43f95](https://github.com/unraid/api/commit/cb43f95233590888a8e20a130e62cadc176c6793))
+* **deps:** update all non-major dependencies ([#1399](https://github.com/unraid/api/issues/1399)) ([68df344](https://github.com/unraid/api/commit/68df344a4b412227cffa96867f086177b251f028))
+* **deps:** update dependency @types/diff to v8 ([#1393](https://github.com/unraid/api/issues/1393)) ([00da27d](https://github.com/unraid/api/commit/00da27d04f2ee2ca8b8b9cdcc6ea3c490c02a3a4))
+* **deps:** update dependency cache-manager to v7 ([#1413](https://github.com/unraid/api/issues/1413)) ([9492c2a](https://github.com/unraid/api/commit/9492c2ae6a0086d14e73d280c55746206b73a7b0))
+* **deps:** update dependency commander to v14 ([#1394](https://github.com/unraid/api/issues/1394)) ([106ea09](https://github.com/unraid/api/commit/106ea093996f2d0c71c1511bc009ecc9a6be91ec))
+* **deps:** update dependency diff to v8 ([#1386](https://github.com/unraid/api/issues/1386)) ([e580f64](https://github.com/unraid/api/commit/e580f646a52b8bda605132cf44ec58137e08dd42))
+* **deps:** update dependency dotenv to v17 ([#1474](https://github.com/unraid/api/issues/1474)) ([d613bfa](https://github.com/unraid/api/commit/d613bfa0410e7ef8451fc8ea20e57a7db67f7994))
+* **deps:** update dependency lucide-vue-next to ^0.509.0 ([#1383](https://github.com/unraid/api/issues/1383)) ([469333a](https://github.com/unraid/api/commit/469333acd4a0cbeecc9e9cbadb2884289d83aee3))
+* **deps:** update dependency marked to v16 ([#1444](https://github.com/unraid/api/issues/1444)) ([453a5b2](https://github.com/unraid/api/commit/453a5b2c9591f755ce07548a9996d7a6cf0925c4))
+* **deps:** update dependency shadcn-vue to v2 ([#1302](https://github.com/unraid/api/issues/1302)) ([26ecf77](https://github.com/unraid/api/commit/26ecf779e675d0bc533d61e045325ab062effcbf))
+* **deps:** update dependency vue-sonner to v2 ([#1401](https://github.com/unraid/api/issues/1401)) ([53ca414](https://github.com/unraid/api/commit/53ca41404f13c057c340dcf9010af72c3365e499))
+* disable file changes on Unraid 7.2 ([#1382](https://github.com/unraid/api/issues/1382)) ([02de89d](https://github.com/unraid/api/commit/02de89d1309f67e4b6d4f8de5f66815ee4d2464c))
+* do not start API with doinst.sh ([7d88b33](https://github.com/unraid/api/commit/7d88b3393cbd8ab1e93a86dfa1b7b74cc97255cc))
+* do not uninstall fully on 7.2 ([#1484](https://github.com/unraid/api/issues/1484)) ([2263881](https://github.com/unraid/api/commit/22638811a9fdb524420b1347ac49cfaa51bbecb5))
+* drop console with terser ([a87d455](https://github.com/unraid/api/commit/a87d455bace04aab9d7fa0e63cb61d26ef9b3b72))
+* error logs from `cloud` query when connect is not installed ([#1450](https://github.com/unraid/api/issues/1450)) ([719f460](https://github.com/unraid/api/commit/719f460016d769255582742d7d71ca97d132022b))
+* flash backup integration with Unraid Connect config ([#1448](https://github.com/unraid/api/issues/1448)) ([038c582](https://github.com/unraid/api/commit/038c582aed5f5efaea3583372778b9baa318e1ea))
+* header padding regression ([#1477](https://github.com/unraid/api/issues/1477)) ([e791cc6](https://github.com/unraid/api/commit/e791cc680de9c40378043348ddca70902da6d250))
+* incorrect state merging in redux store ([#1437](https://github.com/unraid/api/issues/1437)) ([17b7428](https://github.com/unraid/api/commit/17b74287796e6feb75466033e279dc3bcf57f1e6))
+* lanip copy button not present ([#1459](https://github.com/unraid/api/issues/1459)) ([a280786](https://github.com/unraid/api/commit/a2807864acef742e454d87bb093ee91806e527e5))
+* move to bigint scalar ([b625227](https://github.com/unraid/api/commit/b625227913e80e4731a13b54b525ec7385918c51))
+* node_modules dir removed on plugin update ([#1406](https://github.com/unraid/api/issues/1406)) ([7b005cb](https://github.com/unraid/api/commit/7b005cbbf682a1336641f5fc85022e9d651569d0))
+* omit Connect actions in UPC when plugin is not installed ([#1417](https://github.com/unraid/api/issues/1417)) ([8c8a527](https://github.com/unraid/api/commit/8c8a5276b49833c08bca133e374e1e66273b41aa))
+* parsing of `ssoEnabled` in state.php ([#1455](https://github.com/unraid/api/issues/1455)) ([f542c8e](https://github.com/unraid/api/commit/f542c8e0bd9596d9d3abf75b58b97d95fb033215))
+* pin ranges ([#1460](https://github.com/unraid/api/issues/1460)) ([f88400e](https://github.com/unraid/api/commit/f88400eea820ac80c867fdb63cd503ed91493146))
+* pr plugin promotion workflow ([#1456](https://github.com/unraid/api/issues/1456)) ([13bd9bb](https://github.com/unraid/api/commit/13bd9bb5670bb96b158068114d62572d88c7cae9))
+* proper fallback if missing paths config modules ([7067e9e](https://github.com/unraid/api/commit/7067e9e3dd3966309013b52c90090cc82de4e4fb))
+* rc.unraid-api now cleans up older dependencies ([#1404](https://github.com/unraid/api/issues/1404)) ([83076bb](https://github.com/unraid/api/commit/83076bb94088095de8b1a332a50bbef91421f0c1))
+* remote access lifecycle during boot & shutdown ([#1422](https://github.com/unraid/api/issues/1422)) ([7bc583b](https://github.com/unraid/api/commit/7bc583b18621c8140232772ca36c6d9b8d8a9cd7))
+* sign out correctly on error ([#1452](https://github.com/unraid/api/issues/1452)) ([d08fc94](https://github.com/unraid/api/commit/d08fc94afb94e386907da44402ee5a24cfb3d00a))
+* simplify usb listing ([#1402](https://github.com/unraid/api/issues/1402)) ([5355115](https://github.com/unraid/api/commit/5355115af2f4122af9afa3f63ed8f830b33cbf5c))
+* theme issues when sent from graph ([#1424](https://github.com/unraid/api/issues/1424)) ([75ad838](https://github.com/unraid/api/commit/75ad8381bd4f4045ab1d3aa84e08ecddfba27617))
+* **ui:** notifications positioning regression ([#1445](https://github.com/unraid/api/issues/1445)) ([f73e5e0](https://github.com/unraid/api/commit/f73e5e0058fcc3bedebfbe7380ffcb44aea981b8))
+* use some instead of every for connect detection ([9ce2fee](https://github.com/unraid/api/commit/9ce2fee380c4db1395f5d4df7f16ae6c57d1a748))
+
+
+### Reverts
+
+* revert package.json dependency updates from commit 711cc9a for api and packages/* ([94420e4](https://github.com/unraid/api/commit/94420e4d45735b8def3915b5789c15c1c3121f1e))
+
 ## [4.8.0](https://github.com/unraid/api/compare/v4.7.0...v4.8.0) (2025-05-01)
 
 

api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@unraid/api",
-    "version": "4.8.0",
+    "version": "4.9.0",
     "main": "src/cli/index.ts",
     "type": "module",
     "corepack": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "unraid-monorepo",
   "private": true,
-  "version": "4.8.0",
+  "version": "4.9.0",
   "scripts": {
     "build": "pnpm -r build",
     "build:watch": " pnpm -r --parallel build:watch",

plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unraid/connect-plugin",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "private": true,
   "dependencies": {
     "commander": "14.0.0",

plugin/plugins/dynamix.unraid.net.plg

@@ -144,15 +144,60 @@ exit 0
       <![CDATA[
       echo "Removing Plugin"
       
-      # Find any installed dynamix.unraid.net package
-      pkg_installed=$(ls -1 /var/log/packages/dynamix.unraid.net* 2>/dev/null | head -1)
-      if [ -n "$pkg_installed" ]; then
-        pkg_basename=$(basename "$pkg_installed")
-        echo "Removing package: $pkg_basename"
-        removepkg --terse "$pkg_basename"
+      # Check Unraid version
+      UNRAID_VERSION=""
+      is_7_2_or_higher=false
+      
+      # Check if version file exists and is readable
+      if [ -f "/etc/unraid-version" ] && [ -r "/etc/unraid-version" ]; then
+        UNRAID_VERSION=$(cat /etc/unraid-version | grep "^version=" | cut -d'"' -f2 2>/dev/null)
+        
+        if [ -z "$UNRAID_VERSION" ]; then
+          echo "Warning: Unable to parse version from /etc/unraid-version"
+          echo "Using safe removal method (plugin file removal + reboot)"
+          is_7_2_or_higher=true  # Default to safe method
+        else
+          # Check if this is Unraid 7.2 or higher (including RCs and prereleases)
+          if [[ "$UNRAID_VERSION" =~ ^7\.([2-9]|[1-9][0-9]+)\. ]] || [[ "$UNRAID_VERSION" =~ ^([8-9]|[1-9][0-9]+)\. ]]; then
+            is_7_2_or_higher=true
+          fi
+        fi
       else
-        echo "No dynamix.unraid.net package found. Trying with basic package name."
-        removepkg --terse "${MAINNAME}"
+        echo "Warning: /etc/unraid-version file not found or not readable"
+        echo "Using safe removal method (plugin file removal + reboot)"
+        is_7_2_or_higher=true  # Default to safe method
+      fi
+      
+      if [ "$is_7_2_or_higher" = true ]; then
+        echo "Unraid 7.2+ detected. Using safe removal method."
+        
+        # Send notification to user
+        /usr/local/emhttp/webGui/scripts/notify \
+          -e "Unraid Connect" \
+          -s "Reboot Required for Unraid Connect Removal" \
+          -d "Unraid Connect plugin has been marked for removal. Please reboot your server to complete the uninstallation." \
+          -i "warning"
+        
+        # Remove the plugin file so it won't be installed on reboot
+        PLUGIN_FILE="/boot/config/plugins/${MAINNAME}.plg"
+        if [ -f "$PLUGIN_FILE" ]; then
+          echo "Removing plugin file: $PLUGIN_FILE"
+          rm -f "$PLUGIN_FILE"
+        fi
+        
+        echo "Plugin marked for removal. Reboot required to complete uninstallation."
+      else
+        # Original removal method for older versions
+        # Find any installed dynamix.unraid.net package
+        pkg_installed=$(ls -1 /var/log/packages/dynamix.unraid.net* 2>/dev/null | head -1)
+        if [ -n "$pkg_installed" ]; then
+          pkg_basename=$(basename "$pkg_installed")
+          echo "Removing package: $pkg_basename"
+          removepkg --terse "$pkg_basename"
+        else
+          echo "No dynamix.unraid.net package found. Trying with basic package name."
+          removepkg --terse "${MAINNAME}"
+        fi
       fi
 
       # File restoration function

unraid-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unraid/ui",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "private": true,
   "license": "GPL-2.0-or-later",
   "type": "module",

web/__test__/components/Activation/ActivationSteps.test.ts

@@ -91,11 +91,4 @@ describe('ActivationSteps', () => {
 
     expect(wrapper.find('[data-testid="stepper"]').attributes('default-value')).toBe('2');
   });
-
-  it('renders separators between steps', () => {
-    const wrapper = mountComponent();
-    const separators = wrapper.findAll('[data-testid="stepper-separator"]');
-
-    expect(separators).toHaveLength(2);
-  });
 });

web/__test__/components/HeaderOsVersion.test.ts

@@ -38,6 +38,11 @@ vi.mock('@vue/apollo-composable', () => ({
     onResult: vi.fn(),
     onError: vi.fn(),
   }),
+  useMutation: () => ({
+    mutate: vi.fn(),
+    onDone: vi.fn(),
+    onError: vi.fn(),
+  }),
   provideApolloClient: vi.fn(),
 }));
 

web/__test__/components/Registration.test.ts

@@ -41,6 +41,11 @@ vi.mock('@vue/apollo-composable', () => ({
     onResult: vi.fn(),
     onError: vi.fn(),
   }),
+  useMutation: () => ({
+    mutate: vi.fn(),
+    onDone: vi.fn(),
+    onError: vi.fn(),
+  }),
   provideApolloClient: vi.fn(),
 }));
 

web/components/Activation/ActivationSteps.vue

@@ -10,7 +10,6 @@ import {
   Stepper,
   StepperDescription,
   StepperItem,
-  StepperSeparator,
   StepperTitle,
   StepperTrigger,
 } from '@unraid/ui';
@@ -75,7 +74,7 @@ const steps: readonly Step[] = [
 <template>
   <Stepper :default-value="activeStep" class="text-foreground flex w-full items-start gap-2 text-16px">
     <StepperItem
-      v-for="(step, index) in steps"
+      v-for="step in steps"
       :key="step.step"
       v-slot="{ state }: { state: StepState }"
       class="relative flex w-full flex-col items-center justify-center data-[disabled]:opacity-100"
@@ -111,7 +110,6 @@ const steps: readonly Step[] = [
           </StepperDescription>
         </div>
       </StepperTrigger>
-      <StepperSeparator v-if="index < steps.length - 1" class="w-[50px] bg-black h-[30px]" />
     </StepperItem>
   </Stepper>
 </template>

web/components/HeaderOsVersion.ce.vue

@@ -78,7 +78,7 @@ const updateOsStatus = computed(() => {
 </script>
 
 <template>
-  <div class="flex flex-col gap-y-2 mt-2">
+  <div class="flex flex-col gap-y-2 mt-6">
     <a
       :href="unraidLogoHeaderLink.href"
       :title="unraidLogoHeaderLink.title"

web/components/UserProfile.ce.vue

@@ -100,7 +100,7 @@ onMounted(() => {
 <template>
   <div
     id="UserProfile"
-    class="text-foreground relative z-20 flex flex-col h-full gap-y-1 mt-2 mr-2"
+    class="text-foreground relative z-20 flex flex-col h-full gap-y-1 pt-2 pr-2"
   >
     <div
       v-if="bannerGradient"

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unraid/web",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "private": true,
   "license": "GPL-2.0-or-later",
   "scripts": {

web/store/account.ts

@@ -61,6 +61,59 @@ export const useAccountStore = defineStore('account', () => {
       accountActionStatus.value = 'waiting';
     }
   };
+
+  // Initialize mutations during store setup to maintain Apollo context
+  const { mutate: signOutMutation, onDone: onSignOutDone, onError: onSignOutError } = useMutation(CONNECT_SIGN_OUT);
+  const { mutate: signInMutation, onDone: onSignInDone, onError: onSignInError } = useMutation(CONNECT_SIGN_IN);
+
+  // Handle sign out mutation results
+  onSignOutDone((res) => {
+    console.debug('[connectSignOutMutation]', res);
+    accountActionStatus.value = 'success';
+    setQueueConnectSignOut(false); // reset
+  });
+
+  onSignOutError((error) => {
+    logErrorMessages(error);
+    accountActionStatus.value = 'failed';
+    errorsStore.setError({
+      heading: 'Failed to update Connect account configuration',
+      message: error.message,
+      level: 'error',
+      ref: 'connectSignOutMutation',
+      type: 'account',
+    });
+  });
+
+  // Handle sign in mutation results
+  onSignInDone((res) => {
+    if (res.data?.connectSignIn) {
+      accountActionStatus.value = 'success';
+      setConnectSignInPayload(undefined); // reset
+      return;
+    }
+    accountActionStatus.value = 'failed';
+    errorsStore.setError({
+      heading: 'unraid-api failed to update Connect account configuration',
+      message: 'Sign In mutation unsuccessful',
+      level: 'error',
+      ref: 'connectSignInMutation',
+      type: 'account',
+    });
+  });
+
+  onSignInError((error) => {
+    logErrorMessages(error);
+    accountActionStatus.value = 'failed';
+    errorsStore.setError({
+      heading: 'unraid-api failed to update Connect account configuration',
+      message: error.message,
+      level: 'error',
+      ref: 'connectSignInMutation',
+      type: 'account',
+    });
+  });
+
   watchEffect(() => {
     if (unraidApiClient.value && connectSignInPayload.value) {
       // connectSignInMutation();
@@ -258,7 +311,7 @@ export const useAccountStore = defineStore('account', () => {
     );
   };
 
-  const connectSignInMutation = async () => {
+  const connectSignInMutation = () => {
     if (
       !connectSignInPayload.value ||
       (connectSignInPayload.value &&
@@ -271,83 +324,21 @@ export const useAccountStore = defineStore('account', () => {
     }
 
     accountActionStatus.value = 'updating';
-    const {
-      mutate: signInMutation,
-      onDone,
-      onError,
-    } = await useMutation(CONNECT_SIGN_IN, {
-      variables: {
-        input: {
-          apiKey: connectSignInPayload.value.apiKey,
-          userInfo: {
-            email: connectSignInPayload.value.email,
-            preferred_username: connectSignInPayload.value.preferred_username,
-          },
+    
+    return signInMutation({
+      input: {
+        apiKey: connectSignInPayload.value.apiKey,
+        userInfo: {
+          email: connectSignInPayload.value.email,
+          preferred_username: connectSignInPayload.value.preferred_username,
         },
       },
     });
-
-    signInMutation();
-
-    onDone((res) => {
-      if (res.data?.connectSignIn) {
-        accountActionStatus.value = 'success';
-        setConnectSignInPayload(undefined); // reset
-        return;
-      }
-      accountActionStatus.value = 'failed';
-      errorsStore.setError({
-        heading: 'unraid-api failed to update Connect account configuration',
-        message: 'Sign In mutation unsuccessful',
-        level: 'error',
-        ref: 'connectSignInMutation',
-        type: 'account',
-      });
-    });
-
-    onError((error) => {
-      logErrorMessages(error);
-      accountActionStatus.value = 'failed';
-      errorsStore.setError({
-        heading: 'unraid-api failed to update Connect account configuration',
-        message: error.message,
-        level: 'error',
-        ref: 'connectSignInMutation',
-        type: 'account',
-      });
-    });
   };
 
-  const connectSignOutMutation = async () => {
+  const connectSignOutMutation = () => {
     accountActionStatus.value = 'updating';
-    // @todo is this still needed here with the change to a mutation?
-    // if (!serverStore.registered && accountAction.value && !accountAction.value?.user) {
-    //   accountActionHide.value = true;
-    //   accountActionStatus.value = 'success';
-    //   return;
-    // }
-
-    const { mutate: signOutMutation, onDone, onError } = await useMutation(CONNECT_SIGN_OUT);
-
-    signOutMutation();
-
-    onDone((res) => {
-      console.debug('[connectSignOutMutation]', res);
-      accountActionStatus.value = 'success';
-      setQueueConnectSignOut(false); // reset
-    });
-
-    onError((error) => {
-      logErrorMessages(error);
-      accountActionStatus.value = 'failed';
-      errorsStore.setError({
-        heading: 'Failed to update Connect account configuration',
-        message: error.message,
-        level: 'error',
-        ref: 'connectSignOutMutation',
-        type: 'account',
-      });
-    });
+    return signOutMutation();
   };
 
   const setAccountAction = (action: ExternalSignIn | ExternalSignOut) => {