Upgrade packages (#637)

* Upgrade packages

* Remove now removed flag

* Make small changes to fix issues

* Change to _user_id as defined by flask-login

* Update to not use flask-login internal values

* auto patch increment

Co-authored-by: ras-rm-pr-bot <matt.crocker+rasrm@gmail.com>

Pipfile

@@ -41,13 +41,13 @@ thriftpy2 = "*"
 urllib3 = "*"
 webassets = "*"
 Flask = "*"
-Flask-Login = "==0.4.1"
+Flask-Login = "*"
 Flask-WTF = "*"
 Flask-Assets = "*"
 pyScss = "*"
 PyJWT = "*"
 Flask-Session = "*"
-Werkzeug = "==0.16.1"
+Werkzeug = "*"
 et_xmlfile = "*"
 Jinja2 = "*"
 MarkupSafe = "*"

_infra/helm/response-operations-ui/Chart.yaml

@@ -18,4 +18,4 @@ version: 1.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.5.10
+appVersion: 2.5.11

response_operations_ui/__init__.py

@@ -58,7 +58,6 @@ def create_app(config_name=None):
             content_security_policy=csp_policy,
             content_security_policy_nonce_in=['script-src'],
             force_https=False,  # this is handled at the load balancer
-            legacy_content_security_policy_header=True,
             strict_transport_security=True,
             strict_transport_security_max_age=ONE_YEAR_IN_SECONDS,
             referrer_policy=DEFAULT_REFERRER_POLICY,

response_operations_ui/templates/components/section-navigation/_macro.njk

@@ -2,8 +2,8 @@
   <nav class="section-nav" id="{{ params.id }}" aria-label="{{ params.ariaLabel }}" role="menu">
       <ul class="section-nav__list" aria-label="{{ params.ariaListLabel }}">
         {% for item in (params.itemsList if params.itemsList is iterable else params.itemsList.items()) %}
-          <li class="section-nav__item {{ item.classes }}{{ ' section-nav__item--active' if (item.url == params.currentPath) or (item.url in params.currentPath) or (params.tabQuery == item.title|lower) }}">
-              <a class="section-nav__link" role="menuitem" href="{{ item.url }}" {% if (item.url == params.currentPath) or (item.url in params.currentPath) or (params.tabQuery == item.title|lower) %} aria-current="location" {% endif %}>{{ item.title }}</a>
+          <li class="section-nav__item {{ item.classes }}{{ ' section-nav__item--active' if params.currentPath is defined and ((item.url == params.currentPath) or (item.url in params.currentPath)) or (params.tabQuery == item.title|lower) }}">
+              <a class="section-nav__link" role="menuitem" href="{{ item.url }}" {% if (params.currentPath is defined and ((item.url == params.currentPath) or (item.url in params.currentPath))) or (params.tabQuery == item.title|lower) %} aria-current="location" {% endif %}>{{ item.title }}</a>
           </li>
         {% endfor %}
       </ul>

response_operations_ui/views/sign_in.py

@@ -42,6 +42,7 @@ def sign_in():
             # store the token in the session (it's server side and stored in redis)
             session['token'] = access_token
             session['username'] = username
+            session['user_id'] = user_id
             user = User(user_id, username)
             login_user(user)
             if 'next' in session: