Compare commits

..

No commits in common. "2eb2a7701de20a0c7e79ffbfb650d31198bc52a7" and "d7f9a309b1fc570e7e9caa554974bbbd8d8cce43" have entirely different histories.

2 changed files with 6 additions and 11 deletions

View file

@ -6,7 +6,5 @@
"dbpass":"choose a good password for the mysql user and put it here",
"dbname":"curiousgreg",
"min_time_between_checks":1,
"max_time_between_checks":60,
"base_uri":"http://localhost:5000",
"debug":false
"max_time_between_checks":60
}

11
web.py
View file

@ -90,12 +90,9 @@ def home():
return redirect(url_for('main'))
@app.route('/debug')
@app.route('/debug') #TODO: remove this before making the site live ;p
def print_debug_info():
if cfg['debug']:
return json.dumps(session._get_current_object())
else:
return redirect('/home')
@app.route('/logout')
def reset_session():
@ -124,11 +121,11 @@ def internal_auth_a(): #TODO: prevent these endpoints from being spammed somehow
api_base_url=session['instance'],
scopes=scopes,
website=cfg['website'],
redirect_uris=['{}/internal/auth_b'.format(cfg['base_uri'])]
redirect_uris=['https://cg.lynnesbian.space/internal/auth_b', 'http://localhost:5000/internal/auth_b']
)
client = Mastodon(client_id=session['client_id'], client_secret=session['client_secret'], api_base_url=session['instance'])
url = client.auth_request_url(client_id=session['client_id'], redirect_uris='{}/internal/auth_b'.format(cfg['base_uri']), scopes=scopes)
url = client.auth_request_url(client_id=session['client_id'], redirect_uris='http://localhost:5000/internal/auth_b', scopes=scopes)
return redirect(url, code=307)
@ -136,7 +133,7 @@ def internal_auth_a(): #TODO: prevent these endpoints from being spammed somehow
def internal_auth_b():
#write details to DB
client = Mastodon(client_id=session['client_id'], client_secret=session['client_secret'], api_base_url=session['instance'])
session['secret'] = client.log_in(code = request.args.get('code'), scopes=scopes, redirect_uri='{}/internal/auth_b'.format(cfg['base_uri']))
session['secret'] = client.log_in(code = request.args.get('code'), scopes=scopes, redirect_uri='http://localhost:5000/internal/auth_b')
acct_info = client.account_verify_credentials()
session['username'] = acct_info['username']
session['avi'] = acct_info['avatar']