fixed polar (hopefully)

rowers/views/importviews.py

@@ -206,7 +206,7 @@ def rower_polar_authorize(request): # pragma: no cover
 
     params = {"client_id": POLAR_CLIENT_ID,
               "response_type": "code",
-              "redirect_uri": POLAR_REDIRECT_URI,
+              #"redirect_uri": POLAR_REDIRECT_URI,
               "state": state,
 #             "scope":"accesslink.read_all"
     }
@@ -420,6 +420,7 @@ def rower_process_polarcallback(request):
 
     try:
         code = request.GET['code']
+        dologging('polar.log',code)
     except MultiValueDictKeyError: # pragma: no cover
         try:
             message = request.GET['error']
@@ -432,7 +433,21 @@ def rower_process_polarcallback(request):
         return HttpResponseRedirect(url)
 
     access_token, expires_in, user_id = polarstuff.get_token(code)
-    polar_user_data = polarstuff.register_user(request.user, access_token)
+    expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in)
+    r = getrower(request.user)
+    r.polartoken = access_token
+    r.polartokenexpirydate = expirydatetime
+    r.polaruserid = user_id
+
+    r.save()
+
+    if user_id:
+        polar_user_data = polarstuff.register_user(request.user, access_token)
+    else:
+        messages.error(request,'Polar Flow Authorization Failed')
+        url = reverse('rower_exportsettings_view')
+        return HttpResponseRedirect(url)
+
 
     try:
         user_id2 = polar_user_data['polar-user-id']
@@ -442,14 +457,14 @@ def rower_process_polarcallback(request):
     if user_id2 != user_id:
         messages.error(request,'Polar User ID error')
 
-    expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in)
+    #expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in)
 
-    r = getrower(request.user)
-    r.polartoken = access_token
-    r.polartokenexpirydate = expirydatetime
-    r.polaruserid = user_id
+    #r = getrower(request.user)
+    #r.polartoken = access_token
+    #r.polartokenexpirydate = expirydatetime
+    #r.polaruserid = user_id
 
-    r.save()
+    #r.save()
 
     if user_id2 == user_id:
         successmessage = "Tokens stored. Good to go. Please check your import/export settings"