gitea: fix os error in login.py and auth.py
Build and Publish / test (push) Successful in 1m29s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (push) Successful in 38s

This commit is contained in:
2026-04-28 14:25:03 +02:00
parent 98fba7ec53
commit d307b049bc
3 changed files with 13 additions and 4 deletions
+9 -1
View File
@@ -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
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()
+2 -2
View File
@@ -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,
+2 -1
View File
@@ -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)