Merge pull request #169 from mila-iqia/display-api-key

Display Clockwork API key in settings web page
mila-iqia · Oct 19, 2023 · aa4009c · aa4009c
2 parents 71d4d8f + c7c85c1
commit aa4009c
Show file tree

Hide file tree

Showing 5 changed files with 215 additions and 193 deletions.
diff --git a/clockwork_web/browser_routes/settings.py b/clockwork_web/browser_routes/settings.py
@@ -54,10 +54,6 @@ def route_index():
     # Display the user's settings as HTML
     return render_template_with_user_settings(
         "settings.html",
-        mila_email_username=current_user.mila_email_username,
-        clockwork_api_key=current_user.clockwork_api_key,
-        cc_account_username=current_user.cc_account_username,
-        cc_account_update_key=current_user.cc_account_update_key,
         available_languages=get_config("translation.available_languages"),
         previous_request_args=previous_request_args,
     )

diff --git a/clockwork_web/rest_routes/authentication.py b/clockwork_web/rest_routes/authentication.py
@@ -47,7 +47,9 @@ def decorated(*args, **kwargs):
             return jsonify("Database error."), 500
 
         D_user = L[0]
-        if secrets.compare_digest(D_user["clockwork_api_key"], auth["password"]):
+        if D_user["clockwork_api_key"] is not None and secrets.compare_digest(
+            D_user["clockwork_api_key"], auth["password"]
+        ):
             g.current_user_with_rest_auth = D_user
             return f(*args, **kwargs)
             # no need to manually clear `g.current_user_with_rest_auth` because