Merge 76c1918 into d3ce3bc

uc-cdis · Mar 10, 2020 · 078f504 · 078f504
2 parents d3ce3bc + 76c1918
commit 078f504
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/fence/blueprints/data/indexd.py b/fence/blueprints/data/indexd.py
@@ -379,8 +379,9 @@ def metadata(self):
 
     @cached_property
     def public(self):
-        authz_resources = list(self.set_acls)
-        authz_resources.extend(self.index_document.get("authz", []))
+        authz_resources = self.index_document.get("authz", [])
+        if not authz_resources:
+            authz_resources.extend(list(self.set_acls))
         return "*" in authz_resources or "/open" in authz_resources
 
     @login_required({"data"})
@@ -753,7 +754,10 @@ def get_signed_url(
         elif public_data and _is_anonymous_user(user_info):
             expiration_time = int(time.time()) + int(expires_in)
             url = self._generate_anonymous_google_storage_signed_url(
-                ACTION_DICT["gs"][action], resource_path, expiration_time
+                ACTION_DICT["gs"][action],
+                resource_path,
+                expiration_time,
+                r_pays_project=r_pays_project,
             )
         else:
             expiration_time = int(time.time()) + int(expires_in)