Ingress does not break when username missing (#4551)

home-assistant · Sep 11, 2023 · 32da679 · 32da679
1 parent 44daffc
commit 32da679
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/supervisor/api/ingress.py b/supervisor/api/ingress.py
@@ -282,8 +282,10 @@ def _init_header(
 
     if session_data is not None:
         headers[HEADER_REMOTE_USER_ID] = session_data.user.id
-        headers[HEADER_REMOTE_USER_NAME] = session_data.user.username
-        headers[HEADER_REMOTE_USER_DISPLAY_NAME] = session_data.user.display_name
+        if session_data.user.username is not None:
+            headers[HEADER_REMOTE_USER_NAME] = session_data.user.username
+        if session_data.user.display_name is not None:
+            headers[HEADER_REMOTE_USER_DISPLAY_NAME] = session_data.user.display_name
 
     # filter flags
     for name, value in request.headers.items():

diff --git a/supervisor/const.py b/supervisor/const.py
@@ -476,8 +476,8 @@ class IngressSessionDataUser:
     """Format of an IngressSessionDataUser object."""
 
     id: str
-    display_name: str
-    username: str
+    display_name: str | None = None
+    username: str | None = None
 
 
 @dataclass

diff --git a/supervisor/homeassistant/module.py b/supervisor/homeassistant/module.py
@@ -457,7 +457,9 @@ async def get_users(self) -> list[IngressSessionDataUser]:
 
         return [
             IngressSessionDataUser(
-                id=data["id"], username=data["username"], display_name=data["name"]
+                id=data["id"],
+                username=data.get("username"),
+                display_name=data.get("name"),
             )
             for data in list_of_users
         ]