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

Tweaks for new user data structure

Browse Source
This commit is contained in:
Francesco Siddi
2015-10-13 23:17:00 +02:00
parent 2ad8c5458a
commit d26b3a738a
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pillar/application/__init__.py
View File

@@ -89,15 +89,20 @@ def validate_token():
users = app.data.driver.db['users'] users = app.data.driver.db['users']
email = validation['data']['user']['email'] email = validation['data']['user']['email']
db_user = users.find_one({'email': email}) db_user = users.find_one({'email': email})
tmpname = email.split('@')[0] username = email.split('@')[0]
full_name = username
if not db_user: if not db_user:
user_data = { user_data = {
'full_name': tmpname, 'full_name': full_name,
'username': username,
'email': email, 'email': email,
'auth': list(dict(provider='blender-id', 'auth': [{
user_id=validation['data']['user']['id'])) 'provider': 'blender-id',
'user_id': str(validation['data']['user']['id']),
'token': ''}]
} }
r = post_internal('users', user_data) r = post_internal('users', user_data)
print r
user_id = r[0]['_id'] user_id = r[0]['_id']
groups = None groups = None
else: else:

1
pillar/settings.py
View File

@@ -32,7 +32,6 @@ users_schema = {
'roles': { 'roles': {
'type': 'list', 'type': 'list',
'allowed': ["admin"], 'allowed': ["admin"],
'required': True,
}, },
'groups': { 'groups': {
'type': 'list', 'type': 'list',