request.view_args might be None and add org_id to ApiUser

redash/authentication/__init__.py

@@ -142,20 +142,26 @@ def get_user_from_api_key(api_key, query_id):
 def get_api_key_from_request(request):
     api_key = request.args.get('api_key', None)
 
-    if api_key is None and request.headers.get('Authorization'):
+    if api_key is not None:
+        return api_key
+
+    if request.headers.get('Authorization'):
         auth_header = request.headers.get('Authorization')
         api_key = auth_header.replace('Key ', '', 1)
-
-    if api_key is None and request.view_args.get('token'):
+    elif request.view_args is not None and request.view_args.get('token'):
         api_key = request.view_args['token']
 
     return api_key
 
 
 def api_key_load_user_from_request(request):
     api_key = get_api_key_from_request(request)
-    query_id = request.view_args.get('query_id', None)
-    user = get_user_from_api_key(api_key, query_id)
+    if request.view_args is not None: 
+        query_id = request.view_args.get('query_id', None)
+        user = get_user_from_api_key(api_key, query_id)
+    else:
+        user = None
+
     return user
 
 

redash/authentication/org_resolving.py

@@ -10,7 +10,11 @@ def _get_current_org():
     if 'org' in g:
         return g.org
 
-    slug = request.view_args.get('org_slug', g.get('org_slug', 'default'))
+    if request.view_args is None:
+        slug = g.get('org_slug', 'default')
+    else:
+        slug = request.view_args.get('org_slug', g.get('org_slug', 'default'))
+
     g.org = Organization.get_by_slug(slug)
     logging.debug("Current organization: %s (slug: %s)", g.org, slug)
     return g.org

redash/models.py

@@ -290,6 +290,12 @@ def __repr__(self):
 
     def is_api_user(self):
         return True
+
+    @property
+    def org_id(self):
+        if not self.org:
+            return None
+        return self.org.id
 
     @property
     def permissions(self):