consolidate reset logic and logout #878

Author: cugarteblair

web-client/src/App.vue

@@ -184,13 +184,10 @@ async function handleGlobalLogin(): Promise<void> {
 
 async function resetToPublicCluster() {
   legacyJwtStore.clearAllJwts()
-  sysConfigStore.$reset()
+  await sysConfigStore.resetToPublicCluster()
   loginUsername.value = ''
   loginPassword.value = ''
   authDialogStore.hide()
-  // Fetch public cluster server version
-  await sysConfigStore.fetchServerVersionInfo()
-  await sysConfigStore.fetchCurrentNodes()
   toast.add({
     severity: 'info',
     summary: 'Reset Complete',

web-client/src/components/SrAppBar.vue

@@ -49,22 +49,6 @@ function handleGitHubLogin() {
   githubAuthStore.initiateLogin()
 }
 
-async function handleGitHubLogout() {
-  githubAuthStore.logout()
-  legacyJwtStore.clearAllJwts()
-  sysConfigStore.$reset()
-  sysConfigStore.domain = 'slideruleearth.io'
-  sysConfigStore.cluster = 'sliderule'
-  await sysConfigStore.fetchServerVersionInfo()
-  await sysConfigStore.fetchCurrentNodes()
-  toast.add({
-    severity: 'info',
-    summary: 'Logged Out',
-    detail: 'You have been logged out successfully',
-    life: srToastStore.getLife()
-  })
-}
-
 const displayTour = computed(() => {
   return route.name === 'home' || route.name === 'request'
 })
@@ -214,7 +198,7 @@ const userMenuItems = computed(() => {
     label: 'Log Out',
     icon: 'pi pi-sign-out',
     command: () => {
-      void handleGitHubLogout()
+      void handleLogout()
     }
   })
 
@@ -436,13 +420,9 @@ const toggleOrgMenu = (event: Event) => {
 async function handleLogout() {
   // Log out from GitHub if authenticated
   githubAuthStore.logout()
-  // Reset to public cluster
+  // Clear legacy JWT and reset to public cluster
   legacyJwtStore.clearAllJwts()
-  sysConfigStore.$reset()
-  sysConfigStore.domain = 'slideruleearth.io'
-  sysConfigStore.cluster = 'sliderule'
-  await sysConfigStore.fetchServerVersionInfo()
-  await sysConfigStore.fetchCurrentNodes()
+  await sysConfigStore.resetToPublicCluster()
   toast.add({
     severity: 'info',
     summary: 'Logged Out',
@@ -452,10 +432,9 @@ async function handleLogout() {
 }
 
 async function resetToPublicCluster() {
+  // Reset to public cluster without logging out of GitHub
   legacyJwtStore.clearAllJwts()
-  sysConfigStore.$reset()
-  await sysConfigStore.fetchServerVersionInfo()
-  await sysConfigStore.fetchCurrentNodes()
+  await sysConfigStore.resetToPublicCluster()
   toast.add({
     severity: 'info',
     summary: 'Reset Complete',

web-client/src/components/SrGitHubOrgAuth.vue

@@ -60,13 +60,8 @@ function handleLogin() {
 
 async function handleLogout() {
   githubAuthStore.logout()
-  // Reset to public cluster
   legacyJwtStore.clearAllJwts()
-  sysConfigStore.$reset()
-  sysConfigStore.domain = 'slideruleearth.io'
-  sysConfigStore.cluster = 'sliderule'
-  await sysConfigStore.fetchServerVersionInfo()
-  await sysConfigStore.fetchCurrentNodes()
+  await sysConfigStore.resetToPublicCluster()
 }
 </script>
 

web-client/src/components/SrLegacyProvSys.vue

@@ -223,10 +223,7 @@ function updateDesiredNodes() {
 
 async function resetToDefaults() {
   legacyJwtStore.clearAllJwts()
-  sysConfigStore.$reset()
-  // Fetch public cluster server version
-  await sysConfigStore.fetchServerVersionInfo()
-  await sysConfigStore.fetchCurrentNodes()
+  await sysConfigStore.resetToPublicCluster()
   toast.add({
     severity: 'info',
     summary: 'Reset Complete',

web-client/src/stores/sysConfigStore.ts

@@ -46,6 +46,17 @@ export const useSysConfigStore = defineStore(
       return result.success && result.nodes >= 0 ? result.nodes.toString() : 'Unknown'
     }
 
+    async function resetToPublicCluster(): Promise<void> {
+      // Set values directly (don't use $reset due to persistence plugin restoring old values)
+      domain.value = 'slideruleearth.io'
+      cluster.value = 'sliderule'
+      desired_nodes.value = 1
+      time_to_live.value = 720
+      resetStatus()
+      await fetchServerVersionInfo()
+      await fetchCurrentNodes()
+    }
+
     return {
       domain,
       cluster,
@@ -59,7 +70,8 @@ export const useSysConfigStore = defineStore(
       canConnectNodes,
       resetStatus,
       fetchServerVersionInfo,
-      fetchCurrentNodes
+      fetchCurrentNodes,
+      resetToPublicCluster
     }
   },
   {