Switched basic auth to jwt

Author: chris-adam

CHANGES.rst

@@ -7,3 +7,5 @@ Changelog
 
 - Initial release.
   [sgeulette, gbastien, aduchene]
+- Switched basic auth to jwt.
+  [chris-adam]

setup.py

@@ -56,7 +56,7 @@
         "collective.compoundcriterion",
         "collective.eeafaceted.z3ctable",
         "eea.facetednavigation",
-        "imio.helpers",
+        "imio.helpers>1.3.8",
         "imio.prettylink",
         "imio.pyutils",
         # 'z3c.jbot',

src/imio/esign/__init__.py

@@ -11,7 +11,6 @@
 _ = MessageFactory("imio.esign")
 PLONE_VERSION = int(api.env.plone_version()[0])
 ESIGN_ROOT_URL = os.getenv("ESIGN_ROOT_URL", "http://127.0.0.1:8000")
-ESIGN_CREDENTIALS = os.getenv("ESIGN_CREDENTIALS", "")
 manage_session_perm = "imio.esign: Manage Sessions"
 
 

src/imio/esign/browser/views.py

@@ -2,7 +2,6 @@
 from datetime import datetime
 from datetime import timedelta
 from imio.esign import _
-from imio.esign import ESIGN_CREDENTIALS
 from imio.esign import ESIGN_ROOT_URL
 from imio.esign.browser.table import external_session_link
 from imio.esign.browser.table import SessionsTable
@@ -131,7 +130,6 @@ def __call__(self, session_id=None):
             return self.context.absolute_url() + "/@@esign-sessions-listing"
         resp = create_external_session(
             int(session_id),
-            b64_cred=ESIGN_CREDENTIALS,
             esign_root_url=ESIGN_ROOT_URL,
         )
         if resp == "_session_not_found_":

src/imio/esign/utils.py

@@ -2,13 +2,12 @@
 from datetime import datetime
 from datetime import timedelta
 from imio.esign import _tr as _
-from imio.esign import ESIGN_CREDENTIALS
 from imio.esign import ESIGN_ROOT_URL
 from imio.esign.interfaces import IContextUidProvider
 from imio.helpers.content import uuidsToObjects
 from imio.helpers.content import uuidToObject
 from imio.helpers.transmogrifier import get_correct_id
-from imio.pyutils.system import post_request
+from imio.helpers.ws import get_auth_token
 from imio.pyutils.utils import shortuid_encode_id
 from os import path
 from persistent.list import PersistentList
@@ -19,6 +18,7 @@
 
 import json
 import logging
+import requests
 
 
 logger = logging.getLogger("imio.esign")
@@ -86,11 +86,10 @@ def add_files_to_session(
     return session_id, session
 
 
-def create_external_session(session_id, b64_cred=None, esign_root_url=None):
+def create_external_session(session_id, esign_root_url=None):
     """Create a session with the given signers and files.
 
     :param session_id: internal session id
-    :param b64_cred: base64 encoded credentials for authentication
     :param esign_root_url: the root URL for the e-sign service, if not provided it will use the default ESIGN_ROOT_URL
     :return: session information
     """
@@ -145,17 +144,21 @@ def create_external_session(session_id, b64_cred=None, esign_root_url=None):
             "sealCode": seal_code,
         }
 
+    # files_payload = {filename: file_content for z, filename, file_content, uid in files}
     files_payload = [("files", (filename, file_content)) for z, filename, file_content, uid in files]
 
     # Headers avec autorisation
-    headers = {"accept": "application/json"}
-    b64_cred = b64_cred or ESIGN_CREDENTIALS
-    if b64_cred:
-        headers["Authorization"] = "Basic {}".format(b64_cred)
+    headers = {
+        "accept": "application/json",
+        "Authorization": "Bearer %s" % get_auth_token(),
+    }
 
     logger.info(data_payload)
-    ret = post_request(
-        session_url, data={"data": json.dumps(data_payload, default=vars)}, headers=headers, files=files_payload
+    ret = requests.post(
+        session_url,
+        headers=headers,
+        data={"data": json.dumps(data_payload, default=vars)},
+        files=files_payload,
     )
     if ret.status_code == 200:
         session["state"] = "sent"