SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-14 14:43:16 +00:00
Code Issues Projects Releases Wiki Activity

feat: move get_subdomain to parent class really

Browse source
This commit is contained in:
dettlaff 2024-06-16 12:00:09 +04:00 committed by nhnn
parent 894457d0b4
commit 4eaefc8321
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
selfprivacy_api/services/roundcube/__init__.py
View file

@ -44,14 +44,6 @@ class Roundcube(Service):
subdomain = get_subdomain() subdomain = get_subdomain()
return f"https://{subdomain}.{domain}" return f"https://{subdomain}.{domain}"
@staticmethod
def get_subdomain() -> Optional[str]:
with ReadUserData() as data:
if "roundcube" in data["modules"]:
return data["modules"]["roundcube"]["subdomain"]
return "webmail"
@staticmethod @staticmethod
def is_movable() -> bool: def is_movable() -> bool:
return False return False

8
selfprivacy_api/services/service.py
View file

@ -1,4 +1,5 @@
"""Abstract class for a service running on a server""" """Abstract class for a service running on a server"""
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from typing import List, Optional from typing import List, Optional
@ -73,13 +74,14 @@ class Service(ABC):
""" """
pass pass
@staticmethod
@abstractmethod
def get_subdomain() -> Optional[str]: def get_subdomain() -> Optional[str]:
""" """
The assigned primary subdomain for this service. The assigned primary subdomain for this service.
""" """
pass with ReadUserData() as data:
if self.get_display_name() in data["modules"]:
if "subdomain" in data["modules"][self.get_display_name()]:
return data["modules"][self.get_display_name()]["subdomain"]
@classmethod @classmethod
def get_user(cls) -> Optional[str]: def get_user(cls) -> Optional[str]: