Merge branch 'hotfix/uaupload'

rowers/.#views.py

@@ -0,0 +1 @@
+E408191@CZ27LT9RCGN72.18468:1521978923

rowers/underarmourstuff.py

@@ -97,7 +97,22 @@ def underarmour_open(user):
 	raise UnderArmourNoTokenError("User has no token")
     else:
 	if (timezone.now()>r.underarmourtokenexpirydate):
-	    thetoken = rower_underarmour_token_refresh(user)
+            res = do_refresh_token(
+                r.underarmourrefreshtoken,r.underarmourtoken
+                )
+            access_token = res[0]
+            expires_in = res[1]
+            refresh_token = res[2]
+
+            expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in)
+
+            r = getrower(request.user)
+            r.underarmourtoken = access_token
+            r.underarmourtokenexpirydate = expirydatetime
+            r.underarmourrefreshtoken = refresh_token
+            
+            r.save()
+            thetoken = r.underarmourtoken
 	else:
 	    thetoken = r.underarmourtoken