'key' used for both v1 and v2

Author: tcnichol

pyclowder/api/v2/files.py

@@ -29,7 +29,7 @@
 
 
 # pylint: disable=too-many-arguments
-def download(connector, host, key, fileid, intermediatefileid=None, ext="", token=None):
+def download(connector, host, key, fileid, intermediatefileid=None, ext=""):
     """Download file to be processed from Clowder.
 
     Keyword arguments:
@@ -50,7 +50,7 @@ def download(connector, host, key, fileid, intermediatefileid=None, ext="", toke
         intermediatefileid = fileid
 
     url = '%sapi/v2/files/%s' % (host, intermediatefileid)
-    headers = {"Authorization": "Bearer " + token}
+    headers = {"Authorization": "Bearer " + key}
     result = connector.get(url, stream=True, verify=connector.ssl_verify if connector else True, headers=headers)
 
     (inputfile, inputfilename) = tempfile.mkstemp(suffix=ext)
@@ -65,7 +65,7 @@ def download(connector, host, key, fileid, intermediatefileid=None, ext="", toke
         raise
 
 
-def download_info(connector, host, key, fileid, token=None):
+def download_info(connector, host, key, fileid):
     """Download file summary metadata from Clowder.
 
     Keyword arguments:
@@ -76,7 +76,7 @@ def download_info(connector, host, key, fileid, token=None):
     """
 
     url = '%sapi/v2/files/%s/metadata' % (host, fileid)
-    headers = {"Authorization": "Bearer " + token}
+    headers = {"Authorization": "Bearer " + key}
     # fetch data
     result = connector.get(url, stream=True, verify=connector.ssl_verify if connector else True, headers=headers)
 
@@ -179,7 +179,7 @@ def submit_extractions_by_collection(connector, host, key, collectionid, extract
             submit_extractions_by_collection(connector, host, key, coll['id'], extractorname, ext, recursive)
 
 
-def upload_metadata(connector, host, key, fileid, metadata, token=None):
+def upload_metadata(connector, host, key, fileid, metadata):
     """Upload file JSON-LD metadata to Clowder.
 
     Keyword arguments:
@@ -191,12 +191,8 @@ def upload_metadata(connector, host, key, fileid, metadata, token=None):
     """
 
     connector.message_process({"type": "file", "id": fileid}, "Uploading file metadata.")
-    if token:
-        headers = {'Content-Type': 'application/json',
-                   'Authorization':'Bearer ' + token}
-    else:
-        headers = {'Content-Type': 'application/json',
-                   'Authorization':'Bearer ' + key}
+    headers = {'Content-Type': 'application/json',
+               'Authorization':'Bearer ' + key}
     print(metadata)
     as_json = json.dumps(metadata)
     url = '%sapi/v2/files/%s/metadata' % (host, fileid)

pyclowder/connectors.py

@@ -413,9 +413,6 @@ def _process_message(self, body):
         if not source_host.endswith('/'): source_host += '/'
         if not host.endswith('/'): host += '/'
         secret_key = body.get('secretKey', '')
-        if clowder_version >= 2.0:
-            secret_key = body.get('token', '')
-        token = body.get('token', ' ')
         retry_count = 0 if 'retry_count' not in body else body['retry_count']
         resource = self._build_resource(body, host, secret_key)
         if not resource:
@@ -430,7 +427,7 @@ def _process_message(self, body):
         if url not in Connector.registered_clowder:
             Connector.registered_clowder.append(url)
             if clowder_version >= 2.0:
-                self.register_extractor("%s" % (url), token=token)
+                self.register_extractor("%s" % (url), token=secret_key)
             else:
                 self.register_extractor("%s?key=%s" % (url, secret_key))
 
@@ -453,15 +450,15 @@ def _process_message(self, body):
                         try:
                             if check_result != pyclowder.utils.CheckMessage.bypass:
                                 if clowder_version >= 2.0:
-                                    file_metadata = pyclowder.files.download_info(self, host, secret_key, resource["id"], token=token)
+                                    file_metadata = pyclowder.files.download_info(self, host, secret_key, resource["id"])
                                 else:
                                     file_metadata = pyclowder.files.download_info(self, host, secret_key, resource["id"])
                                 file_path = self._check_for_local_file(file_metadata)
                                 if not file_path:
                                     if clowder_version >= 2.0:
                                         file_path = pyclowder.files.download(self, host, secret_key, resource["id"],
                                                                          resource["intermediate_id"],
-                                                                         resource["file_ext"], token=token)
+                                                                         resource["file_ext"])
                                     else:
                                         file_path = pyclowder.files.download(self, host, secret_key, resource["id"],
                                                                              resource["intermediate_id"],

pyclowder/files.py

@@ -42,9 +42,9 @@ def download(connector, host, key, fileid, intermediatefileid=None, ext="", toke
     ext -- the file extension, the downloaded file will end with this extension
     """
     if clowder_version >= 2.0:
-        inputfilename = v2files.download(connector, host, key, fileid, intermediatefileid, ext, token)
+        inputfilename = v2files.download(connector, host, key, fileid, intermediatefileid, ext)
     else:
-        inputfilename = v2files.download(connector, host, key, fileid, intermediatefileid, ext, token)
+        inputfilename = v1files.download(connector, host, key, fileid, intermediatefileid, ext)
     return inputfilename
 
 
@@ -59,7 +59,7 @@ def download_info(connector, host, key, fileid, token=None):
     """
 
     if clowder_version >= 2.0:
-        result = v2files.download_info(connector, host, key, fileid, token)
+        result = v2files.download_info(connector, host, key, fileid)
     else:
         result = v1files.download_info(connector, host, key, fileid)
     return result.json()