Merge pull request #53 from PengfeiLi0218/master

 gets a `Server Error: 500` When accessing the API Tester page and rename Settings  OAUTH_BASE_URL --> REDIRECT_URL

Author: simonredfern

README.md

@@ -127,7 +127,7 @@ DATABASES = {
     }                                                                            
 }
 #API Tester URL
-OAUTH_BASE_URL='http://127.0.0.1:8000'
+REDIRECT_URL='http://127.0.0.1:8000'
 
 ```
 

apitester/apitester/settings.py

@@ -190,7 +190,7 @@
 API_BASE_PATH = '/obp/v'
 API_VERSION = '3.0.0'
 
-OAUTH_BASE_URL='http://127.0.0.1:9090'
+REDIRECT_URL='http://127.0.0.1:9090'
 
 # Always save session
 SESSION_SAVE_EVERY_REQUEST = True
@@ -213,4 +213,4 @@
 # Settings here might use parts overwritten in local settings
 API_ROOT = API_HOST + API_BASE_PATH + API_VERSION
 
-#OAUTH_BASE_URL='https://apisandbox.openbankproject.com'
+#REDIRECT_URL='https://apisandbox.openbankproject.com'

apitester/apitester/urls.py

@@ -15,8 +15,8 @@
 LOGGER = logging.getLogger(__name__)
 
 def LogAtStart():
-    LOGGER.log(logging.INFO, 'OAUTH_BASE_URL: {}'.format(
-        settings.OAUTH_BASE_URL))
+    LOGGER.log(logging.INFO, 'REDIRECT_URL: {}'.format(
+        settings.REDIRECT_URL))
 
     LOGGER.log(logging.INFO, 'API_HOST: {}'.format(
         settings.API_HOST))

apitester/base/context_processors.py

@@ -21,7 +21,8 @@ def api_username(request):
         try:
             api = API(request.session.get('obp'))
             data = api.get('/users/current')
-            username = data['username']
+            if 'username' in data:
+                username = data['username']
         except APIError as err:
             messages.error(request, err)
     return {'API_USERNAME': username}

apitester/obp/views.py

@@ -52,7 +52,7 @@ def get_callback_uri(self, request):
         initiation at OAuth server
         """
         #base_url = '{}://{}'.format(request.scheme, request.environ['HTTP_HOST'])
-        base_url =  settings.OAUTH_BASE_URL
+        base_url =  settings.REDIRECT_URL
         uri = base_url + reverse('oauth-authorize')
         if 'next' in request.GET:
             uri = '{}?next={}'.format(uri, request.GET['next'])