Refactor: redesign the authorization and authentication workflow

Author: huaminghuangtw

.gitignore

@@ -3,4 +3,4 @@ __pycache__/
 .idea/
 .vscode/
 configfile/
-logfile/
+logfile/

CHANGELOG.md

@@ -0,0 +1,3 @@
+@echo off
+cmd /k "cd /d G:\My Drive\sourcecode\pythonscripts\Strava-Tool\src & C:\Users\USER\miniconda3\etc\profile.d\conda.sh & conda activate Strava-Tool & python StravaUploadTool_Main.py"
+pause

Pipfile

@@ -0,0 +1,7 @@
+STRAVA_CLIENT_ID: '44973'
+STRAVA_CLIENT_SECRET: '2ed9b35113cc71c7b53460dedae05ef2b142133d'
+LINE_CHANNEL_ACCESS_TOKEN: 'z24FeCXZX2E3bx/BfeGxRttiRMwwkutV1+Q4Sr6w8UInBLjCpmcVNmewMDLLAahezZNJQD73ogwgB9VEmVndAKNl8fzXFyRSLGj3gMubocMVbCnq8MGgM4VMnQ5Zd4hUHkf/io0YZdReOvyALa3RAwdB04t89/1O/w1cDnyilFU='
+LINE_CHANNEL_SECRET: '5796fa888d9fd7b505ac780ecf27c4ae'
+ZWIFT_ACTIVITY_DIR: 'C:\Users\USER\Documents\Zwift\Activities'
+GMAIL_USER_ID: 'huaming.huang.tw@gmail.com'
+GMAIL_PASSWORD: 'eomzmbjezezpcsnv'

Pipfile.lock

@@ -0,0 +1,3 @@
+STRAVA_ACCESS_TOKEN = 27d6b726341a906154e99e884e8d1339702a6bba
+STRAVA_REFRESH_TOKEN = 94f06d238645a184bdc3a5283d9badeb8d2e9b0b
+STRAVA_TOKEN_EXPIRY_TIME = 1664725248

Strava-Tool.bat

@@ -0,0 +1,15 @@
+Flask
+line-bot-sdk
+pyyaml
+stravalib
+requests
+pandas
+seaborn
+matplotlib
+selenium
+pyautogui
+pyperclip
+alive-progress
+gunicorn
+psycopg2
+

StravaTool.bat

@@ -24,7 +24,7 @@ def get_Latest_Activity_Data(access_token: str, numberOfActivities: str) -> list
         header = {'Authorization': 'Bearer ' + access_token}
         param = {'per_page': numberOfActivities, 'page': 1}
         r = requests.get(activites_url, headers=header, params=param)
-    except requests.RequestException:
+    except requests.exceptions.RequestException:
         return None
 
     my_dataset = r.json()
@@ -49,7 +49,7 @@ def get_Timeinterval_Activity_Data(access_token: str, before: str, after: str) -
             header = {'Authorization': 'Bearer ' + access_token}
             param = {'before': before, 'after': after, 'per_page': per_page, 'page': page_id}
             r = requests.get(activites_url, headers=header, params=param)
-        except requests.RequestException:
+        except requests.exceptions.RequestException:
             return None
 
         dataset = r.json()
@@ -78,7 +78,7 @@ def get_All_Activity_Data(access_token: str) -> list:
             header = {'Authorization': 'Bearer ' + access_token}
             param = {'per_page': per_page, 'page': page_id}
             r = requests.get(activites_url, headers=header, params=param)
-        except requests.RequestException:
+        except requests.exceptions.RequestException:
             return None
 
         dataset = r.json()

credentials/config.yaml

@@ -5,20 +5,20 @@
 # ----------------------------------------------------------------------------------------------------------------------
 #
 # Step by step:
-# 1) Get authorization code from authorization page. This is a one-time, manual step.
+# (1) Get authorization code from authorization page. This is a one-time, manual step.
 #    Paste the below code in a browser, hit enter then grab the "code" part from the resulting url.
 #
 # https://www.strava.com/oauth/authorize?client_id=your_client_id&redirect_uri=http://localhost&response_type=code&scope=activity:read_all,activity:write
 #
-# 2) Make a POST request to Strava: exchange authorization code for access token & refresh token (This also only needs to be done once)
+# (2) Make a POST request to Strava: exchange authorization code for access token & refresh token (This also only needs to be done once)
 #
 # https://www.strava.com/oauth/token?client_id=your_client_id&client_secret=your_client_secret&code=your_code_from_previous_step&grant_type=authorization_code
 #
-# 3) View your activities using the access token just received from 2)
+# (3) View your activities using the access token just received from (2)
 #
 # https://www.strava.com/api/v3/athlete/activities?access_token=access_token_from_previous_step
 #
-# 4) Use refresh token to get new access tokens (i.e., getNewAccessTokens())
+# (4) Use refresh token to get new access tokens
 #
 # https://www.strava.com/oauth/token?client_id=your_client_id&client_secret=your_client_secret&refresh_token=your_refresh_token_from_previous_step&grant_type=refresh_token
 #

credentials/tokens.txt

@@ -1,10 +1,10 @@
 from authentication import *
 from file_manipulation import *
-from alive_progress import alive_bar
-import requests, urllib3
-urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-import sys, os, subprocess, glob, time, datetime
 from typing import Any, Tuple
