From 4c022a608066665785791449f5cc80e1d42a2b07 Mon Sep 17 00:00:00 2001 From: Swapnil Date: Wed, 31 Jan 2024 11:49:27 +0530 Subject: [PATCH] job: Run job for all active tokens - check, deactivate, & refresh token - better logging --- job/main.py | 116 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 80 insertions(+), 36 deletions(-) diff --git a/job/main.py b/job/main.py index c1ea171..bb52848 100644 --- a/job/main.py +++ b/job/main.py @@ -33,11 +33,11 @@ def update_last_update_time(new_time): with open(DATA_STORE_PATH, 'w') as file: file.write(str(new_time)) -def get_new_annotations(last_annotation_time): +def get_new_annotations(last_annotation_time, inoreader_token): inoreader = APIHandler( "https://www.inoreader.com/reader/api/0/stream/contents", headers = { - 'Authorization': 'Bearer ' + get_inoreader_access_token() + 'Authorization': 'Bearer ' + inoreader_token() } ) @@ -74,11 +74,11 @@ def get_new_annotations(last_annotation_time): return [annotation for annotation in all_annotations if annotation['added_on'] > last_annotation_time] -def push_annotations_to_readwise(annotations): +def push_annotations_to_readwise(annotations, readwise_token): readwise = APIHandler( "https://readwise.io", headers = { - 'Authorization': 'Token ' + os.getenv("READWISE_ACCESS_TOKEN"), + 'Authorization': 'Token ' + readwise_token, 'Content-Type': 'application/json' } ) @@ -101,29 +101,29 @@ def push_annotations_to_readwise(annotations): } ) -def get_inoreader_access_token(): - response = requests.get(f'{DATABASE_URL}/token/latest') - response.raise_for_status() +# def get_inoreader_access_token(): +# response = requests.get(f'{DATABASE_URL}/token/latest') +# response.raise_for_status() - if response.status_code == 204: - # throw error - not logged in. Please log in first through the web app - raise Exception("Not logged in. Please log in first through the web app") - elif response.status_code == 200: - resp_json = response.json() - if resp_json['token']['expiration_seconds'] + resp_json['token']['timestamp'] > datetime.now().timestamp(): - return resp_json['token']['access_token'] - else: - return refresh_inoreader_access_token(resp_json['token']['refresh_token']) +# if response.status_code == 204: +# # throw error - not logged in. Please log in first through the web app +# raise Exception("Not logged in. Please log in first through the web app") +# elif response.status_code == 200: +# resp_json = response.json() +# if resp_json['token']['expiration_seconds'] + resp_json['token']['timestamp'] > datetime.now().timestamp(): +# return resp_json['token']['access_token'] +# else: +# return refresh_inoreader_access_token(resp_json['token']['refresh_token']) - access_token = get_token_from_database() - if not access_token: - access_token = refresh_inoreader_access_token() +# access_token = get_token_from_database() +# if not access_token: +# access_token = refresh_inoreader_access_token() - if not access_token: - raise Exception("Unable to get access token. Try logging in again through the web app") - return access_token +# if not access_token: +# raise Exception("Unable to get access token. Try logging in again through the web app") +# return access_token -def refresh_inoreader_access_token(refresh_token): +def refresh_inoreader_access_token(refresh_token, readwise_api_key): response = requests.post( 'https://www.inoreader.com/oauth2/token', headers={ @@ -139,40 +139,84 @@ def refresh_inoreader_access_token(refresh_token): response.raise_for_status() - tokens = response.json() + token = response.json() + + user_info = requests.get('https://www.inoreader.com/reader/api/0/user-info', headers={ + 'Authorization': f'Bearer {token.get("access_token")}' + }).json() # Save tokens for later use - save_tokens(tokens['access_token'], tokens['refresh_token'], tokens['expires_in']) + save_token( + user_info.get('userEmail'), + token['access_token'], + token['refresh_token'], + token['expires_in'], + readwise_api_key + ) - return tokens['access_token'] + return token['access_token'], readwise_api_key -def save_tokens(access_token, refresh_token, expiration_seconds): +def save_token(email, access_token, refresh_token, expiration_seconds, readwise_api_key): response = requests.post( f'{DATABASE_URL}/token', headers={ 'Content-Type': 'application/json' }, json={ + 'email': email, 'access_token': access_token, 'refresh_token': refresh_token, - 'expiration_seconds': expiration_seconds + 'expiration_seconds': expiration_seconds, + 'readwise_api_key': readwise_api_key } ) response.raise_for_status() +def get_all_active_tokens(): + response = requests.get(f'{DATABASE_URL}/token/all?only_active=true') + response.raise_for_status() + + if response.status_code == 200: + return response.json()['tokens'] + else: + return [] + +def deactivate_token(token_id): + response = requests.post( + f'{DATABASE_URL}/token/{token_id}/deactivate', + headers={ + 'Content-Type': 'application/json' + } + ) + response.raise_for_status() + +def check_and_refresh_access_token(token): + if token['expiration_seconds'] + token['timestamp'] > datetime.now().timestamp(): + return token['access_token'], token['readwise_api_key'] + else: + deactivate_token(token['id']) + return refresh_inoreader_access_token(token['refresh_token'], token['readwise_api_key']) + def main(): while True: try: - last_annotation_time = get_last_update_time() - new_annotations = get_new_annotations(last_annotation_time) + all_tokens = get_all_active_tokens() + for token in all_tokens: + logging.info("Checking for new annotations for user with email: {}".format(token['email'])) - if new_annotations: - latest_added_on = max(annotation['added_on'] for annotation in new_annotations) - push_annotations_to_readwise(new_annotations) - update_last_update_time(latest_added_on) - else: - logging.info("No new annotations found") + inoreader_token, readwise_api_key = check_and_refresh_access_token(token) + + last_annotation_time = get_last_update_time() + new_annotations = get_new_annotations(last_annotation_time, inoreader_token) + + if new_annotations: + latest_added_on = max(annotation['added_on'] for annotation in new_annotations) + push_annotations_to_readwise(new_annotations, readwise_api_key) + update_last_update_time(latest_added_on) + logging.info("Successfully pushed {} new annotations to Readwise for user with email: {}".format(len(new_annotations), token['email'])) + else: + logging.info("No new annotations found for user with email: {}".format(token['email'])) time.sleep(86400) # Sleep for 24 hours