yusur/coriplus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some fixes

Browse source
This commit is contained in:
Yusur 2019-10-28 08:29:07 +01:00
parent dc33b5567a
commit 09a809192a
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models.py
View file

@ -16,7 +16,7 @@ import os
# here should go `from .utils import get_current_user`, but it will cause # here should go `from .utils import get_current_user`, but it will cause
# import errors. It's instead imported at function level. # import errors. It's instead imported at function level.
database = SqliteDatabase(os.path.join(os.getcwd(), 'coriplus.sqlite')) database = SqliteDatabase(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'coriplus.sqlite'))
class BaseModel(Model): class BaseModel(Model):
class Meta: class Meta:

11
app/utils.py
View file

@ -101,9 +101,14 @@ except OSError:
# get the user from the session # get the user from the session
# changed in 0.5 to comply with flask_login # changed in 0.5 to comply with flask_login
def get_current_user(): def get_current_user():
user_id = session.get('user_id') # new in 0.7; need a different method to get current user id
if user_id: if request.path.startswith('/api/'):
return User[user_id] # assume token validation is already done
return User[request.args['access_token'].split(':')[0]]
else:
user_id = session.get('user_id')
if user_id:
return User[user_id]
def push_notification(type, target, **kwargs): def push_notification(type, target, **kwargs):
try: try: