From e3b8543a125a57f8c258bc03edceba4642883586 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 2 Jun 2023 18:05:03 +0200
Subject: [PATCH] fix rols

---
 ereuse_devicehub/did/views.py              | 6 ------
 ereuse_devicehub/templates/did/layout.html | 2 +-
 ereuse_devicehub/views.py                  | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ereuse_devicehub/did/views.py b/ereuse_devicehub/did/views.py
index b902ddd8..53311275 100644
--- a/ereuse_devicehub/did/views.py
+++ b/ereuse_devicehub/did/views.py
@@ -24,7 +24,6 @@ class DidView(View):
         self.device = None
         self.get_ids(id_dpp)
 
-        # import pdb; pdb.set_trace()
         self.context = {
             'version': __version__,
             'oidc': 'oidc' in app.blueprints.keys(),
@@ -102,10 +101,6 @@ class DidView(View):
         if not device:
             return flask.abort(404)
 
-        abstract = None
-        if device.placeholder:
-            abstract = device.placeholder.binding
-
         placeholder = device.binding or device.placeholder
         device_abstract = placeholder and placeholder.binding or device
         device_real = placeholder and placeholder.device or device
@@ -120,7 +115,6 @@ class DidView(View):
                 'device': self.device,
                 'device_abstract': device_abstract,
                 'device_real': device_real,
-                'abstract': abstract,
                 'components': components,
             }
         )
diff --git a/ereuse_devicehub/templates/did/layout.html b/ereuse_devicehub/templates/did/layout.html
index 9e91afba..5050ee44 100644
--- a/ereuse_devicehub/templates/did/layout.html
+++ b/ereuse_devicehub/templates/did/layout.html
@@ -246,7 +246,7 @@
         </a>
         {% if oidc %}
         <br />
-        <a class="btn btn-primary mt-3" type="button" href="{{ url_for('oidc.login_other_inventory') }}?next={{ device_real.url.to_text() }}">
+        <a class="btn btn-primary mt-3" type="button" href="{{ url_for('oidc.login_other_inventory') }}?next={{ path }}">
           User of other inventory
         </a>
         {% endif %}
diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py
index eaa2c4f1..4148d455 100644
--- a/ereuse_devicehub/views.py
+++ b/ereuse_devicehub/views.py
@@ -64,7 +64,7 @@ class LoginView(View):
 
 class LogoutView(View):
     def dispatch_request(self):
-        session_vars = ['token_dlt', 'rols']
+        session_vars = ['token_dlt', 'rols', 'oidc']
         [session.pop(i, '') for i in session_vars]
         next_url = flask.request.args.get('next')
         logout_user()