From faf5cb0f8d7bc1e798383258187b143b2feb2600 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Tue, 24 Mar 2020 21:16:14 -0700 Subject: [PATCH] Change jwt_cookie to str --- plexpy/webauth.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plexpy/webauth.py b/plexpy/webauth.py index 6cc419cf..b32c9226 100644 --- a/plexpy/webauth.py +++ b/plexpy/webauth.py @@ -20,8 +20,6 @@ # Form based authentication for CherryPy. Requires the # Session tool to be loaded. -from __future__ import unicode_literals -from future.builtins import str from future.builtins import object from datetime import datetime, timedelta @@ -151,7 +149,7 @@ def check_credentials(username=None, password=None, token=None, admin_login='0', def check_jwt_token(): - jwt_cookie = JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID + jwt_cookie = str(JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID) jwt_token = cherrypy.request.cookie.get(jwt_cookie) if jwt_token: @@ -297,7 +295,7 @@ class AuthController(object): if payload: self.on_logout(payload['user'], payload['user_group']) - jwt_cookie = JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID + jwt_cookie = str(JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID) cherrypy.response.cookie[jwt_cookie] = 'expire' cherrypy.response.cookie[jwt_cookie]['expires'] = 0 cherrypy.response.cookie[jwt_cookie]['path'] = '/' @@ -343,7 +341,7 @@ class AuthController(object): success=True, oauth=bool(token)) - jwt_cookie = JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID + jwt_cookie = str(JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID) cherrypy.response.cookie[jwt_cookie] = jwt_token cherrypy.response.cookie[jwt_cookie]['expires'] = int(time_delta.total_seconds()) cherrypy.response.cookie[jwt_cookie]['path'] = '/'