refactor: Allow delete user even if it's refreshing

Voxelum · Feb 19, 2024 · 27ffde7 · 27ffde7
1 parent 394c31e
commit 27ffde7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/xmcl-keystone-ui/src/views/UserMenuUserItem.vue b/xmcl-keystone-ui/src/views/UserMenuUserItem.vue
@@ -88,7 +88,6 @@
       <v-btn
         text
         color="red"
-        :disabled="refreshing"
         @click="emit('remove')"
       >
         <v-icon

diff --git a/xmcl-runtime/user/UserService.ts b/xmcl-runtime/user/UserService.ts
@@ -170,10 +170,13 @@ export class UserService extends StatefulService<UserState> implements IUserServ
       this.refreshController = undefined
     })
 
-    this.state.userProfile(newUser)
+    // Only update the user if the user is still in the state
+    if (this.state.users[userId]) {
+      this.state.userProfile(newUser)
 
-    if (newUser.invalidated) {
-      throw new UserException({ type: 'userAccessTokenExpired' })
+      if (newUser.invalidated) {
+        throw new UserException({ type: 'userAccessTokenExpired' })
+      }
     }
   }