From 2ec6e2b4ff4439a43ada6bfd232a7e664e4344a5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 7 Jun 2020 13:36:57 +0200 Subject: [PATCH 1/2] fixing tp? --- rowers/imports.py | 2 +- rowers/tpstuff.py | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/rowers/imports.py b/rowers/imports.py index 796a982f..6c0886fa 100644 --- a/rowers/imports.py +++ b/rowers/imports.py @@ -100,7 +100,7 @@ def imports_open(user,oauth_data): tokenname = oauth_data['tokenname'] refreshtokenname = oauth_data['refreshtokenname'] expirydatename = oauth_data['expirydatename'] - if tokenexpirydate and timezone.now()+timedelta(seconds=3599)>tokenexpirydate: + if tokenexpirydate and timezone.now()+timedelta(seconds=60)>tokenexpirydate: token = imports_token_refresh( user, tokenname, diff --git a/rowers/tpstuff.py b/rowers/tpstuff.py index d9d96996..49c6563e 100644 --- a/rowers/tpstuff.py +++ b/rowers/tpstuff.py @@ -72,15 +72,6 @@ def get_token(code): data=post_data,verify=False, ) - print(response.text) - - with open("media/tperrors.log","a") as errorlog: - timestr = strftime("%Y%m%d-%H%M%S") - errorlog.write(timestr+"\r\n") - json.dump(response.json(),errorlog) - errorlog.write("\r\n"+str(response.status_code)+' '+response.text) - errorlog.write("\r\n") - try: token_json = response.json() From b4e091323b4542573ed54b8f4c5413043f72c1ad Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 7 Jun 2020 13:42:05 +0200 Subject: [PATCH 2/2] changing verify to false --- rowers/imports.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rowers/imports.py b/rowers/imports.py index 6c0886fa..4beebc39 100644 --- a/rowers/imports.py +++ b/rowers/imports.py @@ -153,14 +153,14 @@ def imports_do_refresh_token(refreshtoken,oauth_data,access_token=''): try: response = requests.post(baseurl, data=json.dumps(post_data), - headers=headers) + headers=headers,verify=False) except: raise NoTokenError("Failed to get token") else: try: response = requests.post(baseurl, data=post_data, - headers=headers + headers=headers,verify=False, ) except: raise NoTokenError("Failed to get token") @@ -246,7 +246,7 @@ def imports_get_token( response = requests.post( base_uri, data=post_data, - headers=headers) + headers=headers,verify=False) if response.status_code == 200 or response.status_code == 201: token_json = response.json()