pyxecm 1.3.0__py3-none-any.whl → 1.5__py3-none-any.whl

pyxecm/otds.py

@@ -96,7 +96,7 @@ update_password_policy: updates the global password policy
 """
 
 __author__ = "Dr. Marc Diefenbruch"
-__copyright__ = "Copyright 2023, OpenText"
+__copyright__ = "Copyright 2024, OpenText"
 __credits__ = ["Kai-Philip Gatzweiler", "Jim Bennett"]
 __maintainer__ = "Dr. Marc Diefenbruch"
 __email__ = "mdiefenb@opentext.com"
@@ -128,6 +128,7 @@ class OTDS:
 
     _config = None
     _cookie = None
+    _otds_ticket = None
 
     def __init__(
         self,
@@ -212,6 +213,8 @@ class OTDS:
         """
         return self._config
 
+    # end method definition
+
     def cookie(self) -> dict:
         """Returns the login cookie of OTDS.
            This is set by the authenticate() method
@@ -221,6 +224,8 @@ class OTDS:
         """
         return self._cookie
 
+    # end method definition
+
     def credentials(self) -> dict:
         """Returns the credentials (username + password)
 
@@ -232,6 +237,8 @@ class OTDS:
             "password": self.config()["password"],
         }
 
+    # end method definition
+
     def base_url(self) -> str:
         """Returns the base URL of OTDS
 
@@ -240,6 +247,8 @@ class OTDS:
         """
         return self.config()["baseUrl"]
 
+    # end method definition
+
     def rest_url(self) -> str:
         """Returns the REST URL of OTDS
 
@@ -248,6 +257,8 @@ class OTDS:
         """
         return self.config()["restUrl"]
 
+    # end method definition
+
     def credential_url(self) -> str:
         """Returns the Credentials URL of OTDS
 
@@ -256,6 +267,8 @@ class OTDS:
         """
         return self.config()["credentialUrl"]
 
+    # end method definition
+
     def auth_handler_url(self) -> str:
         """Returns the Auth Handler URL of OTDS
 
@@ -264,6 +277,8 @@ class OTDS:
         """
         return self.config()["authHandlerUrl"]
 
+    # end method definition
+
     def partition_url(self) -> str:
         """Returns the Partition URL of OTDS
 
@@ -272,6 +287,8 @@ class OTDS:
         """
         return self.config()["partitionUrl"]
 
+    # end method definition
+
     def access_role_url(self) -> str:
         """Returns the Access Role URL of OTDS
 
@@ -280,6 +297,8 @@ class OTDS:
         """
         return self.config()["accessRoleUrl"]
 
+    # end method definition
+
     def oauth_client_url(self) -> str:
         """Returns the OAuth Client URL of OTDS
 
@@ -288,6 +307,8 @@ class OTDS:
         """
         return self.config()["oauthClientUrl"]
 
+    # end method definition
+
     def resource_url(self) -> str:
         """Returns the Resource URL of OTDS
 
@@ -296,6 +317,8 @@ class OTDS:
         """
         return self.config()["resourceUrl"]
 
+    # end method definition
+
     def license_url(self) -> str:
         """Returns the License URL of OTDS
 
@@ -304,6 +327,8 @@ class OTDS:
         """
         return self.config()["licenseUrl"]
 
+    # end method definition
+
     def token_url(self) -> str:
         """Returns the Token URL of OTDS
 
@@ -312,6 +337,8 @@ class OTDS:
         """
         return self.config()["tokenUrl"]
 
+    # end method definition
+
     def users_url(self) -> str:
         """Returns the Users URL of OTDS
 
@@ -320,6 +347,8 @@ class OTDS:
         """
         return self.config()["usersUrl"]
 
+    # end method definition
+
     def groups_url(self) -> str:
         """Returns the Groups URL of OTDS
 
@@ -328,6 +357,8 @@ class OTDS:
         """
         return self.config()["groupsUrl"]
 
+    # end method definition
+
     def system_config_url(self) -> str:
         """Returns the System Config URL of OTDS
 
@@ -336,6 +367,8 @@ class OTDS:
         """
         return self.config()["systemConfigUrl"]
 
+    # end method definition
+
     def consolidation_url(self) -> str:
         """Returns the Consolidation URL of OTDS
 
