default user role; updateProfile method

resolvers/auth.py

@@ -8,7 +8,7 @@ from auth.authorize import Authorize
 from auth.identity import Identity
 from auth.password import Password
 from auth.email import send_confirm_email, send_auth_email
-from orm import User, UserStorage
+from orm import User, UserStorage, Role, UserRole
 from orm.base import local_session
 from resolvers.base import mutation, query
 from exceptions import InvalidPassword
@@ -37,16 +37,21 @@ async def register(*_, email: str, password: str = ""):
 	username = email.split('@')[0]
 	user_dict["username"] = username
 	user_dict["slug"] = quote_plus(translit(username, 'ru', reversed=True).replace('.', '-').lower())
+	if password:
+		user_dict["password"] = Password.encode(password)
+	user = User(**user_dict)
+	user.roles.append(Role.default_role)
+	with local_session() as session:
+		session.add(user)
+		session.commit()
+
+	await UserStorage.add_user(user)
+
 	if not password:
-		user = User.create(**user_dict)
 		await send_confirm_email(user)
-		await UserStorage.add_user(user)
 		return { "user": user }
 
-	user_dict["password"] = Password.encode(password)
-	user = User.create(**user_dict)
 	token = await Authorize.authorize(user)
-	await UserStorage.add_user(user)
 	return {"user": user, "token": token }
 
 

resolvers/profile.py

@@ -16,7 +16,7 @@ async def get_user_by_slug(_, info, slug):
 			group_by(User.id).\
 			first()
 	user = row.User
-	user.rating = row.rating
+	user["rating"] = row.rating
 	return { "user": user } # TODO: remove some fields for public
 
 @query.field("getCurrentUser")
@@ -46,3 +46,16 @@ async def user_roles(_, info):
 			where(UserRole.user_id == user_id).all()
 
 	return roles
+
+@mutation.field("updateProfile")
+@login_required
+async def update_profile(_, info, profile):
+	auth = info.context["request"].auth
+	user_id = auth.user_id
+
+	with local_session() as session:
+		user = session.query(User).filter(User.id == user_id).first()
+		user.update(profile)
+		session.commit()
+
+	return {}