pogmommy/rebble-weather
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove rebble auth dependency

Browse source
This commit is contained in:
Penelope Gwen 2024-06-25 12:23:17 -06:00
parent 20b5c94035
commit 39e142fe11
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
weather/__init__.py
View file

@ -16,7 +16,7 @@ if os.environ.get('HONEYCOMB_KEY'):
beeline.init(writekey=os.environ['HONEYCOMB_KEY'], dataset='rws', service_name='weather') beeline.init(writekey=os.environ['HONEYCOMB_KEY'], dataset='rws', service_name='weather')
HoneyMiddleware(app, db_events = True) HoneyMiddleware(app, db_events = True)
auth_internal = os.environ['REBBLE_AUTH_URL_INT'] #auth_internal = os.environ['REBBLE_AUTH_URL_INT']
ibm_root = os.environ.get('IBM_API_ROOT', 'https://api.weather.com') ibm_root = os.environ.get('IBM_API_ROOT', 'https://api.weather.com')
ibm_key = os.environ['IBM_API_KEY'] ibm_key = os.environ['IBM_API_KEY']
http_protocol = os.environ.get('HTTP_PROTOCOL', 'https') http_protocol = os.environ.get('HTTP_PROTOCOL', 'https')
@ -170,15 +170,15 @@ def heartbeat():
@app.route('/api/v1/geocode/<float:latitude>/<float:longitude>/') @app.route('/api/v1/geocode/<float:latitude>/<float:longitude>/')
def geocode(latitude, longitude): def geocode(latitude, longitude):
if not request.args.get('access_token'): # if not request.args.get('access_token'):
abort(401) # abort(401)
user_req = requests.get(f"{auth_internal}/api/v1/me", # user_req = requests.get(f"{auth_internal}/api/v1/me",
headers={'Authorization': f"Bearer {request.args['access_token']}"}) # headers={'Authorization': f"Bearer {request.args['access_token']}"})
if user_req.status_code == 401: # if user_req.status_code == 401:
abort(401) # abort(401)
user_req.raise_for_status() # user_req.raise_for_status()
if not user_req.json()['is_subscribed']: # if not user_req.json()['is_subscribed']:
raise HTTPPaymentRequired() # raise HTTPPaymentRequired()
beeline.add_context_field("user", user_req.json()['uid']) beeline.add_context_field("user", user_req.json()['uid'])
units = request.args.get('units', 'h') units = request.args.get('units', 'h')