jgaunt/seafile-sso
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated request method

Browse Source
This commit is contained in:
John Gaunt
2021-11-06 15:14:36 -04:00
parent c9bb99f150
commit bb7e576273
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
seafile-ldap.py
View File

@@ -11,11 +11,15 @@ import urllib3
import json import json
import mysql.connector import mysql.connector
def request(resource, seafileURL, seafileToken, method='GET', data=None): def request(resource, seafileURL, seafileToken, method='GET', data=None, dataIsJson=True):
if data is None: if data is None:
data = '' data = ''
else: else:
data = json.dumps(data) if dataIsJson:
data = json.dumps(data)
headers = {'Content-type': 'application/json', 'Accept': 'application/json; charset=utf-8; indent=4', 'Authorization': 'Token {0}'.format(seafileToken)}
else:
headers = {'Content-type': 'application/x-www-form-urlencoded', 'Accept': 'application/json; charset=utf-8; indent=4', 'Authorization': 'Token {0}'.format(seafileToken)}
url = '{0}/api/v2.1/{1}'.format(seafileURL, resource) url = '{0}/api/v2.1/{1}'.format(seafileURL, resource)
logger.debug('Request URL: {0}'.format(url)) logger.debug('Request URL: {0}'.format(url))
logger.debug('Request Method: {0}'.format(method)) logger.debug('Request Method: {0}'.format(method))
@@ -23,9 +27,10 @@ def request(resource, seafileURL, seafileToken, method='GET', data=None):
r = requests.request( r = requests.request(
method, method,
url, url,
data=data, data = data,
headers={'Content-type': 'application/json','Accept': 'application/json; charset=utf-8; indent=4', 'Authorization': 'Token {0}'.format(seafileToken)}, headers = headers,
) )
logger.debug('Response: {0}'.format(r))
logger.debug('Request Status Code: {0}'.format(r.status_code)) logger.debug('Request Status Code: {0}'.format(r.status_code))
if r.ok: if r.ok:
try: try: