do not sign in when not necessary
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
5fc1be2321
commit
c73c71c9e9
@ -13,7 +13,7 @@ from marshm import ma
|
|||||||
from fred import flaskred
|
from fred import flaskred
|
||||||
from config import SENTRY_DSN, RELEASEMODE, RELEASE_ID, PORT, DEBUG, REDIS_URL, ALLOWED_ORIGINS
|
from config import SENTRY_DSN, RELEASEMODE, RELEASE_ID, PORT, DEBUG, REDIS_URL, ALLOWED_ORIGINS
|
||||||
from errorhandlers import register_all_error_handlers
|
from errorhandlers import register_all_error_handlers
|
||||||
from resources import LoginApi, ListsApi, MeApi, SingleListApi, TrackApi
|
from resources import LoginApi, ListsApi, MeApi, SingleListApi, ItemApi
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Main Flask RESTful API
|
Main Flask RESTful API
|
||||||
@ -68,7 +68,7 @@ api.add_resource(LoginApi, '/api/auth/login')
|
|||||||
api.add_resource(MeApi, '/api/auth/me')
|
api.add_resource(MeApi, '/api/auth/me')
|
||||||
api.add_resource(ListsApi, '/api/lists')
|
api.add_resource(ListsApi, '/api/lists')
|
||||||
api.add_resource(SingleListApi, '/api/lists/<listid>')
|
api.add_resource(SingleListApi, '/api/lists/<listid>')
|
||||||
api.add_resource(TrackApi, '/api/items/<itemid>')
|
api.add_resource(ItemApi, '/api/items/<itemid>')
|
||||||
|
|
||||||
app.add_url_rule("/healthz", "healthcheck", view_func=lambda: health.run())
|
app.add_url_rule("/healthz", "healthcheck", view_func=lambda: health.run())
|
||||||
|
|
||||||
|
@ -189,25 +189,16 @@ class SingleListApi(Resource):
|
|||||||
return retdata, 200
|
return retdata, 200
|
||||||
|
|
||||||
|
|
||||||
class TrackApi(Resource):
|
class ItemApi(Resource):
|
||||||
"""
|
"""
|
||||||
See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/getItem
|
See: https://swagger.kmlabz.com/?urls.primaryName=onSpot%20Backend#/backend/getItem
|
||||||
"""
|
"""
|
||||||
encryptor = EncryptedUserRedis(ENCODED_SECRET_KEY)
|
|
||||||
|
|
||||||
def get(self, itemid: str):
|
def get(self, itemid: str):
|
||||||
try:
|
|
||||||
currcreds = self.encryptor.load(flaskred.get(request.headers.get('Authorization')).decode('UTF-8'))
|
|
||||||
except Exception as e:
|
|
||||||
current_app.logger.warning(e)
|
|
||||||
abort(401, "unauthorized")
|
|
||||||
try:
|
try:
|
||||||
item_type = flaskred.get(itemid).decode('UTF-8')
|
item_type = flaskred.get(itemid).decode('UTF-8')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
current_app.logger.warning(e)
|
current_app.logger.warning(e)
|
||||||
abort(404, "unknown list")
|
abort(404, "unknown item")
|
||||||
musicbrainzngs.auth(currcreds['name'], currcreds['password'])
|
|
||||||
|
|
||||||
if item_type == 'release':
|
if item_type == 'release':
|
||||||
currrelease = musicbrainzngs.get_release_by_id(itemid, includes=['artists'])['release']
|
currrelease = musicbrainzngs.get_release_by_id(itemid, includes=['artists'])['release']
|
||||||
print(currrelease)
|
print(currrelease)
|
||||||
@ -232,7 +223,5 @@ class TrackApi(Resource):
|
|||||||
else:
|
else:
|
||||||
abort(417, "wrong type of item")
|
abort(417, "wrong type of item")
|
||||||
|
|
||||||
musicbrainzngs.auth(None, None)
|
|
||||||
|
|
||||||
retdata['type'] = item_type
|
retdata['type'] = item_type
|
||||||
return retdata, 200
|
return retdata, 200
|
||||||
|
Loading…
Reference in New Issue
Block a user