Overhaul Sessioning

src/ezgg_lan_manager/pages/Account.py

@@ -1,14 +1,13 @@
 from decimal import Decimal
-from functools import partial
 from typing import Optional
 
 from rio import Column, Component, event, Text, TextStyle, Button, Color, Revealer, Row, ProgressCircle, Link
 
 from src.ezgg_lan_manager import ConfigurationService, UserService, AccountingService
 from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
-from src.ezgg_lan_manager.types.SessionStorage import SessionStorage
 from src.ezgg_lan_manager.types.Transaction import Transaction
 from src.ezgg_lan_manager.types.User import User
+from src.ezgg_lan_manager.types.UserSession import UserSession
 
 
 class AccountPage(Component):
@@ -21,9 +20,14 @@ class AccountPage(Component):
     @event.on_populate
     async def on_populate(self) -> None:
         await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Guthabenkonto")
-        self.user = await self.session[UserService].get_user(self.session[SessionStorage].user_id)
-        self.balance = await self.session[AccountingService].get_balance(self.user.user_id)
-        self.transaction_history = await self.session[AccountingService].get_transaction_history(self.user.user_id)
+        try:
+            user_id = self.session[UserSession].user_id
+        except KeyError:
+            pass
+        else:
+            self.user = await self.session[UserService].get_user(user_id)
+            self.balance = await self.session[AccountingService].get_balance(user_id)
+            self.transaction_history = await self.session[AccountingService].get_transaction_history(user_id)
 
     async def _on_banking_info_press(self) -> None:
         self.banking_info_revealer_open = not self.banking_info_revealer_open