import ceph 15.2.10

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

diff --git a/ceph/src/pybind/mgr/dashboard/controllers/auth.py b/ceph/src/pybind/mgr/dashboard/controllers/auth.py
index d6dd12d6bda522eb8d00c56b888972269f4510ac..a657d0058e6fc26b0f384f9cca4de2802ac93e3a 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/auth.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/auth.py
@@ -41,7 +41,10 @@ class Auth(RESTController):
                 mgr.ACCESS_CTRL_DB.reset_attempt(username)
                 mgr.ACCESS_CTRL_DB.save()
                 token = JwtManager.gen_token(username)
-                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
+
                 set_cookies(url_prefix, token)
                 return {
                     'token': token,