From c4adaa653aa29529d8fac20cdef4d942809d0760 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 23 Oct 2017 13:01:30 +0530 Subject: [PATCH 1/2] [fix] Two factor authentication via SMS (#4359) --- .../doctype/sms_settings/sms_settings.json | 31 +------------------ frappe/twofactor.py | 1 - 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/frappe/core/doctype/sms_settings/sms_settings.json b/frappe/core/doctype/sms_settings/sms_settings.json index bd689305c0..ac911f2ecb 100755 --- a/frappe/core/doctype/sms_settings/sms_settings.json +++ b/frappe/core/doctype/sms_settings/sms_settings.json @@ -10,35 +10,6 @@ "doctype": "DocType", "editable_grid": 0, "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break0", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "50%" - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -201,7 +172,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-10-17 14:30:41.503586", + "modified": "2017-10-23 12:57:20.943845", "modified_by": "Administrator", "module": "Core", "name": "SMS Settings", diff --git a/frappe/twofactor.py b/frappe/twofactor.py index bdfbd26a6f..a8efc6a98b 100644 --- a/frappe/twofactor.py +++ b/frappe/twofactor.py @@ -270,7 +270,6 @@ def send_token_via_sms(otpsecret, token=None, phone_no=None): hotp = pyotp.HOTP(otpsecret) args = { - ss.sms_sender_name: otp_issuer, ss.message_parameter: 'Your verification code is {}'.format(hotp.at(int(token))) } From 87c45d881ed290a1b7625c1cfdfb7286896d6df1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 23 Oct 2017 13:32:08 +0600 Subject: [PATCH 2/2] bumped to version 9.1.10 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index ee06091cae..bec6b74ac1 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '9.1.9' +__version__ = '9.1.10' __title__ = "Frappe Framework" local = Local()