diff --git a/app/main.py b/app/main.py index 7f2bb2f..9b428d7 100644 --- a/app/main.py +++ b/app/main.py @@ -76,6 +76,28 @@ def __get_token(request: Request) -> dict: return jwt.decode(token=token, key=jwt_decode_key, algorithms=ALGORITHMS.RS256, options={'verify_aud': False}) +def __json_config() -> dict: + return { + 'VERSION': str(VERSION), + 'COMMIT': str(COMMIT), + 'DEBUG': str(DEBUG), + 'DLS_URL': str(DLS_URL), + 'DLS_PORT': str(DLS_PORT), + 'SITE_KEY_XID': str(SITE_KEY_XID), + 'INSTANCE_REF': str(INSTANCE_REF), + 'ALLOTMENT_REF': [str(ALLOTMENT_REF)], + 'TOKEN_EXPIRE_DELTA': str(TOKEN_EXPIRE_DELTA), + 'LEASE_EXPIRE_DELTA': str(LEASE_EXPIRE_DELTA), + 'LEASE_RENEWAL_PERIOD': str(LEASE_RENEWAL_PERIOD), + 'CORS_ORIGINS': str(CORS_ORIGINS), + 'TZ': str(TZ), + # static / calculated + 'LEASE_RENEWAL_DELTA': str(LEASE_RENEWAL_DELTA), + 'LEASE_CALCULATED_RENEWAL': str(Lease.calculate_renewal(LEASE_RENEWAL_PERIOD, LEASE_RENEWAL_DELTA)), + 'CLIENT_TOKEN_EXPIRE_DELTA': str(CLIENT_TOKEN_EXPIRE_DELTA), + } + + @app.get('/', summary='* Index') async def index(): return RedirectResponse('/-/') @@ -93,21 +115,7 @@ async def _health(): @app.get('/-/config', summary='* Config', description='returns environment variables.') async def _config(): - return JSONr({ - 'VERSION': str(VERSION), - 'COMMIT': str(COMMIT), - 'DEBUG': str(DEBUG), - 'DLS_URL': str(DLS_URL), - 'DLS_PORT': str(DLS_PORT), - 'SITE_KEY_XID': str(SITE_KEY_XID), - 'INSTANCE_REF': str(INSTANCE_REF), - 'ALLOTMENT_REF': [str(ALLOTMENT_REF)], - 'TOKEN_EXPIRE_DELTA': str(TOKEN_EXPIRE_DELTA), - 'LEASE_EXPIRE_DELTA': str(LEASE_EXPIRE_DELTA), - 'LEASE_RENEWAL_PERIOD': str(LEASE_RENEWAL_PERIOD), - 'CORS_ORIGINS': str(CORS_ORIGINS), - 'TZ': str(TZ), - }) + return JSONr(__json_config()) @app.get('/-/readme', summary='* Readme') @@ -126,7 +134,8 @@ async def _manage(request: Request): @app.get('/-/dashboard', summary='* Dashboard') async def _dashboard(request: Request): - return templates.TemplateResponse(name='views/dashboard.html', context={'request': request, 'VERSION': VERSION}) + context = {'request': request, 'VERSION': VERSION, 'CONFIG': __json_config()} + return templates.TemplateResponse(name='views/dashboard.html', context=context) @app.get('/-/dashboard/origins', summary='* Dashboard - Origins') diff --git a/app/templates/views/dashboard.html b/app/templates/views/dashboard.html index 14a7378..962e7d9 100644 --- a/app/templates/views/dashboard.html +++ b/app/templates/views/dashboard.html @@ -29,7 +29,26 @@ -
+
+ Your clients renew their license every {{ CONFIG.LEASE_CALCULATED_RENEWAL }}.
+ If the renewal fails, the license is {{ CONFIG.LEASE_RENEWAL_DELTA }} valid.
+
+ Your client-token file (.tok) is valid for {{ CONFIG.CLIENT_TOKEN_EXPIRE_DELTA }}.
+