Draft: implement OAuth2

drywall/api.py

@@ -7,7 +7,9 @@
 from drywall import pings
 from drywall import app
 from drywall import config
-from drywall import auth # noqa: F401
+from drywall import auth  # noqa: F401
+from drywall import auth_oauth  # noqa: F401
+from drywall import web  # noqa: F401
 
 import simplejson as json
 from flask import Response, request
@@ -118,18 +120,27 @@ def api_post_conference_child(conference_id, object_type, object_data):
 	"""
 	if not object_data:
 		return pings.response_from_error(2)
+
+	# Check if the conference exists before doing anything else
+	if not db.get_object_as_dict_by_id(conference_id):
+		return pings.response_from_error(4)
+
 	data = object_data.copy()
 	if object_data['object_type'] == "invite":
 		data['conference_id'] = conference_id
 	else:
 		data['parent_conference'] = conference_id
-	return api_post(object_data, object_type=object_type)
+	return api_post(data, object_type=object_type)
 
 def api_get_patch_delete_conference_child(conference_id, object_type, object_id):
 	"""
 	Template for GET/PATCH/DELETE actions on conference members, invites, roles
 	etc.
 	"""
+	# Check if the conference exists before doing anything else
+	if not db.id_taken(conference_id):
+		return pings.response_from_error(4)
+
 	try:
 		object_get = api_get(object_id, object_type=object_type)
 		object_get_id = object_get['id']
@@ -149,12 +160,27 @@ def api_get_patch_delete_conference_child(conference_id, object_type, object_id)
 
 def api_report(report_dict, object_id, object_type=None):
 	"""Template for /api/v1/<type>/<id>/report endpoints."""
-	api_get(object_id, object_type=object_type)
+	try:
+		object_get = api_get(object_id, object_type=object_type)
+		object_get_id = object_get['id']
+	except:
+		return object_get
 
-	new_report_dict = {"target": object_id}
-	if 'note' in report_dict:
+	new_report_dict = {
+		"object_type": "report", "target": object_get_id,
+		"submission_date": 'dummy' # this gets replaced when the object is created
+	}
+
+	if report_dict and 'note' in report_dict:
 		new_report_dict['note'] = report_dict['note']
-	report = objects.make_object_from_dict(new_report_dict)
+
+	try:
+		report = objects.make_object_from_dict(new_report_dict)
+	except TypeError as e:
+		return pings.response_from_error(10, error_message=e)
+		# TODO: differentiate between the possible typeerrors
+	except KeyError as e:
+		return pings.response_from_error(7, error_message=e)
 
 	db.add_object(report)
 	return Response(json.dumps(report.__dict__), status=201, mimetype='application/json')
@@ -163,6 +189,8 @@ def api_report_conference_child(conference_id, report_dict, object_id, object_ty
 	"""
 	Template for POST /api/v1/conference/<conference_id>/<object_type> APIs
 	"""
+	if not db.get_object_as_dict_by_id(conference_id):
+		return pings.response_from_error(4)
 	try:
 		object_get = api_get(object_id, object_type=object_type)
 		object_get['id']
@@ -231,9 +259,6 @@ def api_stash_request():
 
 	return stash
 
-# TODO: Federation, authentication, clients
-# Probably will be in separate files, but I'll note it down here for now
-
 # Accounts
 
 @app.route('/api/v1/accounts', methods=['POST'])