Update logout for django 4.1 (now logout is a button form)

Alexis Koralewski
1 parent 4a6e2799
Showing 4 changed files with 21 additions and 16 deletions Show diff stats
CHANGELOG
VERSION
src/core/pyros_django/misc/templates/base.html
src/core/pyros_django/user_manager/views.py
-30-08-2022 (AKo): V0.5.3
+30-08-2022 (AKo): v0.5.3.1
 	- Pyros container has fix hostname (hostname of local machine)
 	- Adding switch of database if we're not in docker and not on the computer that host the database
 	- Add fix IP adress for db_pyros and pyros container, updating database.env files to connect to db_pyros
+	- Add new shell script for build (with verification that user isn't root)
+	- Fixing endofline issue of windows
+	- Update logout for Django 4.1 (Send form POST)
  
 29-08-2022 (AKo): v0.5.2.1
 	- Adding colors for recieved and sended commands of an agent.
-0.5.2.1
+0.5.3.1
@@ -387,10 +387,12 @@ footer{
                         {% endcomment %}
  
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="{% url "user_logout" %}" >
-                            <i class="fas fa-sign-out-alt fa-sm fa-fw mr-2 text-gray-400"></i>
-                            Logout
-                        </a>
+                        <form>
+                          {% csrf_token %}
+                          <button class="dropdown-item" formaction="{% url "user_logout" %}" formmethod="post" type="submit">
+                          <i class="fas fa-sign-out-alt fa-sm fa-fw mr-2 text-gray-400"></i>
+                          Logout
+                        </button>
                         </div>
                       {% else %}
                         <li> <a class="dropwdown-item nav-link" id="signin" href="{% url "user_signin" %}" ><i class="fa fa-power-off"></i> Sign in</a>  </li>
@@ -178,16 +178,16 @@ def user_logout(request):
     '''
         View called to log out. Redirects on login page.
     '''
-
-    log.info(f"User {request.user} did action logout")
-    logout(request)
-    config = OBSConfig(
-        os.environ["PATH_TO_OBSCONF_FILE"], os.environ["unit_name"])
-    observatory_name = config.get_obs_name()
-    first_unit_name = config.get_units_name()[0]
-    request.session["obsname"] = observatory_name+" "+first_unit_name
-    return redirect(reverse("index"))
-    return(render(request, LOGGED_PAGE, {'USER_LEVEL':  "Visitor", 'base_template': 'base.html', 'weather_img': "red"}))
+    if request.POST:
+        log.info(f"User {request.user} did action logout")
+        logout(request)
+        config = OBSConfig(
+            os.environ["PATH_TO_OBSCONF_FILE"], os.environ["unit_name"])
+        observatory_name = config.get_obs_name()
+        first_unit_name = config.get_units_name()[0]
+        request.session["obsname"] = observatory_name+" "+first_unit_name
+        return redirect(reverse("index"))
+        return(render(request, LOGGED_PAGE, {'USER_LEVEL':  "Visitor", 'base_template': 'base.html', 'weather_img': "red"}))
  
  
 def user_signin(request):