Overhaul Sessioning

src/ezgg_lan_manager/pages/TeamsPage.py

@@ -6,11 +6,12 @@ from src.ezgg_lan_manager import ConfigurationService
 from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
 from src.ezgg_lan_manager.components.TeamRevealer import TeamRevealer
 from src.ezgg_lan_manager.components.TeamsDialogHandler import *
+from src.ezgg_lan_manager.services.RefreshService import RefreshService
 from src.ezgg_lan_manager.services.TeamService import TeamService
 from src.ezgg_lan_manager.services.UserService import UserService
-from src.ezgg_lan_manager.types.SessionStorage import SessionStorage
 from src.ezgg_lan_manager.types.Team import Team
 from src.ezgg_lan_manager.types.User import User
+from src.ezgg_lan_manager.types.UserSession import UserSession
 
 
 class TeamsPage(Component):
@@ -26,10 +27,13 @@ class TeamsPage(Component):
 
     @event.on_populate
     async def on_populate(self) -> None:
-        self.all_teams = await self.session[TeamService].get_all_teams()
-        self.user = await self.session[UserService].get_user(self.session[SessionStorage].user_id)
         await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Teams")
-        self.session[SessionStorage].subscribe_to_logged_in_or_out_event(str(self.__class__), self.on_populate)
+        self.session[RefreshService].subscribe(self.on_populate)
+        self.all_teams = await self.session[TeamService].get_all_teams()
+        try:
+            self.user = await self.session[UserService].get_user(self.session[UserSession].user_id)
+        except KeyError:
+            self.user = None
 
     async def on_join_button_pressed(self, team: Team) -> None:
         if self.user is None: