diff --git a/PFERD/auth/__init__.py b/PFERD/auth/__init__.py index af38859..6e7fd3a 100644 --- a/PFERD/auth/__init__.py +++ b/PFERD/auth/__init__.py @@ -15,9 +15,9 @@ AuthConstructor = Callable[[ AUTHENTICATORS: Dict[str, AuthConstructor] = { "simple": lambda n, s, c: - SimpleAuthenticator(n, SimpleAuthSection(s), c), + SimpleAuthenticator(n, SimpleAuthSection(s)), "tfa": lambda n, s, c: - TfaAuthenticator(n, AuthSection(s), c), + TfaAuthenticator(n), "keyring": lambda n, s, c: - KeyringAuthenticator(n, KeyringAuthSection(s), c) + KeyringAuthenticator(n, KeyringAuthSection(s)) } diff --git a/PFERD/auth/authenticator.py b/PFERD/auth/authenticator.py index 5f09f92..fe14909 100644 --- a/PFERD/auth/authenticator.py +++ b/PFERD/auth/authenticator.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod from typing import Tuple -from ..config import Config, Section +from ..config import Section class AuthLoadError(Exception): @@ -19,9 +19,7 @@ class AuthSection(Section): class Authenticator(ABC): def __init__( self, - name: str, - section: AuthSection, - config: Config, + name: str ) -> None: """ Initialize an authenticator from its name and its section in the config diff --git a/PFERD/auth/keyring.py b/PFERD/auth/keyring.py index b63bf90..c7ca2c2 100644 --- a/PFERD/auth/keyring.py +++ b/PFERD/auth/keyring.py @@ -2,7 +2,6 @@ from typing import Optional, Tuple import keyring -from ..config import Config from ..logging import log from ..utils import agetpass, ainput from ..version import NAME @@ -23,9 +22,8 @@ class KeyringAuthenticator(Authenticator): self, name: str, section: KeyringAuthSection, - config: Config, ) -> None: - super().__init__(name, section, config) + super().__init__(name) self._username = section.username() self._password: Optional[str] = None diff --git a/PFERD/auth/simple.py b/PFERD/auth/simple.py index 7fbb60b..d2f4123 100644 --- a/PFERD/auth/simple.py +++ b/PFERD/auth/simple.py @@ -1,6 +1,5 @@ from typing import Optional, Tuple -from ..config import Config from ..logging import log from ..utils import agetpass, ainput from .authenticator import Authenticator, AuthError, AuthSection @@ -19,9 +18,8 @@ class SimpleAuthenticator(Authenticator): self, name: str, section: SimpleAuthSection, - config: Config, ) -> None: - super().__init__(name, section, config) + super().__init__(name) self._username = section.username() self._password = section.password() diff --git a/PFERD/auth/tfa.py b/PFERD/auth/tfa.py index 3efabe1..28ba150 100644 --- a/PFERD/auth/tfa.py +++ b/PFERD/auth/tfa.py @@ -1,19 +1,16 @@ from typing import Tuple -from ..config import Config from ..logging import log from ..utils import ainput -from .authenticator import Authenticator, AuthError, AuthSection +from .authenticator import Authenticator, AuthError class TfaAuthenticator(Authenticator): def __init__( self, name: str, - section: AuthSection, - config: Config, ) -> None: - super().__init__(name, section, config) + super().__init__(name) async def username(self) -> str: raise AuthError("TFA authenticator does not support usernames")