From bb7e576273c347392640468f3f72ed4fb075a9e7 Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Sat, 6 Nov 2021 15:14:36 -0400 Subject: [PATCH] updated request method --- seafile-ldap.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/seafile-ldap.py b/seafile-ldap.py index 4e61117..f76b06e 100644 --- a/seafile-ldap.py +++ b/seafile-ldap.py @@ -11,11 +11,15 @@ import urllib3 import json 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: data = '' 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) logger.debug('Request URL: {0}'.format(url)) logger.debug('Request Method: {0}'.format(method)) @@ -23,9 +27,10 @@ def request(resource, seafileURL, seafileToken, method='GET', data=None): r = requests.request( method, url, - data=data, - headers={'Content-type': 'application/json','Accept': 'application/json; charset=utf-8; indent=4', 'Authorization': 'Token {0}'.format(seafileToken)}, + data = data, + headers = headers, ) + logger.debug('Response: {0}'.format(r)) logger.debug('Request Status Code: {0}'.format(r.status_code)) if r.ok: try: