Merge pull request #617 from ddybvig-perf/dale-sign-bugfix

Sign post-sync bug fix - email casing difference between umapi and sign users

Author: adorton-adobe

tests/test_post_sync.py

@@ -1,4 +1,11 @@
+import json
+from unittest import mock
+
 import pytest
+from requests import Response
+
+from user_sync.post_sync import PostSyncConnector
+from user_sync.post_sync.connectors.sign_sync import SignClient, SignConnector
 from user_sync.post_sync.manager import PostSyncData
 
 
@@ -51,3 +58,41 @@ def test_add_remove_groups(example_user):
     delta_groups = example_user['groups'] | set(groups_add)
     delta_groups -= set(groups_remove)
     assert post_sync_data.umapi_data[None][email_id]['groups'] == delta_groups
+
+
+@mock.patch('requests.get')
+@mock.patch('user_sync.post_sync.connectors.sign_sync.client.SignClient._init')
+def test_update_sign_users(mock_client, mock_get, example_user):
+    def mock_response(data):
+        r = Response()
+        r.status_code = 200
+        r._content = json.dumps(data).encode()
+        return r
+    user_list = mock_response({'userInfoList': [{"userId": "123"}]})
+    user_one = mock_response({'userStatus': 'ACTIVE', 'email': '[email protected]'})
+    mock_get.side_effect = [user_list, user_one]
+    client_config = {
+                'console_org': None,
+                'host': 'api.na2.echosignstage.com',
+                'key': 'allsortsofgibberish1234567890',
+                'admin_email': '[email protected]'
+            }
+    sign_client = SignClient(client_config)
+    sign_client.api_url = "whatever"
+    connector_config = {
+        'sign_orgs': [client_config],
+        'entitlement_groups': ['group1']
+    }
+    sign_connector = SignConnector(connector_config)
+    # set the email from the fixture example user to use an uppercase letter
+    example_user['email'] = '[email protected]'
+    # make a new dict indexed by the uppercase email to pass in to the update method from the sign connector
+    umapi_users = {example_user['email']: example_user}
+
+    def should_sync_replacement(umapi_user, sign_user, org_name):
+        assert sign_user is not None
+    # going to exit the update method early because this bug fix is only concerned with the email mismatch
+    # looking up the sign user from the umapi_users dict should return a sign user even if there is a casing mismatch
+    sign_connector.should_sync = should_sync_replacement
+    sign_connector.update_sign_users(umapi_users, sign_client, 'testOrg')
+    

user_sync/post_sync/connectors/sign_sync/__init__.py

@@ -55,7 +55,7 @@ def run(self, post_sync_data):
     def update_sign_users(self, umapi_users, sign_client, org_name):
         sign_users = sign_client.get_users()
         for _, umapi_user in umapi_users.items():
-            sign_user = sign_users.get(umapi_user['email'])
+            sign_user = sign_users.get(umapi_user['email'].lower())
             if not self.should_sync(umapi_user, sign_user, org_name):
                 continue