From 789a1c579c5c8f2431cff2baed45713ab791ca7c Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Mon, 18 Dec 2023 07:38:13 +0400 Subject: [PATCH] get rid of reading /var/domain --- selfprivacy_api/utils/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/selfprivacy_api/utils/__init__.py b/selfprivacy_api/utils/__init__.py index 230d5d1..54dc3f1 100644 --- a/selfprivacy_api/utils/__init__.py +++ b/selfprivacy_api/utils/__init__.py @@ -10,7 +10,6 @@ import portalocker USERDATA_FILE = "/etc/nixos/userdata.json" SECRETS_FILE = "/etc/selfprivacy/secrets.json" -DOMAIN_FILE = "/var/domain" class UserDataFiles(Enum): @@ -21,10 +20,9 @@ class UserDataFiles(Enum): def get_domain(): - """Get domain from /var/domain without trailing new line""" - with open(DOMAIN_FILE, "r", encoding="utf-8") as domain_file: - domain = domain_file.readline().rstrip() - return domain + """Get domain from userdata.json""" + with ReadUserData() as user_data: + return user_data["domain"] class WriteUserData(object):