only get service token once

Author: daisieh

htsget_server/beacon_operations.py

@@ -418,11 +418,12 @@ def full_beacon_search(search_json, headers=None):
 
     # if the request granularity was "record", check to see that the user is actually authorized to see any programs:
     response['beaconHandovers'] = []
+    headers = {
+        "X-Service-Token": create_service_token()
+    }
+
     for drs_obj_id in variants_by_file.keys():
         # look for experiments and programs for all drs objects, even if user is not authorized
-        headers = {
-            "X-Service-Token": create_service_token()
-        }
         resp = requests.get(url=f"{os.getenv("DRS_URL")}/ga4gh/drs/v1/objects/{drs_obj_id}", headers=headers)
         if resp.status_code == 200:
             drs_obj = resp.json()

htsget_server/variants.py

@@ -73,6 +73,9 @@ def parse_vcf_file(drs_object_id, reference_name=None, start=None, end=None, hea
     if 'contig' in headers:
         variants_by_file['contig'] = headers.pop('contig')
     experiment_dict = {}
+    req_headers = {
+        "X-Service-Token": create_service_token()
+    }
     for r in records:
         experiments = []
         for vcf_sample in r.samples:
@@ -81,10 +84,7 @@ def parse_vcf_file(drs_object_id, reference_name=None, start=None, end=None, hea
                 experiment_id = analysis_obj['experiments'][vcf_sample]
                 if experiment_id not in experiment_dict:
                     experiment_id = analysis_obj['experiments'][vcf_sample]
-                    headers = {
-                        "X-Service-Token": create_service_token()
-                    }
-                    response = requests.get(url=f"{os.getenv("DRS_URL")}/ga4gh/drs/v1/objects/{experiment_id}", headers=headers)
+                    response = requests.get(url=f"{os.getenv("DRS_URL")}/ga4gh/drs/v1/objects/{experiment_id}", headers=req_headers)
                     experiment_obj = None
                     if response.status_code == 200:
                         experiment_obj = response.json()