github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 12:59:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Change jwt_cookie to str

Browse source
This commit is contained in:
JonnyWong16 2020-03-24 21:16:14 -07:00
commit faf5cb0f8d
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plexpy/webauth.py
View file

@ -20,8 +20,6 @@
# Form based authentication for CherryPy. Requires the # Form based authentication for CherryPy. Requires the
# Session tool to be loaded. # Session tool to be loaded.
from __future__ import unicode_literals
from future.builtins import str
from future.builtins import object from future.builtins import object
from datetime import datetime, timedelta 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(): 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) jwt_token = cherrypy.request.cookie.get(jwt_cookie)
if jwt_token: if jwt_token:
@ -297,7 +295,7 @@ class AuthController(object):
if payload: if payload:
self.on_logout(payload['user'], payload['user_group']) 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] = 'expire'
cherrypy.response.cookie[jwt_cookie]['expires'] = 0 cherrypy.response.cookie[jwt_cookie]['expires'] = 0
cherrypy.response.cookie[jwt_cookie]['path'] = '/' cherrypy.response.cookie[jwt_cookie]['path'] = '/'
@ -343,7 +341,7 @@ class AuthController(object):
success=True, success=True,
oauth=bool(token)) 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] = jwt_token
cherrypy.response.cookie[jwt_cookie]['expires'] = int(time_delta.total_seconds()) cherrypy.response.cookie[jwt_cookie]['expires'] = int(time_delta.total_seconds())
cherrypy.response.cookie[jwt_cookie]['path'] = '/' cherrypy.response.cookie[jwt_cookie]['path'] = '/'