Merge branch 'master' into fix/dbgap-combination

.travis.yml

@@ -28,6 +28,7 @@ install:
   - psql -U postgres -c "create database fence_test_tmp"
   - if [[ $TRAVIS_PYTHON_VERSION != 3.6 ]]; then userdatamodel-init --db fence_test_tmp; fi
   - if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then pip install -e git+https://git@github.com/uc-cdis/wool.git#egg=wool; fi
+  - pip list
 
 before_script:
   - sudo rm -f /etc/boto.cfg

fence/sync/sync_users.py

@@ -1125,16 +1125,20 @@ def _update_authz_in_arborist(self, session, user_projects, user_yaml=None):
         if not healthy:
             return False
 
+        self.logger.debug("user_projects: {}".format(user_projects))
+
         if user_yaml:
+            self.logger.debug("useryaml rbac: {}".format(user_yaml.user_rbac))
+
             # update the project info with `projects` specified in user.yaml
             self.sync_two_phsids_dict(user_yaml.user_rbac, user_projects)
 
         for username, user_project_info in user_projects.iteritems():
             self.logger.info("processing user `{}`".format(username))
             user = query_for_user(session=session, username=username)
 
-            self.arborist_client.create_user_if_not_exist(username)
-            self.arborist_client.revoke_all_policies_for_user(username)
+            self.arborist_client.create_user_if_not_exist(user.username)
+            self.arborist_client.revoke_all_policies_for_user(user.username)
 
             for project, permissions in user_project_info.iteritems():
 

requirements.txt

@@ -1,12 +1,12 @@
 Authlib==0.11
 addict==2.1.1
-authutils>=3.0.5<4.0.0
+authutils==3.1.1
 boto>=2.36.0<3.0.0
 botocore>=1.7<1.10.39
 boto3>=1.5<1.6
 cached_property==1.5.1
 cdislogging>=1.0.0<2.0.0
-cryptography>=2.1.2
+cryptography>=2.1.2<3.0
 enum34>=1.1.6
 Flask==0.12.4
 Flask-CORS==3.0.3

setup.py

@@ -13,7 +13,7 @@
         "cached_property>=1.5.1,<2.0.0",
         "gen3config>=0.1.6,<1.0.0",
         "gen3cirrus>=0.3.4,<1.0.0",
-        "cryptography>=2.1.2",
+        "cryptography>=2.1.2<3.0",
         "enum34>=1.1.6",
         "flask-restful>=0.3.6,<1.0.0",
         "Flask>=0.10.1,<1.0.0",