pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug in login-dev endpoint; set current_user on login

Browse Source
This commit is contained in:
dandds 2018-08-06 11:37:25 -04:00
parent ac95bf371e
commit e2e0868a83
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/domain/auth.py
View File

@ -10,7 +10,7 @@ def login_required(f):
def decorated_function(*args, **kwargs): def decorated_function(*args, **kwargs):
user = get_current_user() user = get_current_user()
if user: if user:
g.user = user g.current_user = user
return f(*args, **kwargs) return f(*args, **kwargs)
else: else:

7
atst/routes/dev.py
View File

@ -49,11 +49,12 @@ _DEV_USERS = {
def login_dev(): def login_dev():
role = request.args.get("username", "amanda") role = request.args.get("username", "amanda")
user_data = _DEV_USERS[role] user_data = _DEV_USERS[role]
user = _set_user_permissions(user_data["dod_id"], user_data["atat_role"]) basic_data = {k:v for k,v in user_data.items() if k not in ["dod_id", "atat_role"]}
user = _set_user_permissions(user_data["dod_id"], user_data["atat_role"], basic_data)
session["user_id"] = user.id session["user_id"] = user.id
app.logger.warning(session) app.logger.warning(session)
return redirect(url_for("atst.home")) return redirect(url_for("atst.home"))
def _set_user_permissions(dod_id, role): def _set_user_permissions(dod_id, role, user_data):
return Users.get_or_create_by_dod_id(dod_id, atat_role_name=role) return Users.get_or_create_by_dod_id(dod_id, atat_role_name=role, **user_data)

1
tests/mocks.py
View File

@ -10,6 +10,7 @@ MOCK_USER = {
"email": "fake.user@mail.com", "email": "fake.user@mail.com",
"first_name": "Fake", "first_name": "Fake",
"last_name": "User", "last_name": "User",
"atat_permissions": []
} }
MOCK_REQUEST = RequestFactory.create( MOCK_REQUEST = RequestFactory.create(
creator=MOCK_USER["id"], creator=MOCK_USER["id"],