updated example

Author: RomanBachaloSigmaSoftware

app/docusign/__init__.py

@@ -1,2 +1,3 @@
 from .ds_client import DSClient
-from .utils import ds_token_ok, create_api_client, authenticate, ensure_manifest, get_example_by_number, get_manifest
+from .utils import ds_token_ok, create_api_client, authenticate, ensure_manifest, get_example_by_number, get_manifest, \
+    get_user_info

app/docusign/utils.py

@@ -142,3 +142,7 @@ def is_cfr(accessToken, accountId, basePath):
 
     return account_details.status21_cfr_part11
 
+def get_user_info(access_token, base_path, oauth_host_name):
+    api_client = create_api_client(base_path, access_token)
+    api_client.set_oauth_host_name(oauth_host_name)
+    return api_client.get_user_info(access_token)

app/eSignature/examples/eg043_shared_access.py

@@ -1,10 +1,9 @@
-from flask import session, request
-from docusign_esign import EnvelopesApi, UsersApi, AccountsApi, NewUsersDefinition, UserInformation,\
-    UserAuthorizationCreateRequest, AuthorizationUser
+import json
+
+from docusign_esign import EnvelopesApi, UsersApi, AccountsApi, NewUsersDefinition, UserInformation, \
+    UserAuthorizationCreateRequest, AuthorizationUser, ApiException
 from datetime import datetime, timedelta
 
-from ...consts import pattern
-from ...ds_config import DS_JWT
 from ...docusign import create_api_client
 
 
@@ -14,13 +13,35 @@ def create_agent(cls, args):
         api_client = create_api_client(base_path=args["base_path"], access_token=args["access_token"])
         users_api = UsersApi(api_client)
 
-        return users_api.create(args["account_id"], new_users_definition=cls.new_users_definition(args))
+        try:
+            users = users_api.list(args["account_id"], email=args["email"], status="Active")
+            if int(users.result_set_size) > 0:
+                return users.users[0]
+
+        except ApiException as err:
+            error_body_json = err and hasattr(err, "body") and err.body
+            error_body = json.loads(error_body_json)
+            error_code = error_body and "errorCode" in error_body and error_body["errorCode"]
+
+            if error_code != "USER_NOT_FOUND":
+                raise err
+
+        new_users = users_api.create(args["account_id"], new_users_definition=cls.new_users_definition(args))
+        return new_users.new_users[0]
 
     @classmethod
     def create_authorization(cls, args):
         api_client = create_api_client(base_path=args["base_path"], access_token=args["access_token"])
         accounts_api = AccountsApi(api_client)
 
+        authorizations = accounts_api.get_agent_user_authorizations(
+            args["account_id"],
+            args["agent_user_id"],
+            permissions="manage"
+        )
+        if int(authorizations.result_set_size) > 0:
+            return
+
         return accounts_api.create_user_authorization(
             args["account_id"],
             args["user_id"],
@@ -52,5 +73,5 @@ def get_envelopes(cls, args):
         api_client.set_default_header("X-DocuSign-Act-On-Behalf", args["user_id"])
         envelopes_api = EnvelopesApi(api_client)
 
-        from_date = (datetime.utcnow() - timedelta(days=30)).isoformat()
+        from_date = (datetime.utcnow() - timedelta(days=10)).isoformat()
         return envelopes_api.list_status_changes(account_id=args["account_id"], from_date=from_date)

app/eSignature/views/eg043_shared_access.py

@@ -6,7 +6,7 @@
 from flask import render_template, session, Blueprint, redirect, current_app, url_for, request
 
 from ..examples.eg043_shared_access import Eg043SharedAccessController
-from ...docusign import authenticate, ensure_manifest, get_example_by_number
+from ...docusign import authenticate, ensure_manifest, get_example_by_number, get_user_info
 from ...docusign.utils import ds_logout_internal, authenticate_agent
 from ...ds_config import DS_CONFIG, DS_JWT
 from ...error_handlers import process_error
@@ -26,7 +26,7 @@ def create_agent():
         "account_id": session["ds_account_id"],
         "base_path": session["ds_base_path"],
         "access_token": session["ds_access_token"],
-        "email": pattern.sub("", request.form.get("email")),
+        "email": request.form.get("email"),
         "user_name": pattern.sub("", request.form.get("user_name")),
         "activation": pattern.sub("", request.form.get("activation"))
     }
