Bugfix for the client

config.py

@@ -1,5 +1,9 @@
 import os
 
+# must be here for adsmutils to override it using env vars
+# but if left empty (resolving to False) it won't be used
+SERVICE_TOKEN = None
+
 LOG_STDOUT = True
 
 VIS_SERVICE_BIGQUERY_PATH = 'http://ecs-staging-elb-2044121877.us-east-1.elb.amazonaws.com/v1/search/bigquery'

vis_services/client.py

@@ -20,17 +20,18 @@ def __init__(self, config):
 
         self.session = requests.Session()
 
-    def _sanitize(self, *args, **kwargs):
+    def _sanitize(self, args, kwargs):
         headers = kwargs.get('headers', {})
         if 'Authorization' not in headers:
-            headers['Authorization'] = current_app.config.get('SERVICE_TOKEN', request.headers.get('X-Forwarded-Authorization', request.headers.get('Authorization', None)))
+            headers['Authorization'] = current_app.config.get('SERVICE_TOKEN', None) or request.headers.get('X-Forwarded-Authorization', request.headers.get('Authorization', None))
         kwargs['headers'] = headers
+        return (args, kwargs)
 
     def get(self, *args, **kwargs):
-        self._sanitize(*args, **kwargs)
+        args, kwargs = self._sanitize(args, kwargs)
         return self.session.get(*args, **kwargs)
 
     def post(self, *args, **kwargs):
-        self._sanitize(*args, **kwargs)
+        args, kwargs = self._sanitize(args, kwargs)
         return self.session.post(*args, **kwargs)