From a8a5347d0948d1ad45463b70b42aa4f63c5c87fb Mon Sep 17 00:00:00 2001
From: mbauskar <mbauskar@gmail.com>
Date: Mon, 4 Sep 2017 16:41:35 +0530
Subject: [PATCH] [minor] fixes for
 https://github.com/frappe/frappe/issues/4035

---
 frappe/twofactor.py | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/frappe/twofactor.py b/frappe/twofactor.py
index b9568f9aae..17eddf7bfb 100644
--- a/frappe/twofactor.py
+++ b/frappe/twofactor.py
@@ -81,8 +81,8 @@ def two_factor_is_enabled_for_(user):
 	roles.append('All')
 
 	query = """select name from `tabRole` where two_factor_auth=1
-		and name in ({0}) limit 1""".format(', '.join('\"{}\"'.format(i) for \
-											i in roles))
+		and name in ({0}) limit 1""".format(', '.join('\"{}\"'.format(i) for i in roles))
+
 	if len(frappe.db.sql(query)) > 0:
 		return True
 
@@ -149,7 +149,6 @@ def get_verification_obj(user, token, otp_secret):
 		verification_obj = process_2fa_for_email(user, token, otp_secret, otp_issuer)
 	return verification_obj
 
-
 def process_2fa_for_sms(user, token, otp_secret):
 	'''Process sms method for 2fa.'''
 	phone = frappe.db.get_value('User', user, ['phone', 'mobile_no'], as_dict=1)
@@ -262,14 +261,22 @@ def send_token_via_sms(otpsecret, token=None, phone_no=None):
 		return False
 
 	hotp = pyotp.HOTP(otpsecret)
-	args = {ss.message_parameter: 'Your verification code is {}'.format(hotp.at(int(token))), ss.sms_sender_name: otp_issuer}
+	args = {
+		ss.sms_sender_name: otp_issuer,
+		ss.message_parameter: 'Your verification code is {}'.format(hotp.at(int(token)))
+	}
+
 	for d in ss.get("parameters"):
 		args[d.parameter] = d.value
 
 	args[ss.receiver_parameter] = phone_no
 
-	sms_args = {'gateway_url': ss.sms_gateway_url, 'params': args}
-	enqueue(method=send_request, queue='short', timeout=300, event=None, async=True, job_name=None, now=False, **sms_args)
+	sms_args = {
+		'params': args,
+		'gateway_url': ss.sms_gateway_url
+	}
+	enqueue(method=send_request, queue='short', timeout=300, event=None,
+		async=True, job_name=None, now=False, **sms_args)
 	return True
 
 def send_token_via_email(user, token, otp_secret, otp_issuer, subject=None, message=None):
@@ -295,8 +302,8 @@ def send_token_via_email(user, token, otp_secret, otp_issuer, subject=None, mess
 		'retry':3
 	}
 
-	enqueue(method=frappe.sendmail, queue='short',
-		timeout=300, event=None, async=True, job_name=None, now=False, **email_args)
+	enqueue(method=frappe.sendmail, queue='short', timeout=300, event=None,
+		async=True, job_name=None, now=False, **email_args)
 	return True
 
 def get_qr_svg_code(totp_uri):
@@ -344,14 +351,19 @@ def create_barcode_folder():
 def delete_qrimage(user, check_expiry=False):
 	'''Delete Qrimage when user logs in.'''
 	user_barcodes = frappe.get_all('File', {'attached_to_doctype': 'User',
-							'attached_to_name': user, 'folder': 'Home/Barcodes'})
+		'attached_to_name': user, 'folder': 'Home/Barcodes'})
+
 	for barcode in user_barcodes:
-		if check_expiry and not should_remove_barcode_image(barcode): continue
+		if check_expiry and not should_remove_barcode_image(barcode):
+			continue
 		barcode = frappe.get_doc('File', barcode.name)
 		frappe.delete_doc('File', barcode.name, ignore_permissions=True)
 
 def delete_all_barcodes_for_users():
 	'''Task to delete all barcodes for user.'''
+	if not two_factor_is_enabled():
+		return
+
 	users = frappe.get_all('User', {'enabled':1})
 	for user in users:
 		delete_qrimage(user.name, check_expiry=True)
@@ -366,5 +378,4 @@ def should_remove_barcode_image(barcode):
 	return False
 
 def disable():
-	frappe.db.set_value('System Settings', None, 'enable_two_factor_auth', 0)
-
+	frappe.db.set_value('System Settings', None, 'enable_two_factor_auth', 0)
\ No newline at end of file