fix tests

fence/blueprints/data/indexd.py

@@ -83,8 +83,6 @@ def get_signed_url_for_file(
     if ga4gh_passports:
         # TODO change this to usernames
         user_ids_from_passports = get_gen3_users_from_ga4gh_passports(ga4gh_passports)
-        print("------------user idss from passports---------------")
-        print(user_ids_from_passports)
 
     # add the user details to `flask.g.audit_data` first, so they are
     # included in the audit log if `IndexedFile(file_id)` raises a 404
@@ -425,7 +423,9 @@ def get_signed_url(
                     f"{action_to_permission[action]} permission "
                     f"on authz resource: {self.index_document['authz']}"
                 )
-            authorized_user_id = authorized_user_id if isinstance(authorized_user_id, str) else None
+            authorized_user_id = (
+                authorized_user_id if isinstance(authorized_user_id, str) else None
+            )
         else:
             if self.public_acl and action == "upload":
                 raise Unauthorized(
@@ -520,7 +520,7 @@ def check_authz(self, action, user_ids_from_passports=None):
         )
 
         # handle multiple GA4GH passports as a means of authn/z
-        
+
         if user_ids_from_passports:
             for user_id in user_ids_from_passports:
                 authorized = flask.current_app.arborist.auth_request(

fence/resources/google/utils.py

@@ -575,9 +575,7 @@ def _get_proxy_group_id(user_id=None):
 
     if not proxy_group_id:
         user_id = user_id or current_token["sub"]
-        user = (
-            current_session.query(User).filter(User.id == user_id).first()
-        )
+        user = current_session.query(User).filter(User.id == user_id).first()
         proxy_group_id = user.google_proxy_group_id
 
     return proxy_group_id
@@ -607,10 +605,6 @@ def _create_proxy_group(user_id, username):
 
     # link proxy group to user
     user = current_session.query(User).filter_by(id=user_id).first()
-    print("----------proxy grou id----------------  ")
-    print(proxy_group)
-    print(proxy_group.id)
-    print(user)
     user.google_proxy_group_id = proxy_group.id
 
     current_session.add(proxy_group)

tests/test_drs.py

@@ -1,4 +1,5 @@
 import flask
+import httpx
 import json
 import jwt
 import pytest
@@ -239,9 +240,13 @@ def test_get_presigned_url_with_query_params(
 
 @responses.activate
 @pytest.mark.parametrize("indexd_client", ["s3", "gs"], indirect=True)
+@patch("httpx.get")
+@patch("fence.resources.google.utils._create_proxy_group")
 @patch("fence.resources.ga4gh.passports.ArboristClient")
 def test_get_presigned_url_with_passport_for_non_public_acl(
     mock_arborist,
+    mock_google_proxy_group,
+    mock_httpx_get,
     client,
     indexd_client,
     kid,
@@ -274,6 +279,7 @@ def test_get_presigned_url_with_passport_for_non_public_acl(
     )
     mock_arborist_requests({"arborist/auth/request": {"POST": ({"auth": True}, 200)}})
     mock_arborist.return_value = MagicMock(ArboristClient)
+    mock_google_proxy_group.return_value = google_proxy_group
 
     # Prepare Passport/Visa
     headers = {"kid": kid}
@@ -377,11 +383,8 @@ def test_get_presigned_url_with_passport_for_non_public_acl(
 
     data = {"passports": passports}
 
-    flask.current_app.jwt_public_keys = {
-        "https://stsstg.nih.gov": {
-            kid: rsa_public_key,
-        }
-    }
+    keys = [keypair.public_key_to_jwk() for keypair in flask.current_app.keypairs]
+    mock_httpx_get.return_value = httpx.Response(200, json={"keys": keys})
 
     res = client.post(
         "/ga4gh/drs/v1/objects/" + test_guid + "/access/" + access_id,
@@ -391,5 +394,3 @@ def test_get_presigned_url_with_passport_for_non_public_acl(
         data=json.dumps(data),
     )
     assert res.status_code == 200
-
-    flask.current_app.jwt_public_keys = {}