PeterSurda/inoreader2readwise
1
0
Fork 2
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Separate services - app, db, and job #1

Open
swapnil wants to merge 36 commits from swapnil/inoreader2readwise:main into main
pull from: swapnil/inoreader2readwise:main
merge into: PeterSurda:main
Conversation 1 Commits 36 Files Changed 14 +36 -16
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1b216dd11 - Show all commits

52
app/main.py
View File

@ -36,8 +36,8 @@ def home():
'Authorization': f'Bearer {token.get("access_token")}' 'Authorization': f'Bearer {token.get("access_token")}'
}).json() }).json()
last_synced = datetime.fromtimestamp(token.get('timestamp')).strftime('%Y-%m-%d %H:%M:%S') last_synced = datetime.fromtimestamp(token.get('updated_at')).strftime('%Y-%m-%d %H:%M:%S')
next_sync = datetime.fromtimestamp(token.get('timestamp') + token.get('expiration_seconds')).strftime('%Y-%m-%d %H:%M:%S') next_sync = datetime.fromtimestamp(token.get('updated_at') + token.get('expiration_seconds')).strftime('%Y-%m-%d %H:%M:%S')
return render_template('home.html', user_info=user_info, return render_template('home.html', user_info=user_info,
readwise_api_key=token.get('readwise_api_key', ''), readwise_api_key=token.get('readwise_api_key', ''),
last_synced=last_synced, next_sync=next_sync) last_synced=last_synced, next_sync=next_sync)
@ -161,21 +161,41 @@ def is_logged_in():
return token.get('active', False) return token.get('active', False)
def save_token(email, access_token, refresh_token, expiration_seconds): def save_token(email, access_token, refresh_token, expiration_seconds):
response = requests.post( # check if an active token with this email already exists
f'{database_url}/token', token_by_email_resp = requests.get(f'{database_url}/token?email={email}')
headers={ raise_for_status(token_by_email_resp)
'Content-Type': 'application/json'
},
json={
'email': email,
'access_token': access_token,
'refresh_token': refresh_token,
'expiration_seconds': expiration_seconds
}
)
raise_for_status(response)
return response.json().get('id') if token_by_email_resp.status_code != 200:
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
}
)
raise_for_status(response)
return response.json().get('id')
else:
token_by_email_resp_json = token_by_email_resp.json()
token = token_by_email_resp_json['token']
response = requests.put(
f'{database_url}/token/{token["id"]}',
headers={
'Content-Type': 'application/json'
},
json={
'access_token': access_token,
'refresh_token': refresh_token,
'expiration_seconds': expiration_seconds,
}
)
raise_for_status(response)
return token['id']
def set_session_token_id(token_id): def set_session_token_id(token_id):
session['token_id'] = token_id session['token_id'] = token_id