Merge branch 'release/v12.85'

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,
@@ -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()

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()