@@ -36,40 +36,63 @@ def create_agent():
     except ApiException as err:
         return process_error(err)
 
-    session["agent_user_id"] = results.new_users[0].user_id
+    session["agent_user_id"] = results.user_id
 
     example = get_example_by_number(session["manifest"], example_number, api)
     return render_template(
-        "eSignature/eg043_shared_access/eg043_shared_access_agent_created.html",
+        "example_done.html",
         title="Agent user created",
         message=example["ResultsPageText"],
-        json=json.dumps(json.dumps(results.to_dict()))
+        json=json.dumps(json.dumps(results.to_dict())),
+        redirect_url=f"/{eg}auth"
     )
 
 
 @eg043.route(f"/{eg}auth", methods=["GET"])
 @authenticate(eg=eg, api=api)
 @ensure_manifest(manifest_url=DS_CONFIG["example_manifest_url"])
 def create_authorization():
+    user_info = get_user_info(
+        session["ds_access_token"],
+        session["ds_base_path"],
+        DS_CONFIG["authorization_server"].replace("https://", "")
+    )
     args = {
         "account_id": session["ds_account_id"],
         "base_path": session["ds_base_path"],
         "access_token": session["ds_access_token"],
-        "user_id": DS_JWT["ds_impersonated_user_id"],
+        "user_id": user_info.sub,
         "agent_user_id": session["agent_user_id"]
     }
     try:
         # 2. Create the authorization for agent user
         Eg043SharedAccessController.create_authorization(args)
     except ApiException as err:
+        error_body_json = err and hasattr(err, "body") and err.body
+        error_body = json.loads(error_body_json)
+        error_code = error_body and "errorCode" in error_body and error_body["errorCode"]
+        if error_code == "USER_NOT_FOUND":
+            example = get_example_by_number(session["manifest"], example_number, api)
+            additional_page_data = next((p for p in example["AdditionalPage"] if p["Name"] == "user_not_found"),
+                                        None)
+            return render_template(
+                "example_done.html",
+                title="Agent user created",
+                message=additional_page_data["ResultsPageText"],
+                redirect_url=f"/{eg}auth"
+            )
+
         return process_error(err)
 
+    session["principal_user_id"] = user_info.sub
+
     example = get_example_by_number(session["manifest"], example_number, api)
     additional_page_data = next((p for p in example["AdditionalPage"] if p["Name"] == "authenticate_as_agent"), None)
     return render_template(
-        "eSignature/eg043_shared_access/eg043_shared_access_reauthenticate.html",
+        "example_done.html",
         title="Authenticate as the agent",
-        message=additional_page_data["ResultsPageText"]
+        message=additional_page_data["ResultsPageText"],
+        redirect_url=f"/{eg}reauthenticate"
     )
 
 
@@ -89,7 +112,7 @@ def list_envelopes():
         "account_id": session["ds_account_id"],
         "base_path": session["ds_base_path"],
         "access_token": session["ds_access_token"],
-        "user_id": DS_JWT["ds_impersonated_user_id"]
+        "user_id": session["principal_user_id"]
     }
     try:
         # 4. Retrieve the list of envelopes
@@ -124,7 +147,7 @@ def get_view():
     example = get_example_by_number(session["manifest"], example_number, api)
 
     return render_template(
-        "eSignature/eg043_shared_access/eg043_shared_access.html",
+        "eSignature/eg043_shared_access.html",
         title=example["ExampleName"],
         example=example,
         source_file="eg043_shared_access.py",

…3_shared_access/eg043_shared_access.html …ates/eSignature/eg043_shared_access.htmlapp/templates/eSignature/eg043_shared_access/eg043_shared_access.html renamed to app/templates/eSignature/eg043_shared_access.html app/templates/eSignature/eg043_shared_access/eg043_shared_access.html renamed to app/templates/eSignature/eg043_shared_access.html

@@ -17,6 +17,10 @@ <h2>{{ title }}</h2>
     </ul>
 {% endif %}
 
-<p><a href="/">Continue</a></p>
-  
+{% if redirect_url %}
+    <p><a href="{{ redirect_url }}">Continue</a></p>
+{% else %}
+    <p><a href="/">Continue</a></p>
+{% endif %}
+
 {% endblock %}