Update use of User.is_authenticated

mila-iqia · Aug 23, 2023 · 5fc22ac · 5fc22ac
1 parent a35e951
commit 5fc22ac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/clockwork_web/login_routes.py b/clockwork_web/login_routes.py
@@ -206,7 +206,7 @@ def route_callback():
     from flask import current_app
 
     current_app.logger.debug(
-        "called login_user(user) for user with email %s, user.is_authenticated is %s",
+        "called login_user(user) for user with email %s, user.is_authenticated() is %s",
         user.mila_email_username,
         user.is_authenticated(),
     )

diff --git a/clockwork_web/server_app.py b/clockwork_web/server_app.py
@@ -151,7 +151,7 @@ def have_same_users(user1: str, user2: str):
     @babel.localeselector
     def get_locale():
         # If the user is authenticated
-        if current_user.is_authenticated:
+        if current_user.is_authenticated():
             return current_user.get_language()
 
         # If the user is not authenticated
@@ -250,7 +250,7 @@ def index():
         where people can click on the "login" button on the web interface.
         """
 
-        if current_user.is_authenticated:
+        if current_user.is_authenticated():
             app.logger.debug("in route for '/'; redirecting to jobs/")
             return redirect("jobs/")
         else:

diff --git a/clockwork_web/templates/base.html b/clockwork_web/templates/base.html
@@ -75,7 +75,7 @@ <h4><span></span></h4>
 						{% endif %}
 					</a>
 				</div>
-
+				{% if current_user.is_authenticated() %}
 				<div class="col">
 					<nav class="navbar-expand-lg">
 						<div class="container-fluid">
@@ -110,6 +110,7 @@ <h4><span></span></h4>
 						</div>
 					</nav>
 				</div>
+				{% endif %}
 				<div class="col login">
 					<!-- TODO : add a conditional here in the template -->
 					{% if mila_email_username: %}
@@ -130,7 +131,7 @@ <h4><span></span></h4>
 		</div>
 
 		{% block form %}
-		{% if request.path != '/jobs/dashboard' and current_user.is_authenticated %}
+		{% if request.path != '/jobs/dashboard' and current_user.is_authenticated() %}
 			<!-- Search jobs form -->
 			<div id="formBlock">
 				<div class="search_button formCollapse {{ 'collapse' if request.path != '/jobs/search' }} {{ 'show' if request.path == '/jobs/search' }}" id="mainCollapse">

diff --git a/clockwork_web/user.py b/clockwork_web/user.py
@@ -350,3 +350,6 @@ def get_web_settings(self):
             A dictionary presenting the default web settings.
         """
         return self.web_settings
+
+    def is_authenticated(self):
+        return False