From a9b109d17b8f47ef70ab3dafaff47b09ae8bb68e Mon Sep 17 00:00:00 2001
From: Maxime Alves LIRMM <maxime.alves@lirmm.fr>
Date: Fri, 10 Jul 2020 12:57:03 +0200
Subject: [PATCH] [conf] put CONFIG out of app.py, add some details to debug
 routes

---
 halfapi/app.py    | 16 +++++++---------
 halfapi/config.py | 10 ++++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 halfapi/config.py

diff --git a/halfapi/app.py b/halfapi/app.py
index 00d5397..181f022 100644
--- a/halfapi/app.py
+++ b/halfapi/app.py
@@ -6,6 +6,7 @@ from os import environ
 
 # asgi framework
 from starlette.applications import Starlette
+from starlette.authentication import UnauthenticatedUser
 from starlette.middleware import Middleware
 from starlette.requests import Request
 from starlette.responses import Response, JSONResponse
@@ -21,6 +22,7 @@ RequestResponseEndpoint = Callable[ [Request], Awaitable[Response] ]
 from .models.api.domain import Domain
 
 # module libraries
+from .config import CONFIG
 from .lib.jwt_middleware import JWTAuthenticationBackend
 from .lib.acl_caller_middleware import AclCallerMiddleware
 
@@ -89,13 +91,6 @@ def startup():
         sys.stderr.write('Error in the *domains* retrieval\n') 
         raise e
 
-
-# Configuration
-CONFIG={}
-CONFIG['DEBUG'] = environ.get('DEBUG', False)
-CONFIG['DEBUG_ACL'] = environ.get('DEBUG_ACL', False)
-CONFIG['HALFORM_SECRET'] = environ.get('HALFORM_SECRET', False)
-
 if not CONFIG['HALFORM_SECRET']:
     try:
         CONFIG['HALFORM_SECRET'] = open('/etc/half_orm/secret').read()
@@ -113,8 +108,11 @@ if not CONFIG['HALFORM_SECRET']:
 debug_routes = [
     Route('/', lambda request, *args, **kwargs: PlainTextResponse('It Works!')),
     Route('/user', lambda request, *args, **kwargs:
-        JSONResponse({'user':request.user.json})),
-    Route('/payload', lambda request, *args, **kwargs: JSONResponse({'payload':str(request.payload)}))
+        JSONResponse({'user':request.user.json})
+        if type(request.user) != UnauthenticatedUser
+        else JSONResponse({'user':False})),
+    Route('/payload', lambda request, *args, **kwargs:
+        JSONResponse({'payload':str(request.payload)}))
 ] if CONFIG['DEBUG'] else []
 
 
diff --git a/halfapi/config.py b/halfapi/config.py
new file mode 100644
index 0000000..9ad2cf8
--- /dev/null
+++ b/halfapi/config.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from os import environ
+
+# Configuration
+CONFIG={}
+CONFIG['DEBUG'] = environ.get('DEBUG', False)
+CONFIG['DEBUG_ACL'] = environ.get('DEBUG_ACL', False)
+CONFIG['HALFORM_SECRET'] = environ.get('HALFORM_SECRET', False)
+
+