Backport PR #112: Bug: logging in after clearing session redirects to…

… clearing session (#112)

Prevent user from being logged out when clearing the session.

* Create draft PR for #28

* More session keys to avoid clearing

* Changelog entry

Co-authored-by: Flix6x <Flix6x@users.noreply.github.com>
Co-authored-by: F.N. Claessen <felix@seita.nl>
Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com>

documentation/changelog.rst

@@ -8,6 +8,7 @@ v0.4.1 | May XX, 2021
 
 Bugfixes
 -----------
+* Prevent logging out user when clearing the session [see `PR #112 <http://www.github.com/SeitaBV/flexmeasures/pull/112>`_]
 * Prevent user type data source to be created without setting a user [see `PR #111 <https://github.com/SeitaBV/flexmeasures/pull/111>`_]
 
 v0.4.0 | April 29, 2021

flexmeasures/ui/utils/view_utils.py

@@ -91,7 +91,9 @@ def render_flexmeasures_template(html_filename: str, **variables):
 
 def clear_session():
     for skey in [
-        k for k in session.keys() if k not in ("_id", "user_id", "csrf_token")
+        k
+        for k in session.keys()
+        if k not in ("_fresh", "_id", "_user_id", "csrf_token", "fs_cc", "fs_paa")
     ]:
         current_app.logger.info(
             "Removing %s:%s from session ... " % (skey, session[skey])