@@ -344,6 +377,8 @@ class OTDS:
         """
         return self.config()["consolidationUrl"]
 
+    # end method definition
+
     def parse_request_response(
         self,
         response_object: object,
@@ -395,11 +430,15 @@ class OTDS:
 
         # Already authenticated and session still valid?
         if self._cookie and not revalidate:
+            logger.debug(
+                "Session still valid - return existing cookie -> %s",
+                str(self._cookie),
+            )
             return self._cookie
 
         otds_ticket = "NotSet"
 
-        logger.info("Requesting OTDS ticket from -> %s", self.credential_url())
+        logger.debug("Requesting OTDS ticket from -> %s", self.credential_url())
 
         response = None
         try:
@@ -424,12 +463,15 @@ class OTDS:
                 return None
             else:
                 otds_ticket = authenticate_dict["ticket"]
-                logger.info("Ticket -> %s", otds_ticket)
+                logger.debug("Ticket -> %s", otds_ticket)
         else:
             logger.error("Failed to request an OTDS ticket; error -> %s", response.text)
             return None
 
+        # Store authentication ticket:
         self._cookie = {"OTDSTicket": otds_ticket}
+        self._otds_ticket = otds_ticket
+
         return self._cookie
 
     # end method definition
@@ -454,7 +496,7 @@ class OTDS:
             dict: Request response (dictionary) or None if the REST call fails
         """
 
-        logger.info("Reading license file -> %s...", path_to_license_file)
+        logger.debug("Reading license file -> %s...", path_to_license_file)
         try:
             with open(path_to_license_file, "rt", encoding="UTF-8") as license_file:
                 license_content = license_file.read()
@@ -483,14 +525,14 @@ class OTDS:
             if existing_license:
                 request_url += "/" + existing_license[0]["id"]
             else:
