From 4db9e4565ac638246f5b9a3d1c5b0630ef5e3599 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Wed, 4 Nov 2020 17:22:10 -0800
Subject: [PATCH] DIV-1262 - Delete the SMSESSION cookie when the user logs out
 - using Django instead of JS

---
 edivorce/apps/core/middleware/keycloak.py |  4 +---
 edivorce/apps/core/static/js/main.js      | 19 -------------------
 edivorce/apps/core/templates/base.html    |  2 +-
 edivorce/apps/core/urls.py                |  1 +
 edivorce/apps/core/views/main.py          |  7 +++++++
 5 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/edivorce/apps/core/middleware/keycloak.py b/edivorce/apps/core/middleware/keycloak.py
index a4260536..5cc68814 100644
--- a/edivorce/apps/core/middleware/keycloak.py
+++ b/edivorce/apps/core/middleware/keycloak.py
@@ -46,7 +46,5 @@ class EDivorceKeycloakBackend(OIDCAuthenticationBackend):
 
 def keycloak_logout(request):
     request.session.flush()
-
-    redirect_uri = absolutify(request, settings.FORCE_SCRIPT_NAME)
-
+    redirect_uri = absolutify(request, settings.FORCE_SCRIPT_NAME[:-1] + '/logout')
     return f'{settings.KEYCLOAK_LOGOUT}?redirect_uri={redirect_uri}'
diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js
index e6dfa495..a6b05486 100755
--- a/edivorce/apps/core/static/js/main.js
+++ b/edivorce/apps/core/static/js/main.js
@@ -899,27 +899,8 @@ var initializeChildRowControls = function(element) {
     element.find('#cancel_delete_child').on('click', function() {
         $('#delete_child_modal').modal('hide');
     });
-
-    $('form#logoutForm').submit(function(e) {
-        deleteCookie("SMSESSION", "/", ".gov.bc.ca");
-    });
 };
 
-var deleteCookie = function(name, path, domain) {
-    if( getCookie(name) ) {
-      document.cookie = name + "=" +
-        ((path) ? ";path="+path:"")+
-        ((domain)?";domain="+domain:"") +
-        ";expires=Thu, 01 Jan 1970 00:00:01 GMT";
-    }
-}
-
-var getCookie = function(name){
-    return document.cookie.split(';').some(c => {
-        return c.trim().startsWith(name + '=');
-    });
-}
-
 var populateChildInputFields = function(element) {
     $('.children-questions').show();
     $('.children-list').hide();
diff --git a/edivorce/apps/core/templates/base.html b/edivorce/apps/core/templates/base.html
index 4b3be845..a5db322b 100644
--- a/edivorce/apps/core/templates/base.html
+++ b/edivorce/apps/core/templates/base.html
@@ -54,7 +54,7 @@
                         <div class="top_banner-user">
                             {% if request.user.is_authenticated %}
                             <span>
-                                <form id="logoutForm" action="{% url 'oidc_logout' %}" method="post">
+                                <form action="{% url 'oidc_logout' %}" method="post">
                                     {{ request.user.display_name}}
                                     &nbsp;&nbsp;|&nbsp;&nbsp; 
                                     {% csrf_token %}
diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py
index 2efc8f7d..e4fe18e9 100644
--- a/edivorce/apps/core/urls.py
+++ b/edivorce/apps/core/urls.py
@@ -13,6 +13,7 @@ urlpatterns = [
     path('api/documents/<doc_type>/<int:party_code>/<filename>x/<int:size>/', api.DocumentView.as_view(), name='document'),
 
     url(r'^signin$', main.after_login, name="signin"),
+    url(r'^logout$', main.after_logout, name="logout"),
     url(r'^register$', main.register, name="register"),
     url(r'^register_sc$', main.register_sc, name="register_sc"),
     url(r'^overview$', main.overview, name="overview"),
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index 04042efa..0adb3c73 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.contrib import messages
+from django.http import HttpResponseRedirect
 from django.shortcuts import render, redirect
 from django.urls import reverse
 from django.contrib.auth.decorators import login_required
@@ -120,6 +121,12 @@ def after_login(request):
     return redirect(settings.PROXY_BASE_URL + settings.FORCE_SCRIPT_NAME[:-1] + '/overview')
 
 
+def after_logout(request):
+    response = HttpResponseRedirect(settings.PROXY_BASE_URL + settings.FORCE_SCRIPT_NAME)
+    response.delete_cookie(key="SMSESSION", domain=".gov.bc.ca", path="/")
+    return response
+
+
 @login_required
 @prequal_completed
 @intercept