Refactor JWT auth to not import app locally

util/config/validator.py

@@ -12,11 +12,12 @@ from flask import Flask
 from flask.ext.mail import Mail, Message
 from data.database import validate_database_url, User
 from storage import get_storage_driver
-from app import app, CONFIG_PROVIDER, get_app_url
 from auth.auth_context import get_authenticated_user
 from util.oauth import GoogleOAuthConfig, GithubOAuthConfig, GitLabOAuthConfig
 from bitbucket import BitBucket
 
+from app import app, CONFIG_PROVIDER, get_app_url, OVERRIDE_CONFIG_DIRECTORY
+
 logger = logging.getLogger(__name__)
 
 SSL_FILENAMES = ['ssl.cert', 'ssl.key']
@@ -325,7 +326,9 @@ def _validate_jwt(config):
 
   # Try to instatiate the JWT authentication mechanism. This will raise an exception if
   # the key cannot be found.
-  users = JWTAuthUsers(exists_endpoint, verify_endpoint, issuer)
+  users = JWTAuthUsers(exists_endpoint, verify_endpoint, issuer,
+                       OVERRIDE_CONFIG_DIRECTORY,
+                       app.config['HTTPCLIENT'])
 
   # Verify that the superuser exists. If not, raise an exception.
   username = get_authenticated_user().username