-                logger.info(
+                logger.debug(
                     "No existing license for resource -> %s found - adding a new license...",
                     resource_id,
                 )
                 # change strategy to create a new license:
                 update = False
 
-        logger.info(
+        logger.debug(
             "Adding product license -> %s for product -> %s to resource -> %s; calling -> %s",
             path_to_license_file,
             product_description,
@@ -522,8 +564,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -566,7 +608,7 @@ class OTDS:
             + "&validOnly=false"
         )
 
-        logger.info(
+        logger.debug(
             "Get license for resource -> %s; calling -> %s", resource_id, request_url
         )
 
@@ -585,8 +627,8 @@ class OTDS:
                 return response_dict["licenseObjects"]["_licenses"]
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -611,7 +653,7 @@ class OTDS:
 
         request_url = "{}/{}".format(self.license_url(), license_id)
 
-        logger.info(
+        logger.debug(
             "Deleting product license -> %s from resource -> %s; calling -> %s",
             license_id,
             resource_id,
@@ -630,8 +672,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -699,7 +741,7 @@ class OTDS:
 
         request_url = self.license_url() + "/object/" + license_location
 
-        logger.info(
+        logger.debug(
             "Assign license feature -> %s of license -> %s associated with resource -> %s to user -> %s; calling -> %s",
             license_feature,
             license_location,
@@ -718,7 +760,7 @@ class OTDS:
                 timeout=None,
             )
             if response.ok:
-                logger.info(
+                logger.debug(
                     "Added license feature -> %s for user -> %s",
                     license_feature,
                     user_id,
@@ -726,8 +768,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -804,7 +846,7 @@ class OTDS:
 
         request_url = self.license_url() + "/object/" + license_location
 
-        logger.info(
+        logger.debug(
             "Assign license feature -> %s of license -> %s associated with resource -> %s to partition -> %s; calling -> %s",
             license_feature,
             license_location,
@@ -823,7 +865,7 @@ class OTDS:
                 timeout=None,
             )
             if response.ok:
-                logger.info(
+                logger.debug(
                     "Added license feature -> %s for partition -> %s",
                     license_feature,
                     partition_name,
@@ -831,8 +873,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -917,7 +959,7 @@ class OTDS:
             + license_feature
         )
 
-        logger.info(
+        logger.debug(
             "Get licensed objects for license -> %s and license feature -> %s associated with resource -> %s; calling -> %s",
             license_name,
             license_feature,
@@ -937,8 +979,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1094,7 +1136,7 @@ class OTDS:
 
         request_url = self.partition_url()
 
-        logger.info(
+        logger.debug(
             "Adding user partition -> %s (%s); calling -> %s",
             name,
             description,
@@ -1114,8 +1156,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1141,7 +1183,7 @@ class OTDS:
 
         request_url = "{}/{}".format(self.config()["partitionUrl"], name)
 
-        logger.info("Getting user partition -> %s; calling -> %s", name, request_url)
+        logger.debug("Getting user partition -> %s; calling -> %s", name, request_url)
 
         retries = 0
         while True:
@@ -1155,8 +1197,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 if show_error:
@@ -1205,7 +1247,7 @@ class OTDS:
 
         request_url = self.users_url()
 
-        logger.info(
+        logger.debug(
             "Adding user -> %s to partition -> %s; calling -> %s",
             name,
             partition,
@@ -1226,8 +1268,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1252,7 +1294,7 @@ class OTDS:
 
         request_url = self.users_url() + "/" + user_id + "@" + partition
 
-        logger.info(
+        logger.debug(
             "Get user -> %s in partition -> %s; calling -> %s",
             user_id,
             partition,
@@ -1271,8 +1313,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1309,14 +1351,14 @@ class OTDS:
             request_url += "?{}".format(encodedQuery)
 
         if partition:
-            logger.info(
+            logger.debug(
                 "Get all users in partition -> %s (limit -> %s); calling -> %s",
                 partition,
                 limit,
                 request_url,
             )
         else:
-            logger.info(
+            logger.debug(
                 "Get all users (limit -> %s); calling -> %s",
                 limit,
                 request_url,
@@ -1334,8 +1376,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 if partition:
@@ -1382,7 +1424,7 @@ class OTDS:
 
         request_url = self.users_url() + "/" + user_id
 
-        logger.info(
+        logger.debug(
             "Update user -> %s attribute -> %s to value -> %s; calling -> %s",
             user_id,
             attribute_name,
@@ -1403,9 +1445,12 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
+            elif response.status_code == 404:
+                logger.warning("User does not exist -> %s", user_id)
+                return None
             else:
                 logger.error(
                     "Failed to update user -> %s; error -> %s (%s)",
@@ -1429,7 +1474,7 @@ class OTDS:
 
         request_url = self.users_url() + "/" + user_id + "@" + partition
 
-        logger.info(
+        logger.debug(
             "Delete user -> %s in partition -> %s; calling -> %s",
             user_id,
             partition,
@@ -1448,8 +1493,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1476,7 +1521,7 @@ class OTDS:
 
         request_url = "{}/{}/password".format(self.users_url(), user_id)
 
-        logger.info(
+        logger.debug(
             "Resetting password for user -> %s; calling -> %s", user_id, request_url
         )
 
@@ -1493,8 +1538,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1526,7 +1571,7 @@ class OTDS:
 
         request_url = self.groups_url()
 
-        logger.info(
+        logger.debug(
             "Adding group -> %s to partition -> %s; calling -> %s",
             name,
             partition,
@@ -1547,8 +1592,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1588,7 +1633,7 @@ class OTDS:
 
         request_url = self.groups_url() + "/" + group
 
-        logger.info("Get group -> %s; calling -> %s", group, request_url)
+        logger.debug("Get group -> %s; calling -> %s", group, request_url)
 
         retries = 0
         while True:
@@ -1602,8 +1647,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1630,7 +1675,7 @@ class OTDS:
 
         request_url = self.users_url() + "/" + user + "/memberof"
 
-        logger.info(
+        logger.debug(
             "Adding user -> %s to group -> %s; calling -> %s", user, group, request_url
         )
 
@@ -1647,8 +1692,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1676,7 +1721,7 @@ class OTDS:
 
         request_url = self.groups_url() + "/" + group + "/memberof"
 
-        logger.info(
+        logger.debug(
             "Adding group -> %s to parent group -> %s; calling -> %s",
             group,
             parent_group,
@@ -1697,8 +1742,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1743,7 +1788,7 @@ class OTDS:
 
         request_url = self.config()["resourceUrl"]
 
-        logger.info(
+        logger.debug(
             "Adding resource -> %s (%s); calling -> %s", name, description, request_url
         )
 
@@ -1760,8 +1805,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1786,7 +1831,7 @@ class OTDS:
 
         request_url = "{}/{}".format(self.config()["resourceUrl"], name)
 
-        logger.info("Retrieving resource -> %s; calling -> %s", name, request_url)
+        logger.debug("Retrieving resource -> %s; calling -> %s", name, request_url)
 
         retries = 0
         while True:
@@ -1800,8 +1845,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 # We don't necessarily want to log an error as this function
@@ -1813,7 +1858,7 @@ class OTDS:
                         response.text,
                     )
                 else:
-                    logger.info("Resource -> %s not found.", name)
+                    logger.debug("Resource -> %s not found.", name)
                 return None
 
     # end method definition
@@ -1833,7 +1878,7 @@ class OTDS:
 
         request_url = "{}/{}".format(self.config()["resourceUrl"], name)
 
-        logger.info("Updating resource -> %s; calling -> %s", name, request_url)
+        logger.debug("Updating resource -> %s; calling -> %s", name, request_url)
 
         retries = 0
         while True:
@@ -1848,8 +1893,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 # We don't necessarily want to log an error as this function
@@ -1861,7 +1906,7 @@ class OTDS:
                         response.text,
                     )
                 else:
-                    logger.info("Resource -> %s not found.", name)
+                    logger.debug("Resource -> %s not found.", name)
                 return None
 
     # end method definition
@@ -1879,7 +1924,7 @@ class OTDS:
 
         request_url = "{}/{}/activate".format(self.config()["resourceUrl"], resource_id)
 
-        logger.info(
+        logger.debug(
             "Activating resource -> %s; calling -> %s", resource_id, request_url
         )
 
@@ -1896,8 +1941,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1921,7 +1966,7 @@ class OTDS:
 
         request_url = self.config()["accessRoleUrl"]
 
-        logger.info("Retrieving access roles; calling -> %s", request_url)
+        logger.debug("Retrieving access roles; calling -> %s", request_url)
 
         retries = 0
         while True:
@@ -1935,8 +1980,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -1959,7 +2004,7 @@ class OTDS:
 
         request_url = self.config()["accessRoleUrl"] + "/" + access_role
 
-        logger.info(
+        logger.debug(
             "Retrieving access role -> %s; calling -> %s", access_role, request_url
         )
 
@@ -1975,8 +2020,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2012,7 +2057,7 @@ class OTDS:
             self.config()["accessRoleUrl"], access_role
         )
 
-        logger.info(
+        logger.debug(
             "Add user partition -> %s to access role -> %s; calling -> %s",
             partition,
             access_role,
@@ -2031,8 +2076,8 @@ class OTDS:
             if response.ok:
                 return True
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2071,14 +2116,14 @@ class OTDS:
         accessRoleUsers = accessRolesGetResponse["accessRoleMembers"]["users"]
         for user in accessRoleUsers:
             if user["displayName"] == user_id:
-                logger.info(
+                logger.debug(
                     "User -> %s already added to access role -> %s",
                     user_id,
                     access_role,
                 )
                 return True
 
-        logger.info(
+        logger.debug(
             "User -> %s is not yet in access role -> %s - adding...",
             user_id,
             access_role,
@@ -2091,7 +2136,7 @@ class OTDS:
             self.config()["accessRoleUrl"], access_role
         )
 
-        logger.info(
+        logger.debug(
             "Add user -> %s to access role -> %s; calling -> %s",
             user_id,
             access_role,
@@ -2110,8 +2155,8 @@ class OTDS:
             if response.ok:
                 return True
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2149,12 +2194,12 @@ class OTDS:
         accessRoleGroups = accessRolesGetResponse["accessRoleMembers"]["groups"]
         for accessRoleGroup in accessRoleGroups:
             if accessRoleGroup["name"] == group:
-                logger.info(
+                logger.debug(
                     "Group -> %s already added to access role -> %s", group, access_role
                 )
                 return True
 
-        logger.info(
+        logger.debug(
             "Group -> %s is not yet in access role -> %s - adding...",
             group,
             access_role,
@@ -2167,7 +2212,7 @@ class OTDS:
             self.config()["accessRoleUrl"], access_role
         )
 
-        logger.info(
+        logger.debug(
             "Add group -> %s to access role -> %s; calling -> %s",
             group,
             access_role,
@@ -2186,8 +2231,8 @@ class OTDS:
             if response.ok:
                 return True
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2229,7 +2274,7 @@ class OTDS:
 
         request_url = "{}/{}/attributes".format(self.config()["accessRoleUrl"], name)
 
-        logger.info(
+        logger.debug(
             "Update access role -> %s with attributes -> %s; calling -> %s",
             name,
             accessRolePutBodyJson,
@@ -2249,8 +2294,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2285,7 +2330,7 @@ class OTDS:
         request_url = "{}/system_attributes".format(self.config()["systemConfigUrl"])
 
         if description:
-            logger.info(
+            logger.debug(
                 "Add system attribute -> %s (%s) with value -> %s; calling -> %s",
                 name,
                 description,
@@ -2293,7 +2338,7 @@ class OTDS:
                 request_url,
             )
         else:
-            logger.info(
+            logger.debug(
                 "Add system attribute -> %s with value -> %s; calling -> %s",
                 name,
                 value,
@@ -2313,8 +2358,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2339,7 +2384,7 @@ class OTDS:
 
         request_url = "{}/whitelist".format(self.config()["systemConfigUrl"])
 
-        logger.info("Retrieving trusted sites; calling -> %s", request_url)
+        logger.debug("Retrieving trusted sites; calling -> %s", request_url)
 
         retries = 0
         while True:
@@ -2353,8 +2398,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2388,7 +2433,7 @@ class OTDS:
 
         request_url = "{}/whitelist".format(self.config()["systemConfigUrl"])
 
-        logger.info("Add trusted site -> %s; calling -> %s", trusted_site, request_url)
+        logger.debug("Add trusted site -> %s; calling -> %s", trusted_site, request_url)
 
         response = requests.put(
             url=request_url,
@@ -2476,7 +2521,7 @@ class OTDS:
 
         request_url = "{}/audit".format(self.config()["systemConfigUrl"])
 
-        logger.info("Enable audit; calling -> %s", request_url)
+        logger.debug("Enable audit; calling -> %s", request_url)
 
         response = requests.put(
             url=request_url,
@@ -2597,7 +2642,7 @@ class OTDS:
 
         request_url = self.oauth_client_url()
 
-        logger.info(
+        logger.debug(
             "Adding oauth client -> %s (%s); calling -> %s",
             description,
             client_id,
@@ -2617,8 +2662,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2643,7 +2688,7 @@ class OTDS:
 
         request_url = "{}/{}".format(self.oauth_client_url(), client_id)
 
-        logger.info("Get oauth client -> %s; calling -> %s", client_id, request_url)
+        logger.debug("Get oauth client -> %s; calling -> %s", client_id, request_url)
 
         retries = 0
         while True:
@@ -2657,8 +2702,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 if show_error:
@@ -2688,7 +2733,7 @@ class OTDS:
 
         request_url = "{}/{}".format(self.oauth_client_url(), client_id)
 
-        logger.info(
+        logger.debug(
             "Update OAuth client -> %s with -> %s; calling -> %s",
             client_id,
             updates,
@@ -2708,8 +2753,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2733,7 +2778,7 @@ class OTDS:
 
         request_url = self.config()["accessRoleUrl"] + "/" + access_role_name
 
-        logger.info(
+        logger.debug(
             "Get access role -> %s; calling -> %s", access_role_name, request_url
         )
 
@@ -2750,8 +2795,8 @@ class OTDS:
                 break
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -2815,7 +2860,7 @@ class OTDS:
         )
 
         if response.ok:
-            logger.info(
+            logger.debug(
                 "OauthClients partition successfully added to access role -> %s",
                 access_role_name,
             )
@@ -2917,7 +2962,7 @@ class OTDS:
 
         request_url = "{}/{}".format(self.auth_handler_url(), name)
 
-        logger.info(
+        logger.debug(
             "Getting authentication handler -> %s; calling -> %s", name, request_url
         )
 
@@ -2933,8 +2978,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 if show_error:
@@ -3062,12 +3107,214 @@ class OTDS:
                     "_description": "Specifies the SAML binding to use for the response to an AuthnRequest",
                     "_value": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
                 },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim1",
+                    "_name": "Claim 1",
+                    "_description": "SAML attribute/claim that should be mapped to an OTDS user attribute. This value is case sensitive. Note that mapped claims are only relevant if the corresponding account is auto-provisioned in OTDS. See the Administration Guide for details.",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute1",
+                    "_name": "OTDS Attribute 1",
+                    "_description": "OTDS user attribute to which the SAML attribute/claim should be mapped",
+                    "_value": "mail",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim2",
+                    "_name": "Claim 2",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute2",
+                    "_name": "OTDS Attribute 2",
+                    "_value": "givenName",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim3",
+                    "_name": "Claim 3",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute3",
+                    "_name": "OTDS Attribute 3",
+                    "_value": "sn",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim4",
+                    "_name": "Claim 4",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute4",
+                    "_name": "OTDS Attribute 4",
+                    "_value": "displayName",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim5",
+                    "_name": "Claim 5",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute5",
+                    "_name": "OTDS Attribute 5",
+                    "_value": "oTStreetAddress",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim6",
+                    "_name": "Claim 6",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/locality",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute6",
+                    "_name": "OTDS Attribute 6",
+                    "_value": "l",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim7",
+                    "_name": "Claim 7",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/stateorprovince",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute7",
+                    "_name": "OTDS Attribute 7",
+                    "_value": "st",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim8",
+                    "_name": "Claim 8",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/postalcode",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute8",
+                    "_name": "OTDS Attribute 8",
+                    "_value": "postalCode",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim9",
+                    "_name": "Claim 9",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute9",
+                    "_name": "OTDS Attribute 9",
+                    "_value": "countryName",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim10",
+                    "_name": "Claim 10",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/otherphone",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute10",
+                    "_name": "OTDS Attribute 10",
+                    "_value": "oTTelephoneNumber",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim11",
+                    "_name": "Claim 11",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/homephone",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute11",
+                    "_name": "OTDS Attribute 11",
+                    "_value": "homePhone",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim12",
+                    "_name": "Claim 12",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/dateofbirth",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute12",
+                    "_name": "OTDS Attribute 12",
+                    "_value": "birthDate",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim13",
+                    "_name": "Claim 13",
+                    "_value": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/gender",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute13",
+                    "_name": "OTDS Attribute 13",
+                    "_value": "gender",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim14",
+                    "_name": "Claim 14",
+                    "_value": "",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute14",
+                    "_name": "OTDS Attribute 14",
+                    "_value": "",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim15",
+                    "_name": "Claim 15",
+                    "_value": "http://schemas.xmlsoap.org/claims/Group",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute15",
+                    "_name": "OTDS Attribute 15",
+                    "_value": "oTMemberOf",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim16",
+                    "_name": "Claim 16",
+                    "_value": "http://schemas.xmlsoap.org/claims/Department",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute16",
+                    "_name": "OTDS Attribute 16",
+                    "_value": "oTDepartment",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim17",
+                    "_name": "Claim 17",
+                    "_value": "http://schemas.xmlsoap.org/claims/Title",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute17",
+                    "_name": "OTDS Attribute 17",
+                    "_value": "title",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim18",
+                    "_name": "Claim 18",
+                    "_value": "",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute18",
+                    "_name": "OTDS Attribute 18",
+                    "_value": "",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim19",
+                    "_name": "Claim 19",
+                    "_value": "http://schemas.microsoft.com/ws/2008/06/identity/claims/role",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute19",
+                    "_name": "OTDS Attribute 19",
+                    "_value": "oTMemberOf",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claim20",
+                    "_name": "Claim 20",
+                    "_value": "",
+                },
+                {
+                    "_key": "com.opentext.otds.as.drivers.saml.claimAttribute20",
+                    "_name": "OTDS Attribute 20",
+                    "_value": "",
+                },
             ],
         }
 
         request_url = self.auth_handler_url()
 
-        logger.info(
+        logger.debug(
             "Adding SAML auth handler -> %s (%s); calling -> %s",
             name,
             description,
@@ -3087,8 +3334,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -3188,7 +3435,7 @@ class OTDS:
         # 2. Create the auth handler in OTDS
         request_url = self.auth_handler_url()
 
-        logger.info(
+        logger.debug(
             "Adding SAP auth handler -> %s (%s); calling -> %s",
             name,
             description,
@@ -3214,7 +3461,7 @@ class OTDS:
         # 3. Upload the certificate file:
 
         # Check that the certificate (PSE) file is readable:
-        logger.info("Reading certificate file -> %s...", certificate_file)
+        logger.debug("Reading certificate file -> %s...", certificate_file)
         try:
             # PSE files are binary - so we need to open with "rb":
             with open(certificate_file, "rb") as certFile:
@@ -3238,21 +3485,21 @@ class OTDS:
             certContentDecoded = base64.b64decode(certContent, validate=True)
             certContentEncoded = base64.b64encode(certContentDecoded).decode("utf-8")
             if certContentEncoded == certContent.decode("utf-8"):
-                logger.info(
+                logger.debug(
                     "Certificate file -> %s is base64 encoded", certificate_file
                 )
                 cert_file_encoded = True
             else:
                 cert_file_encoded = False
         except TypeError:
-            logger.info(
+            logger.debug(
                 "Certificate file -> %s is not base64 encoded", certificate_file
             )
             cert_file_encoded = False
 
         if cert_file_encoded:
             certificate_file = "/tmp/" + os.path.basename(certificate_file)
-            logger.info("Writing decoded certificate file -> %s...", certificate_file)
+            logger.debug("Writing decoded certificate file -> %s...", certificate_file)
             try:
                 # PSE files need to be binary - so we need to open with "wb":
                 with open(certificate_file, "wb") as certFile:
@@ -3281,7 +3528,7 @@ class OTDS:
 
         request_url = self.auth_handler_url() + "/" + name + "/files"
 
-        logger.info(
+        logger.debug(
             "Uploading certificate file -> %s for SAP auth handler -> %s (%s); calling -> %s",
             certificate_file,
             name,
@@ -3697,7 +3944,7 @@ class OTDS:
 
         request_url = self.auth_handler_url()
 
-        logger.info(
+        logger.debug(
             "Adding OAuth auth handler -> %s (%s); calling -> %s",
             name,
             description,
@@ -3717,8 +3964,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -3759,7 +4006,7 @@ class OTDS:
 
         request_url = "{}".format(self.consolidation_url())
 
-        logger.info(
+        logger.debug(
             "Consolidation of resource -> %s; calling -> %s", resource_dn, request_url
         )
 
@@ -3776,8 +4023,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -3817,7 +4064,7 @@ class OTDS:
 
         request_url = "{}/{}/impersonation".format(self.resource_url(), resource_name)
 
-        logger.info(
+        logger.debug(
             "Impersonation settings for resource -> %s; calling -> %s",
             resource_name,
             request_url,
@@ -3836,8 +4083,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -3876,7 +4123,7 @@ class OTDS:
 
         request_url = "{}/{}/impersonation".format(self.oauth_client_url(), client_id)
 
-        logger.info(
+        logger.debug(
             "Impersonation settings for OAuth Client -> %s; calling -> %s",
             client_id,
             request_url,
@@ -3895,8 +4142,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -3940,7 +4187,7 @@ class OTDS:
 
         request_url = "{}/passwordpolicy".format(self.config()["systemConfigUrl"])
 
-        logger.info("Getting password policy; calling -> %s", request_url)
+        logger.debug("Getting password policy; calling -> %s", request_url)
 
         retries = 0
         while True:
@@ -3954,8 +4201,8 @@ class OTDS:
                 return self.parse_request_response(response)
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(
@@ -4001,7 +4248,7 @@ class OTDS:
 
         request_url = "{}/passwordpolicy".format(self.config()["systemConfigUrl"])
 
-        logger.info(
+        logger.debug(
             "Update password policy with these new values -> %s; calling -> %s",
             update_values,
             request_url,
@@ -4020,8 +4267,8 @@ class OTDS:
                 return True
             # Check if Session has expired - then re-authenticate and try once more
             elif response.status_code == 401 and retries == 0:
-                logger.warning("Session has expired - try to re-authenticate...")
-                self.authenticate(True)
+                logger.debug("Session has expired - try to re-authenticate...")
+                self.authenticate(revalidate=True)
                 retries += 1
             else:
                 logger.error(