From 8b77a3faee6c2de2d317de3a0a775b22312f5769 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Fri, 11 Oct 2019 03:22:35 +0530
Subject: [PATCH] fix: test

---
 .../doctype/event_consumer/event_consumer.py          |  2 +-
 .../doctype/event_producer/event_producer.py          | 11 ++++++-----
 frappe/frappeclient.py                                |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frappe/events_streaming/doctype/event_consumer/event_consumer.py b/frappe/events_streaming/doctype/event_consumer/event_consumer.py
index aedba9eda7..38cdc40238 100644
--- a/frappe/events_streaming/doctype/event_consumer/event_consumer.py
+++ b/frappe/events_streaming/doctype/event_consumer/event_consumer.py
@@ -42,7 +42,7 @@ def register_consumer(event_consumer, subscribed_doctypes, user):
 	# so that, updates after subscribing are consumed and not the old ones.
 	last_update = get_last_update()
 
-	return (api_key, api_secret, last_update)
+	return json.dumps({'api_key': api_key, 'api_secret': api_secret, 'last_update': last_update})
 
 def get_consumer_site(consumer_url):
 	consumer_doc = frappe.get_doc('Event Consumer', consumer_url)
diff --git a/frappe/events_streaming/doctype/event_producer/event_producer.py b/frappe/events_streaming/doctype/event_producer/event_producer.py
index 93150199cc..aada257624 100644
--- a/frappe/events_streaming/doctype/event_producer/event_producer.py
+++ b/frappe/events_streaming/doctype/event_producer/event_producer.py
@@ -22,7 +22,7 @@ class EventProducer(Document):
 
 	def create_event_consumer(self):
 		'''register event consumer on the producer site'''
-		producer_site = FrappeClient(self.producer_url)
+		producer_site = FrappeClient(self.producer_url, verify=False)
 		subscribed_doctypes = []
 		for entry in self.event_configuration:
 			if entry.has_mapping:
@@ -30,15 +30,16 @@ class EventProducer(Document):
 				subscribed_doctypes.append(frappe.db.get_value('Document Type Mapping', entry.mapping, 'remote_doctype'))
 			else:
 				subscribed_doctypes.append(entry.ref_doctype)
-		(api_key, api_secret, last_update) = producer_site.post_request({
+		response = producer_site.post_request({
 			'cmd': 'frappe.events_streaming.doctype.event_consumer.event_consumer.register_consumer',
 			'event_consumer': get_current_node(),
 			'subscribed_doctypes': json.dumps(subscribed_doctypes),
 			'user': self.user
 		})
-		self.api_key = api_key
-		self.api_secret =  api_secret
-		self.last_update = last_update
+		response = json.loads(response)
+		self.api_key = response['api_key']
+		self.api_secret =  response['api_secret']
+		self.last_update = response['last_update']
 
 	def create_custom_fields(self):
 		'''create custom field to store remote docname and remote site url'''
diff --git a/frappe/frappeclient.py b/frappe/frappeclient.py
index b9e2cdf714..8d3e8f4c91 100644
--- a/frappe/frappeclient.py
+++ b/frappe/frappeclient.py
@@ -21,6 +21,7 @@ class FrappeException(Exception):
 class FrappeClient(object):
 	def __init__(self, url, username=None, password=None, verify=True, api_key=None, api_secret=None, frappe_authorization_source = None):
 		self.headers = dict(Accept='application/json')
+		self.headers.update({'Content-type': 'application/json'})
 		self.verify = verify
 		self.session = requests.session()
 		self.url = url