fixing merge conflicts and automatic org id problem

paigesrossi · paigesrossi · commit b0b048de05fd · 2021-08-24T13:44:13.000-07:00
diff --git a/app/__init__.py b/app/__init__.py
@@ -57,7 +57,10 @@
     app.register_blueprint(monitor_examples.eg001)
 
 elif EXAMPLES_API_TYPE["Admin"]:
+    app.register_blueprint(admin_examples.eg001)
     app.register_blueprint(admin_examples.eg002)
+    app.register_blueprint(admin_examples.eg003)
+    app.register_blueprint(admin_examples.eg004)
     app.register_blueprint(admin_examples.eg005)
 
 elif EXAMPLES_API_TYPE["Click"]:
@@ -66,11 +69,6 @@
     app.register_blueprint(click_examples.eg003)
     app.register_blueprint(click_examples.eg004)
     app.register_blueprint(click_examples.eg005)
-
-elif EXAMPLES_API_TYPE["Admin"]:
-    app.register_blueprint(admin_examples.eg001)
-    app.register_blueprint(admin_examples.eg003)
-    app.register_blueprint(admin_examples.eg004)
     
 else:
     app.register_blueprint(examples.eg001)
diff --git a/app/admin/examples/eg001_create_a_new_user/controller.py b/app/admin/examples/eg001_create_a_new_user/controller.py
@@ -2,7 +2,7 @@
 from docusign_esign import AccountsApi, ApiClient, GroupsApi
 from flask import session
 
-from app.admin.utils import create_admin_api_client
+from app.admin.utils import create_admin_api_client, get_organization_id
 from app.consts import pattern
 from app.ds_config import DS_CONFIG
 
@@ -15,6 +15,7 @@ def get_args(request):
         Get request and session arguments
         """
 
+        organization_id = get_organization_id()
         return {
             "account_id": session["ds_account_id"], # Represents your {ACCOUNT_ID}
             "access_token": session["ds_access_token"], # Represents your {ACCESS_TOKEN}
@@ -23,7 +24,8 @@ def get_args(request):
             "last_name": request.form.get("last_name"),
             "user_email": request.form.get("user_email"),
             "permission_profile": request.form.get("profile_id"),
-            "group": request.form.get("group_id")
+            "group": request.form.get("group_id"),
+            "organization_id": organization_id
         }
 
     @staticmethod
@@ -121,7 +123,7 @@ def worker(self, args):
 
         # 4. Creates a user using a method from the user API
         response = user_api.create_user(
-            DS_CONFIG["organization_id"],
+            args["organization_id"],
             request_body
         )
         return response
diff --git a/app/admin/examples/eg003_bulk_export_user_data/controller.py b/app/admin/examples/eg003_bulk_export_user_data/controller.py
@@ -2,7 +2,7 @@
 from docusign_admin.apis import BulkExportsApi
 from flask import session
 
-from app.admin.utils import create_admin_api_client
+from app.admin.utils import create_admin_api_client, get_organization_id
 from app.ds_config import DS_CONFIG
 
 
diff --git a/app/admin/examples/eg004_add_users_via_bulk_import/controller.py b/app/admin/examples/eg004_add_users_via_bulk_import/controller.py
@@ -2,7 +2,7 @@
 from docusign_admin.apis import BulkImportsApi
 from flask import session
 
-from app.admin.utils import create_admin_api_client
+from app.admin.utils import create_admin_api_client, get_organization_id
 from app.ds_config import DS_CONFIG
 
 
@@ -20,6 +20,9 @@ def worker(request):
         5. Returns the response from the create_bulk_import_add_users_request method
         """
 
+        # Get organization ID
+        organization_id = get_organization_id()
+
         # 1. Create the export API object
         api_client = create_admin_api_client(
             access_token=session["ds_access_token"]
@@ -40,7 +43,7 @@ def worker(request):
 
         # 5. Returns the response from the create_bulk_import_add_users_request method
         return export_api.create_bulk_import_add_users_request(
-            DS_CONFIG["organization_id"],
+            organization_id,
             csv_file_path
         )
 
diff --git a/app/admin/utils.py b/app/admin/utils.py
@@ -26,6 +26,7 @@ def get_organization_id():
 
     accounts_api = AccountsApi(api_client)
     organizations = accounts_api.get_organizations()
+    print(organizations)
     org_dict = organizations.to_dict()
     first_org = org_dict["organizations"][0]
     org_id = first_org["id"]
