From d307b049bc87e02cb7d96774749de4f3a4063dcf Mon Sep 17 00:00:00 2001
From: appleb_m <martin.appleby@psi.ch>
Date: Tue, 28 Apr 2026 14:25:03 +0200
Subject: [PATCH] gitea: fix os error in login.py and auth.py

---
 src/aare/common/auth_models.py | 10 +++++++++-
 src/aare/gui/auth.py           |  4 ++--
 src/aare/gui/widgets/login.py  |  3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/aare/common/auth_models.py b/src/aare/common/auth_models.py
index 9930e7cd..445d137b 100644
--- a/src/aare/common/auth_models.py
+++ b/src/aare/common/auth_models.py
@@ -49,4 +49,12 @@ class BatonStatus(BaseModel):
     you_are_holder: bool = False
     you_have_pending_request: bool = False
     incoming_request: bool = False
-    allow_non_staff_request: bool = False
\ No newline at end of file
+    allow_non_staff_request: bool = False
+
+
+def get_user():
+    import os, getpass
+    try:
+        return os.getlogin()
+    except OSError:
+        return os.environ.get("USER") or getpass.getuser()
\ No newline at end of file
diff --git a/src/aare/gui/auth.py b/src/aare/gui/auth.py
index db9c69e9..2cabc77a 100644
--- a/src/aare/gui/auth.py
+++ b/src/aare/gui/auth.py
@@ -3,13 +3,13 @@ import jwt
 import requests
 
 from aare.common.models import TokenData
-
+from aare.common.auth_models import get_user
 from aare.common.logger_config import setup_logger
 
 logger = setup_logger('aareGUI')
 
 def auth(base_url: str | None) -> str:
-    curr_user = os.getlogin()
+    curr_user = get_user()
     if base_url is None:
         token_data = TokenData(sub=curr_user,
                                staff=True,
diff --git a/src/aare/gui/widgets/login.py b/src/aare/gui/widgets/login.py
index d75d983a..23c9cbe0 100644
--- a/src/aare/gui/widgets/login.py
+++ b/src/aare/gui/widgets/login.py
@@ -9,6 +9,7 @@ from PySide6.QtWidgets import (
 )
 
 from aare.common.models import TokenData
+from aare.common.auth_models import get_user
 
 
 class LoginDialog(QDialog):
@@ -28,7 +29,7 @@ class LoginDialog(QDialog):
         # Username
         self.name_label = QLabel("Username:")
         self.name_entry = QLineEdit()
-        user = os.getlogin()
+        user = get_user()
         self.name_entry.setText(user)
         self.name_entry.setPlaceholderText("Enter username")
         layout.addWidget(self.name_label)