From f24d87726ae1bc797d51ca09b177cc72a84dddd0 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 9 Sep 2020 11:10:47 +0530 Subject: [PATCH] fix: added patch for deleting old keys --- .../doctype/event_consumer/event_consumer.py | 4 ++++ .../doctype/event_producer/event_producer.py | 4 ++++ frappe/patches.txt | 1 + .../v13_0/delete_event_producer_and_consumer_keys.py | 11 +++++++++++ 4 files changed, 20 insertions(+) create mode 100644 frappe/patches/v13_0/delete_event_producer_and_consumer_keys.py diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.py b/frappe/event_streaming/doctype/event_consumer/event_consumer.py index 000126bbed..1505c3a05d 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.py +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.py @@ -24,6 +24,10 @@ class EventConsumer(Document): def on_update(self): if not self.incoming_change: + doc_before_save = self.get_doc_before_save() + if doc_before_save.api_key != self.api_key or doc_before_save.api_secret != self.api_secret: + return + self.update_consumer_status() else: frappe.db.set_value(self.doctype, self.name, 'incoming_change', 0) diff --git a/frappe/event_streaming/doctype/event_producer/event_producer.py b/frappe/event_streaming/doctype/event_producer/event_producer.py index f69458731e..b0ec998ab9 100644 --- a/frappe/event_streaming/doctype/event_producer/event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/event_producer.py @@ -44,6 +44,10 @@ class EventProducer(Document): if not self.api_key or not self.api_secret: frappe.throw(_('Please set API Key and Secret on the producer and consumer sites first.')) else: + doc_before_save = self.get_doc_before_save() + if doc_before_save.api_key != self.api_key or doc_before_save.api_secret != self.api_secret: + return + self.update_event_consumer() self.create_custom_fields() else: diff --git a/frappe/patches.txt b/frappe/patches.txt index 35389eee43..5dfe0c61b0 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -307,3 +307,4 @@ frappe.patches.v13_0.rename_notification_fields frappe.patches.v13_0.remove_duplicate_navbar_items frappe.patches.v13_0.enable_custom_script frappe.patches.v13_0.update_newsletter_content_type +frappe.patches.v13_0.delete_event_producer_and_consumer_keys \ No newline at end of file diff --git a/frappe/patches/v13_0/delete_event_producer_and_consumer_keys.py b/frappe/patches/v13_0/delete_event_producer_and_consumer_keys.py new file mode 100644 index 0000000000..1eba5871c2 --- /dev/null +++ b/frappe/patches/v13_0/delete_event_producer_and_consumer_keys.py @@ -0,0 +1,11 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + if frappe.db.exists("DocType", "Event Producer"): + frappe.db.sql("""UPDATE `tabEvent Producer` SET api_key='', api_secret=''""") + if frappe.db.exists("DocType", "Event Consumer"): + frappe.db.sql("""UPDATE `tabEvent Consumer` SET api_key='', api_secret=''""")