diff --git a/requirements.txt b/requirements.txt index bc8229a0fa..64870825cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,6 +14,6 @@ djangorestframework==3.11.1 python-dateutil requests pillow -pyjwt +pyjwt==2.1.* pycryptodome requests_oauthlib diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py index df3a4700f5..64261e4d33 100644 --- a/seahub/utils/__init__.py +++ b/seahub/utils/__init__.py @@ -1121,7 +1121,7 @@ if HAS_OFFICE_CONVERTER: def add_office_convert_task(file_id, doctype, raw_path): payload = {'exp': int(time.time()) + 300, } token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256') - headers = {"Authorization": "Token %s" % token.decode()} + headers = {"Authorization": "Token %s" % token} params = {'file_id': file_id, 'doctype': doctype, 'raw_path': raw_path} url = urljoin(OFFICE_CONVERTOR_ROOT, '/add-task') requests.get(url, params, headers=headers) @@ -1130,7 +1130,7 @@ if HAS_OFFICE_CONVERTER: def query_office_convert_status(file_id, doctype): payload = {'exp': int(time.time()) + 300, } token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256') - headers = {"Authorization": "Token %s" % token.decode()} + headers = {"Authorization": "Token %s" % token} params = {'file_id': file_id, 'doctype': doctype} url = urljoin(OFFICE_CONVERTOR_ROOT, '/query-status') d = requests.get(url, params, headers=headers) @@ -1158,7 +1158,7 @@ if HAS_OFFICE_CONVERTER: url = urljoin(OFFICE_CONVERTOR_ROOT, '/get-converted-page') payload = {'exp': int(time.time()) + 300, } token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256') - headers = {"Authorization": "Token %s" % token.decode()} + headers = {"Authorization": "Token %s" % token} params = {'static_filename': static_filename, 'file_id': file_id} try: ret = requests.get(url, params, headers=headers)