Merge branch 'master' into bees

endpoints/api/user.py

@@ -120,6 +120,10 @@ class User(ApiResource):
           'type': 'string',
           'description': 'The user\'s email address',
         },
+        'invite_code': {
+          'type': 'string',
+          'description': 'The optional invite code'
+        }
       }
     },
     'UpdateUser': {
@@ -239,15 +243,12 @@ class User(ApiResource):
 
   @show_if(features.USER_CREATION)
   @nickname('createNewUser')
-  @parse_args
-  @query_param('inviteCode', 'Invitation code given for creating the user.', type=str,
-               default='')
   @internal_only
   @validate_json_request('NewUser')
-  def post(self, args):
+  def post(self):
     """ Create a new user. """
     user_data = request.get_json()
-    invite_code = args['inviteCode']
+    invite_code = user_data.get('invite_code', '')
 
     existing_user = model.get_user(user_data['username'])
     if existing_user: