tanshu/barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity

Users

Browse Source
This commit is contained in:
Amritanshu
2019-06-20 00:17:44 +05:30
parent 2b2624c9c2
commit 93743bdc8e
27 changed files with 171 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
barker/routes.py
View File

@ -80,11 +80,11 @@ def includeme(config):
config.add_route("v1_taxes_list", "/v1/taxes")
config.add_route('v1_users_new', '/v1/users/new')
config.add_route('v1_users_list', '/v1/users/list')
config.add_route('v1_users_id', '/v1/users/{id}')
config.add_route('v1_users_list', '/v1/users')
config.add_route('users_new', '/users/new')
config.add_route('users_list', '/users/list')
config.add_route('users_id', '/users/{id}')
config.add_route('users_list', '/users')
config.add_route('v1_roles_new', '/v1/roles/new')
config.add_route('v1_roles_id', '/v1/roles/{id}')

12
barker/views/user.py
View File

@ -9,7 +9,7 @@ from barker.exceptions import ValidationFailure
from barker.models import Role, User
@view_config(request_method='PUT', route_name='v1_users_new', renderer='json', permission='Users', trans=True)
@view_config(request_method='POST', route_name='v1_users_new', renderer='json', permission='Users', trans=True)
def save(request):
json = request.json_body
item = User(json['name'], json['password'], json['lockedOut'])
@ -21,15 +21,15 @@ def save(request):
return user_info(item, roles)
@view_config(request_method='POST', route_name='v1_users_id', renderer='json', permission='Users', trans=True)
@view_config(request_method='PUT', route_name='v1_users_id', renderer='json', permission='Users', trans=True)
def update(request):
json = request.json_body
id = request.matchdict['id']
id_ = request.matchdict['id']
p = re.compile('^[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}$')
if p.match(id):
item = request.dbsession.query(User).filter(User.id == uuid.UUID(id)).one()
if p.match(id_):
item = request.dbsession.query(User).filter(User.id == uuid.UUID(id_)).one()
else:
item = request.dbsession.query(User).filter(User.name.ilike(id)).first()
item = request.dbsession.query(User).filter(User.name.ilike(id_)).first()
if item is None:
raise ValidationFailure('User name / id not found')
if request.has_permission('Users'):