Change how config is handled

calparrot/__main__.py

@@ -25,12 +25,21 @@ def main():
     print("All config:", restful_config)
     calcat_cfg = restful_config.get('calcat', {})
     print("Loaded config:", calcat_cfg)
-    calcat_cfg.setdefault('base-api-url', 'http://exflcalproxy:8080/api/')
-    calcat_cfg.setdefault('use-oauth2', False)
+    api_url = calcat_cfg.get('base-api-url', 'http://exflcalproxy:8080/api').rstrip('/')
+    assert api_url.endswith('/api')
+    base_url = api_url[:-4]
+    if calcat_cfg.get('use-oauth2', False):
+        oauth_info = {
+            'id': calcat_cfg['user-id'],
+            'secret': calcat_cfg['user-secret'],
+            'email': calcat_cfg['user-email']
+        }
+    else:
+        oauth_info = None
     log.info("Upstream is %s (with%s Oauth)", calcat_cfg['base-api-url'],
-             '' if calcat_cfg['use-oauth2'] else 'out')
+             '' if oauth_info else 'out')
 
-    app = ProxyApp(calcat_cfg, args.db)
+    app = ProxyApp(base_url, oauth_info, args.db)
     log.info("CalParrot will serve constant queries on http://127.0.0.1:%d", app.port)
     if args.port_file:
         with open(args.port_file, 'w') as f:

calparrot/proxy.py

@@ -187,15 +187,15 @@ class ShutdownHandler(RequestHandler):
 class ProxyApp:
     quit_event: asyncio.Event
 
-    def __init__(self, creds, db_path='calparrot.sqlite'):
+    def __init__(self, base_url, oauth_info=None, db_path='calparrot.sqlite'):
         self.response_store = ResponsesDB(db_path)
-        base_url = creds['base-api-url'].rstrip('/')  # e.g. https://in.xfel.eu/calibration
+        base_url = base_url.rstrip('/')  # e.g. https://in.xfel.eu/calibration
 
-        if creds['use-oauth2']:
+        if oauth_info:
             self.client = XFELOauthClient(
-                creds['client_id'],
-                creds['client_secret'],
-                creds['user_email'],
+                oauth_info['id'],
+                oauth_info['secret'],
+                oauth_info['email'],
                 scope=None,
                 token_url=base_url + '/oauth/token'
             )