+from alive_progress import alive_bar
+import requests
+import sys, os, subprocess, glob
+import time, datetime
 import imaplib, email
 import re
 
@@ -55,21 +55,22 @@ def upload_Fit_Activity_Files(access_token: str):
     os.chdir(os.path.join(ZWIFT_ACTIVITY_DIR, "FixedActivities"))
     fitfile_list = glob.glob("*.fit")
 
-    print("Start uploading activity files...\n")
+    print("\nStart uploading activity files...\n")
 
     with alive_bar(len(fitfile_list), title='Uploading FIT activity files', bar="blocks") as bar:
         for fitfile in fitfile_list:
             with open(fitfile, 'rb') as fit_file:
                 try:
                     uploads_url = "https://www.strava.com/api/v3/uploads"
-                    payload = {'client_id': CLIENT_ID, 'data_type': 'fit', 'trainer': 'Elite Turbo Muin Smart B+'}
+                    payload = { 'client_id': STRAVA_CLIENT_ID,
+                                'data_type': 'fit' }
                     header = {'Authorization': 'Bearer ' + access_token}
                     f = {'file': fit_file}
                     r = requests.post(uploads_url,
                                       data=payload,
                                       headers=header,
                                       files=f)
-                except requests.RequestException:
+                except requests.exceptions.RequestException:
                     return None
 
                 print("Uploading " + fitfile + "...")    
@@ -92,10 +93,13 @@ def upload_Fit_Activity_Files(access_token: str):
                     if (isError) or (activity_id is not None):
                         fit_file.close()
                         move_To_Uploaded_Or_Malformed_Activities_Folder(fitfile)
+                        
+                        if (activity_id is not None):
+                            print("Activity ID:", activity_id)
 
                         # update progress bar
                         bar()
-                    
+                        
                         break
                 print("")
 
@@ -105,7 +109,7 @@ def check_Upload_Status(access_token: str, filename: str, upload_ID: str) -> Tup
         uploads_url = "https://www.strava.com/api/v3/uploads/" + upload_ID
         header = {'Authorization': 'Bearer ' + access_token}
         r = requests.get(uploads_url, headers=header)
-    except requests.RequestException:
+    except requests.exceptions.RequestException:
         return None
 
     try:
@@ -116,20 +120,22 @@ def check_Upload_Status(access_token: str, filename: str, upload_ID: str) -> Tup
         return None
 
     if (error_msg is None) and (activity_id is None):  # Possibility 1: Your activity is still being processed.
-        print(status + '.. ' + filename)
+        print(status + '.. ')
         return (False, activity_id)
     elif (error_msg):                                  # Possibility 2: There was an error processing your activity. (check for malformed data and duplicates)
-        print(status + '.. ' + filename)
+        print(status + '.. ')
         print("Reason: " + error_msg + '\n')
         if findWholeWord('malformed')(error_msg):
             print("Please check this file in the 'UploadedOrMalformedActivities' folder!\n")
         return (True, activity_id)
-    else:                                          # Possibility 3: Your activity is ready.
-        print(status + ' (' + filename + ')' + '\n')
+    else:                                              # Possibility 3: Your activity is ready.
+        print(status + '\n')
         return (False, activity_id)
 
 
+# ----------------
 # Helper functions
+# ----------------
 def wait(poll_interval: float):
     time.sleep(poll_interval)
 

environment.yaml

@@ -6,20 +6,20 @@
 # ----------------------------------------------------------------------------------------------------------------------
 #
 # Step by step:
-# 1) Get authorization code from authorization page. This is a one-time, manual step.
+# (1) Get authorization code from authorization page. This is a one-time, manual step.
 #    Paste the below code in a browser, hit enter then grab the "code" part from the resulting url.
 #
 # https://www.strava.com/oauth/authorize?client_id=your_client_id&redirect_uri=http://localhost&response_type=code&scope=activity:read_all,activity:write
 #
-# 2) Make a POST request to Strava: exchange authorization code for access token & refresh token (This also only needs to be done once)
+# (2) Make a POST request to Strava: exchange authorization code for access token & refresh token (This also only needs to be done once)
 #
 # https://www.strava.com/oauth/token?client_id=your_client_id&client_secret=your_client_secret&code=your_code_from_previous_step&grant_type=authorization_code
 #
-# 3) View your activities using the access token just received from 2)
+# (3) View your activities using the access token just received from (2)
 #
 # https://www.strava.com/api/v3/athlete/activities?access_token=access_token_from_previous_step
 #
-# 4) Use refresh token to get new access tokens (i.e., getNewAccessTokens())
+# (4) Use refresh token to get new access tokens
 #
 # https://www.strava.com/oauth/token?client_id=your_client_id&client_secret=your_client_secret&refresh_token=your_refresh_token_from_previous_step&grant_type=refresh_token
 #
@@ -43,7 +43,9 @@ def main():
     """)
     preprocessing()
     fix_Fit_Activity_Files()
-    upload_Fit_Activity_Files(get_New_Access_Tokens())
+    TOKEN_FILE_PATH = Path('../credentials/tokens.txt')
+    access_token = get_access_token(TOKEN_FILE_PATH)
+    upload_Fit_Activity_Files(access_token)
 
 
 if __name__ == "__main__":