archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

User naming cleanup

Browse Source
This commit is contained in:
Francesco Siddi 2015-04-16 15:28:28 +02:00
parent 39ab7a5fe0
commit 6c0d86ff75
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
attract/application/__init__.py
View File

@ -68,8 +68,8 @@ class TokensAuth(TokenAuth):
tmpname = email.split('@')[0]
if not dbuser:
user_data = {
'firstname': tmpname,
'lastname': tmpname,
'first_name': tmpname,
'last_name': tmpname,
'email': email,
'role': ['admin'],
}
@ -89,7 +89,7 @@ class TokensAuth(TokenAuth):
return validation['valid']
"""
users = app.data.driver.db['users']
lookup = {'firstname': token['username']}
lookup = {'first_name': token['username']}
if allowed_roles:
lookup['role'] = {'$in': allowed_roles}
user = users.find_one(lookup)

4
attract/settings.py
View File

@ -12,12 +12,12 @@ ITEM_METHODS = ['GET', 'PUT', 'DELETE', 'PATCH']
PAGINATION_LIMIT = 100
users_schema = {
'firstname': {
'first_name': {
'type': 'string',
'minlength': 1,
'maxlength': 60,
},
'lastname': {
'last_name': {
'type': 'string',
'minlength': 1,
'maxlength': 60,

10
attract/test_attract.py
View File

@ -15,10 +15,10 @@ class AttractTestCase(unittest.TestCase):
b64Val = base64.b64encode(usrPass)
return b64Val
def addUser(self, firstname, lastname, role):
def addUser(self, first_name, last_name, role):
return self.app.post('/users', data=dict(
firstname=firstname,
lastname=lastname,
first_name=first_name,
last_name=last_name,
role=role,
), follow_redirects=True)
@ -118,8 +118,8 @@ class AttractTestCase(unittest.TestCase):
test_user = {
"_id": ObjectId("550171c8135d3248e477f288"),
"_updated": datetime.now(),
"firstname": "TestFirstname",
"lastname": "TestLastname",
"firs_tname": "TestFirstname",
"last_name": "TestLastname",
"role": "author",
"_created": datetime.now(),
"_etag": "302236e27f51d2e26041ae9de49505d77332b260"