wcp-library 1.3.4__tar.gz → 1.3.6__tar.gz

{wcp_library-1.3.4 → wcp_library-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.3.4
+Version: 1.3.6
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen

{wcp_library-1.3.4 → wcp_library-1.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wcp-library"
-version = "1.3.4"
+version = "1.3.6"
 description = "Common utilites for internal development at WCP"
 authors = ["Mitch-Petersen <mitch.petersen@wcap.ca>"]
 readme = "README.md"

wcp_library-1.3.4/wcp_library/credentials/credential_manager_asynchronous.py → wcp_library-1.3.6/wcp_library/credentials/_credential_manager_asynchronous.py

@@ -38,6 +38,8 @@ class AsyncCredentialManager(ABC):
             for field in password['GenericFieldInfo']:
                 password_info[field['DisplayName']] = field['Value'].lower() if field['DisplayName'].lower() == 'username' else field['Value']
             password_dict[password['UserName'].lower()] = password_info
+            if password['OTP']:
+                password_dict[password['UserName'].lower()]['OTP'] = password['OTP']
         logger.debug("Credentials retrieved")
         return password_dict
 
@@ -62,6 +64,8 @@ class AsyncCredentialManager(ABC):
         password_info = {'PasswordID': password['PasswordID'], 'UserName': password['UserName'], 'Password': password['Password']}
         for field in password['GenericFieldInfo']:
             password_info[field['DisplayName']] = field['Value'].lower() if field['DisplayName'].lower() == 'username' else field['Value']
+        if password['OTP']:
+            password_info['OTP'] = password['OTP']
         return password_info
 
     async def _publish_new_password(self, data: dict) -> bool:
@@ -99,14 +103,24 @@ class AsyncCredentialManager(ABC):
         logger.debug(f"Credentials for {username} retrieved")
         return return_credential
 
+    async def get_credential_by_id(self, password_id: int) -> dict:
+        """
+        Get the credentials for a specific Password ID
+
+        :param password_id:
+        :return:
+        """
+
+        logger.debug(f"Getting credentials for ID {password_id}")
+        credential = await self._get_credential(password_id)
+        logger.debug(f"Credentials for ID {password_id} retrieved")
+        return credential
+
     async def update_credential(self, credentials_dict: dict) -> bool:
         """
         Update username and password in PasswordState
 
-        Credentials dictionary must have the following keys:
-            - PasswordID
-            - UserName
-            - Password
+        Credentials dictionary must the same keys as the original dictionary from the get_credentials method
 
         The dictionary can be obtained from the get_credentials method
 
@@ -114,6 +128,9 @@ class AsyncCredentialManager(ABC):
         :return:
         """
 
+        if "OTP" in credentials_dict:
+            credentials_dict.pop("OTP")
+
         logger.debug(f"Updating credentials for {credentials_dict['UserName']}")
         url = (self.password_url / str(self._password_list_id)).with_query("QueryAll")
         async with aiohttp.ClientSession() as session:

wcp_library-1.3.4/wcp_library/credentials/credential_manager_synchronous.py → wcp_library-1.3.6/wcp_library/credentials/_credential_manager_synchronous.py

@@ -36,6 +36,8 @@ class CredentialManager(ABC):
             for field in password['GenericFieldInfo']:
                 password_info[field['DisplayName']] = field['Value'].lower() if field['DisplayName'].lower() == 'username' else field['Value']
             password_dict[password['UserName'].lower()] = password_info
+            if password['OTP']:
+                password_dict[password['UserName'].lower()]['OTP'] = password['OTP']
         logger.debug("Credentials retrieved")
         return password_dict
 
@@ -58,6 +60,8 @@ class CredentialManager(ABC):
         password_info = {'PasswordID': password['PasswordID'], 'UserName': password['UserName'], 'Password': password['Password']}
         for field in password['GenericFieldInfo']:
             password_info[field['DisplayName']] = field['Value'].lower() if field['DisplayName'].lower() == 'username' else field['Value']
+        if password['OTP']:
+            password_info['OTP'] = password['OTP']
         logger.debug("Credential retrieved")
         return password_info
 
@@ -110,10 +114,7 @@ class CredentialManager(ABC):
         """
         Update the credentials for a specific username
 
-        Credentials dictionary must have the following keys:
-            - PasswordID
-            - UserName
-            - Password
+        Credentials dictionary must the same keys as the original dictionary from the get_credentials method
 
         The dictionary should be obtained from the get_credentials method and modified accordingly
 
@@ -121,6 +122,9 @@ class CredentialManager(ABC):
         :return: True if successful, False otherwise
         """
 
+        if "OTP" in credentials_dict:
+            credentials_dict.pop("OTP")
+
         logger.debug(f"Updating credentials for {credentials_dict['UserName']}")
         url = (self.password_url / str(self._password_list_id)).with_query("QueryAll")
         passwords = requests.get(str(url), headers=self.headers).json()

wcp_library-1.3.6/wcp_library/credentials/api.py

@@ -0,0 +1,74 @@
+import logging
+
+from wcp_library.credentials._credential_manager_asynchronous import AsyncCredentialManager
+from wcp_library.credentials._credential_manager_synchronous import CredentialManager
+
+logger = logging.getLogger(__name__)
+
+
+class APICredentialManager(CredentialManager):
+    def __init__(self, passwordState_api_key: str):
+        super().__init__(passwordState_api_key, 214)
+
+    def new_credentials(self, credentials_dict: dict) -> bool:
+        """
+        Create a new credential entry
+
+        Credentials dictionary can have the following keys:
+            - Title
+            - UserName
+            - Password
+            - API KEY
+            - Authentication Header
+            - URL
+
+        :param credentials_dict:
+        :return: True if successful, False otherwise
+        """
+
+        data = {
+            "PasswordListID": self._password_list_id,
+            "Title": credentials_dict['UserName'].upper() if "Title" not in credentials_dict else credentials_dict['Title'].upper(),
+            "Notes": credentials_dict['Notes'] if 'Notes' in credentials_dict else None,
+            "UserName": credentials_dict['UserName'],
+            "Password": credentials_dict['Password'],
+            "GenericField1": credentials_dict['API KEY'],
+            "GenericField2": credentials_dict['Authentication Header'],
+            "URL": credentials_dict['URL']
+        }
+
+        return self._publish_new_password(data)
+
+
+class AsyncAPICredentialManager(AsyncCredentialManager):
+    def __init__(self, passwordState_api_key: str):
+        super().__init__(passwordState_api_key, 214)
+
+    async def new_credentials(self, credentials_dict: dict) -> bool:
+        """
+        Create a new credential entry
+
+        Credentials dictionary can have the following keys:
+            - Title
+            - UserName
+            - Password
+            - API KEY
+            - Authentication Header
+            - URL
+
+        :param credentials_dict:
+        :return:
+        """
+
+        data = {
+            "PasswordListID": self._password_list_id,
+            "Title": credentials_dict['UserName'].upper() if "Title" not in credentials_dict else credentials_dict['Title'].upper(),
+            "Notes": credentials_dict['Notes'] if 'Notes' in credentials_dict else None,
+            "UserName": credentials_dict['UserName'],
+            "Password": credentials_dict['Password'],
+            "GenericField1": credentials_dict['API KEY'],
+            "GenericField2": credentials_dict['Authentication Header'],
+            "URL": credentials_dict['URL']
+        }
+
+        return await self._publish_new_password(data)

{wcp_library-1.3.4 → wcp_library-1.3.6}/wcp_library/credentials/ftp.py

@@ -1,7 +1,7 @@
 import logging
 
-from wcp_library.credentials.credential_manager_asynchronous import AsyncCredentialManager
-from wcp_library.credentials.credential_manager_synchronous import CredentialManager
+from wcp_library.credentials._credential_manager_asynchronous import AsyncCredentialManager
+from wcp_library.credentials._credential_manager_synchronous import CredentialManager
 
 logger = logging.getLogger(__name__)
 

wcp_library-1.3.6/wcp_library/credentials/internet.py

@@ -0,0 +1,66 @@
+import logging
+
+from wcp_library.credentials._credential_manager_asynchronous import AsyncCredentialManager
+from wcp_library.credentials._credential_manager_synchronous import CredentialManager
+
+logger = logging.getLogger(__name__)
+
+
+class InternetCredentialManager(CredentialManager):
+    def __init__(self, passwordState_api_key: str):
+        super().__init__(passwordState_api_key, 93)
+
+    def new_credentials(self, credentials_dict: dict) -> bool:
+        """
+        Create a new credential entry
+
+        Credentials dictionary must have the following keys:
+            - Title
+            - UserName
+            - Password
+            - URL
+
+        :param credentials_dict:
+        :return:
+        """
+
+        data = {
+            "PasswordListID": self._password_list_id,
+            "Title": credentials_dict['UserName'].upper() if "Title" not in credentials_dict else credentials_dict['Title'].upper(),
+            "Notes": credentials_dict['Notes'] if 'Notes' in credentials_dict else None,
+            "UserName": credentials_dict['UserName'].lower(),
+            "Password": credentials_dict['Password'],
+            "URL": credentials_dict['URL']
+        }
+
+        return self._publish_new_password(data)
+
+
+class AsyncInternetCredentialManager(AsyncCredentialManager):
+    def __init__(self, passwordState_api_key: str):
+        super().__init__(passwordState_api_key, 93)
+
+    async def new_credentials(self, credentials_dict: dict) -> bool:
+        """
+        Create a new credential entry
+
+        Credentials dictionary must have the following keys:
+            - Title
+            - UserName
+            - Password
+            - URL
+
+        :param credentials_dict:
+        :return:
+        """
+
+        data = {
+            "PasswordListID": self._password_list_id,
+            "Title": credentials_dict['UserName'].upper() if "Title" not in credentials_dict else credentials_dict['Title'].upper(),
+            "Notes": credentials_dict['Notes'] if 'Notes' in credentials_dict else None,
+            "UserName": credentials_dict['UserName'].lower(),
+            "Password": credentials_dict['Password'],
+            "URL": credentials_dict['URL']
+        }
+
+        return await self._publish_new_password(data)

{wcp_library-1.3.4 → wcp_library-1.3.6}/wcp_library/credentials/oracle.py

@@ -2,8 +2,8 @@ import logging
 
 import aiohttp
 
-from wcp_library.credentials.credential_manager_asynchronous import AsyncCredentialManager
-from wcp_library.credentials.credential_manager_synchronous import CredentialManager
+from wcp_library.credentials._credential_manager_asynchronous import AsyncCredentialManager
+from wcp_library.credentials._credential_manager_synchronous import CredentialManager
 
 logger = logging.getLogger(__name__)
 

{wcp_library-1.3.4 → wcp_library-1.3.6}/wcp_library/credentials/postgres.py

@@ -1,7 +1,7 @@
 import logging
 
-from wcp_library.credentials.credential_manager_asynchronous import AsyncCredentialManager
-from wcp_library.credentials.credential_manager_synchronous import CredentialManager
+from wcp_library.credentials._credential_manager_asynchronous import AsyncCredentialManager
+from wcp_library.credentials._credential_manager_synchronous import CredentialManager
 
 logger = logging.getLogger(__name__)
 

{wcp_library-1.3.4 → wcp_library-1.3.6}/wcp_library/selenium_helper.py

@@ -75,3 +75,14 @@ class SeleniumHelper:
         """
 
         WebDriverWait(self.driver, timeout).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, css_element)))
+
+    def wait_until_clickable(self, css_element: str, timeout: int = 30) -> None:
+        """
+        Wait until an element is clickable
+
+        :param css_element:
+        :param timeout:
+        :return:
+        """
+
+        WebDriverWait(self.driver, timeout).until(expected_conditions.element_to_be_clickable((By.CSS_SELECTOR, css_element)))