update ceph source to reef 18.1.2

[ceph.git] / ceph / src / pybind / mgr / dashboard / controllers / saml2.py

diff --git a/ceph/src/pybind/mgr/dashboard/controllers/saml2.py b/ceph/src/pybind/mgr/dashboard/controllers/saml2.py
index 55445bc94d7b2cc6d174b8745418232785c73209..c11b18a27bc7e7e41caf8272ebd13fa0889c3bd6 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/saml2.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/saml2.py
@@ -69,7 +69,10 @@ class Saml2(BaseController, ControllerAuthMixin):
 
             token = JwtManager.gen_token(username)
             JwtManager.set_user(JwtManager.decode_token(token))
-            token = token.decode('utf-8')
+
+            # For backward-compatibility: PyJWT versions < 2.0.0 return bytes.
+            token = token.decode('utf-8') if isinstance(token, bytes) else token
+
             self._set_token_cookie(url_prefix, token)
             raise cherrypy.HTTPRedirect("{}/#/login?access_token={}".format(url_prefix, token))