From 91a1da57e9bcf0f0f157eb28c1200ec79ced43fc Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Tue, 28 May 2024 16:09:22 +0800
Subject: [PATCH] perf: mfa interface optimization, mobile phone number can be
 empty

---
 apps/authentication/mfa/sms.py              |   6 +-
 apps/common/const/choices.py                |   6 +-
 apps/common/serializers/fields.py           |  22 +-
 apps/common/validators.py                   |   3 +
 apps/static/css/otp.css                     |   4 +-
 apps/templates/_mfa_login_field.html        |   7 +-
 apps/templates/_without_nav_base.html       |   2 +-
 apps/users/notifications.py                 |   2 +-
 apps/users/templates/users/mfa_setting.html | 267 ++++++++++++++------
 9 files changed, 215 insertions(+), 104 deletions(-)

diff --git a/apps/authentication/mfa/sms.py b/apps/authentication/mfa/sms.py
index d114b648e..7cf71985e 100644
--- a/apps/authentication/mfa/sms.py
+++ b/apps/authentication/mfa/sms.py
@@ -44,13 +44,13 @@ class MFASms(BaseMFA):
         return settings.SMS_ENABLED
 
     def get_enable_url(self) -> str:
-        return '/ui/#/profile/setting?activeTab=ProfileUpdate'
+        return '/ui/#/profile/index'
 
     def can_disable(self) -> bool:
         return True
 
     def disable(self):
-        return '/ui/#/profile/setting?activeTab=ProfileUpdate'
+        return '/ui/#/profile/index'
 
     @staticmethod
     def help_text_of_enable():
@@ -61,4 +61,4 @@ class MFASms(BaseMFA):
         return _("Clear phone number to disable")
 
     def get_disable_url(self) -> str:
-        return '/ui/#/profile/setting?activeTab=ProfileUpdate'
+        return '/ui/#/profile/index'
diff --git a/apps/common/const/choices.py b/apps/common/const/choices.py
index ee8519c34..86f0f00db 100644
--- a/apps/common/const/choices.py
+++ b/apps/common/const/choices.py
@@ -26,10 +26,12 @@ COUNTRY_CALLING_CODES = [
     {'name': 'HongKong(中国香港)', 'value': '+852'},
     {'name': 'Macao(中国澳门)', 'value': '+853'},
     {'name': 'Taiwan(中国台湾)', 'value': '+886'},
-    {'name': 'America(America)', 'value': '+1'}, {'name': 'Russia(Россия)', 'value': '+7'},
+    {'name': 'America(America)', 'value': '+1'},
+    {'name': 'Russia(Россия)', 'value': '+7'},
     {'name': 'France(français)', 'value': '+33'},
     {'name': 'Britain(Britain)', 'value': '+44'},
     {'name': 'Germany(Deutschland)', 'value': '+49'},
-    {'name': 'Japan(日本)', 'value': '+81'}, {'name': 'Korea(한국)', 'value': '+82'},
+    {'name': 'Japan(日本)', 'value': '+81'},
+    {'name': 'Korea(한국)', 'value': '+82'},
     {'name': 'India(भारत)', 'value': '+91'}
 ]
diff --git a/apps/common/serializers/fields.py b/apps/common/serializers/fields.py
index 282394106..d8cf420c1 100644
--- a/apps/common/serializers/fields.py
+++ b/apps/common/serializers/fields.py
@@ -251,21 +251,21 @@ class PhoneField(serializers.CharField):
                 data = '+{}{}'.format(code, phone)
             else:
                 data = phone
-        try:
-            phone = phonenumbers.parse(data, 'CN')
-            data = '+{}{}'.format(phone.country_code, phone.national_number)
-        except phonenumbers.NumberParseException:
-            data = '+86{}'.format(data)
+        if data:
+            try:
+                phone = phonenumbers.parse(data, 'CN')
+                data = '+{}{}'.format(phone.country_code, phone.national_number)
+            except phonenumbers.NumberParseException:
+                data = '+86{}'.format(data)
 
         return super().to_internal_value(data)
 
     def to_representation(self, value):
-        if value:
-            try:
-                phone = phonenumbers.parse(value, 'CN')
-                value = {'code': '+%s' % phone.country_code, 'phone': phone.national_number}
-            except phonenumbers.NumberParseException:
-                value = {'code': '+86', 'phone': value}
+        try:
+            phone = phonenumbers.parse(value, 'CN')
+            value = {'code': '+%s' % phone.country_code, 'phone': phone.national_number}
+        except phonenumbers.NumberParseException:
+            value = {'code': '+86', 'phone': value}
         return value
 
 
diff --git a/apps/common/validators.py b/apps/common/validators.py
index 7e33d7d76..a926ef9dc 100644
--- a/apps/common/validators.py
+++ b/apps/common/validators.py
@@ -47,6 +47,9 @@ class PhoneValidator:
     message = _('The mobile phone number format is incorrect')
 
     def __call__(self, value):
+        if not value:
+            return
+
         try:
             phone = phonenumbers.parse(value, 'CN')
             valid = phonenumbers.is_valid_number(phone)
diff --git a/apps/static/css/otp.css b/apps/static/css/otp.css
index 67608d309..6c2883510 100644
--- a/apps/static/css/otp.css
+++ b/apps/static/css/otp.css
@@ -23,8 +23,8 @@ button{
 /*header样式*/
 header{
 	overflow:hidden ;
-	background: #dedede;
-	padding:15px 200px;
+	background: #ffffff;
+	padding:15px 10%;
 }
 header .logo a{
 	float:left;
diff --git a/apps/templates/_mfa_login_field.html b/apps/templates/_mfa_login_field.html
index 463e5732e..782f98f00 100644
--- a/apps/templates/_mfa_login_field.html
+++ b/apps/templates/_mfa_login_field.html
@@ -25,7 +25,7 @@
                 <button class="btn btn-primary full-width btn-challenge"
                         type='button' onclick="sendChallengeCode(this)"
                 >
-                    {% trans 'Send verification code' %}
+                    {% trans 'Send' %}
                 </button>
             {% endif %}
         </div>
@@ -39,15 +39,14 @@
     }
 
     .challenge-required .input-style {
-        width: calc(100% - 160px);
+        width: calc(100% - 104px);
         display: inline-block;
     }
 
     .btn-challenge {
-        width: 156px !important;
+        width: 100px !important;
         height: 100%;
         vertical-align: top;
-        padding: 8px 12px;
     }
 </style>
 <script>
diff --git a/apps/templates/_without_nav_base.html b/apps/templates/_without_nav_base.html
index a9ed54abd..1f29ba17b 100644
--- a/apps/templates/_without_nav_base.html
+++ b/apps/templates/_without_nav_base.html
@@ -20,7 +20,7 @@
 		 		<a href="{% url 'index' %}">
                     <img src="{{ INTERFACE.logo_logout }}" alt="" width="50px" height="50px"/>
                 </a>
-		 		<span style="font-size: 18px; line-height: 50px">{{ INTERFACE.login_title }}</span>
+		 		<span style="font-size: 21px; line-height: 50px">{{ INTERFACE.login_title }}</span>
 		 	</div>
 		 	<div>
                 <a href="{% url 'index' %}">{% trans 'Home page' %}</a>
diff --git a/apps/users/notifications.py b/apps/users/notifications.py
index 95af2386e..d872483f0 100644
--- a/apps/users/notifications.py
+++ b/apps/users/notifications.py
@@ -143,7 +143,7 @@ class PasswordExpirationReminderMsg(UserMessage):
         subject = _('Password is about expire')
 
         date_password_expired_local = timezone.localtime(user.date_password_expired)
-        update_password_url = urljoin(settings.SITE_URL, '/ui/#/profile/setting/?activeTab=PasswordUpdate')
+        update_password_url = urljoin(settings.SITE_URL, '/ui/#/profile/index')
         date_password_expired = date_password_expired_local.strftime('%Y-%m-%d %H:%M:%S')
         context = {
             'name': user.name,
diff --git a/apps/users/templates/users/mfa_setting.html b/apps/users/templates/users/mfa_setting.html
index 5b93fbb24..9435ca1a5 100644
--- a/apps/users/templates/users/mfa_setting.html
+++ b/apps/users/templates/users/mfa_setting.html
@@ -4,114 +4,221 @@
 
 {% block body %}
     <style>
-    .help-inline {
-        color: #7d8293;
-        font-size: 12px;
-        padding-right: 10px;
-    }
+        .help-inline {
+            color: #7d8293;
+            font-size: 12px;
+            padding-right: 10px;
+        }
 
-    .btn-xs {
-        width: 54px;
-    }
+        .btn-xs {
+            width: 54px;
+        }
 
-    .onoffswitch-switch {
-        height: 20px;
-    }
+        .onoffswitch-switch {
+            height: 20px;
+        }
+
+        .container {
+            max-width: 72%;
+            margin: 20px auto;
+            background-color: #ffffff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+        }
+
+        .header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+
+        .header h2 {
+            margin-top: 0;
+            margin-bottom: -5px;
+        }
+
+        .section {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 15px 0;
+            border-bottom: 1px dashed #ddd;
+        }
+
+        .section:last-child {
+            border-bottom: none;
+        }
+
+        .section .title {
+            flex: 2;
+            font-size: 16px;
+            font-weight: bold;
+        }
+
+        .section .description {
+            flex: 10;
+            color: #666;
+        }
+
+        .section .summarize {
+            flex: 12;
+            color: #666;
+        }
+
+        .section .action {
+            flex: 3;
+            display: flex;
+            justify-content: flex-end;
+            align-items: center;
+        }
+
+        .section .status {
+            display: flex;
+            align-items: center;
+        }
+
+        .section .status .status-text {
+            margin-left: 5px;
+            font-weight: bold;
+        }
+
+        .section .action-buttons {
+            display: flex;
+            align-items: center;
+        }
+
+        .section .action-buttons .divider {
+            margin: 0 10px;
+            color: #ddd;
+        }
+
+        .section .action-buttons a {
+            color: #1e88e5;
+            text-decoration: none;
+            cursor: pointer;
+        }
+
+        .status-warning {
+            color: #ff9800;
+        }
+
+        .status-set {
+            color: #4caf50;
+        }
+
+        .status-icon {
+            font-size: 18px;
+        }
     </style>
-    <article>
-        <div>
-{#            // Todoi:#}
-            <h3>{% trans 'Enable MFA' %}</h3>
-            <div class="row" style="padding-top: 10px">
-                <li class="col-sm-6" style="font-size: 14px">{% trans 'Enable' %} MFA</li>
-                <div class="switch col-sm-6">
+    <div class="container">
+        <div class="header">
+            <h2>MFA</h2>
+        </div>
+        <hr>
+        <div class="row" style="padding-top: 10px">
+            <li class="col-sm-6" style="font-size: 14px">{% trans 'Enable' %} MFA</li>
+            <div class="switch col-sm-6">
                     <span class="help-inline">
                         {% if user.mfa_force_enabled %}
                             {% trans 'MFA force enable, cannot disable' %}
                         {% endif %}
                     </span>
-                    <div class="onoffswitch" style="float: right">
-                        <input type="checkbox" class="onoffswitch-checkbox"
-                                id="mfa-switch" onchange="switchMFA()"
-                                {% if user.mfa_force_enabled %} disabled {% endif %}
-                                {% if user.mfa_enabled %} checked {% endif %}
-                        >
-                        <label class="onoffswitch-label" for="mfa-switch">
-                            <span class="onoffswitch-inner"></span>
-                            <span class="onoffswitch-switch"></span>
-                        </label>
-                    </div>
+                <div class="onoffswitch" style="float: right">
+                    <input type="checkbox" class="onoffswitch-checkbox"
+                           id="mfa-switch" onchange="switchMFA()"
+                            {% if user.mfa_force_enabled %} disabled {% endif %}
+                            {% if user.mfa_enabled %} checked {% endif %}
+                    >
+                    <label class="onoffswitch-label" for="mfa-switch">
+                        <span class="onoffswitch-inner"></span>
+                        <span class="onoffswitch-switch"></span>
+                    </label>
                 </div>
             </div>
         </div>
-        <div id="mfa-setting" style="display: none; padding-top: 30px">
-            <h3>{% trans 'MFA setting' %}</h3>
-            <div style="height: 100%; width: 100%;">
-                {% for b in mfa_backends %}
-                    <div class="row" style="padding-top: 10px">
-                        <li class="col-sm-6" style="font-size: 14px">
-                            {{ b.display_name }}
-                        </li>
-                        <span class="col-sm-6">
+    </div>
+    <div id="mfa-setting" class="container">
+        <div class="header">
+            <h2>{% trans 'MFA setting' %}</h2>
+        </div>
+        <hr>
+        {% for b in mfa_backends %}
+            <div class="section">
+                <div class="title">{{ b.display_name }}</div>
+                {% if b.is_active %}
+                    <div class="description">{{ b.help_text_of_disable }}</div>
+                {% else %}
+                    <div class="description">{{ b.help_text_of_enable }}</div>
+                {% endif %}
+                <div class="action">
+                    <div class="status {% if b.is_active %}status-set{% else %}status-warning{% endif %}">
+                        <span class="status-icon">{% if b.is_active %}✔{% else %}⚠️{% endif %}</span>
+                        <span class="status-text">
+                            {% if b.is_active %}{% trans 'Enable' %}
+                            {% else %}
+                                {% trans 'Not enabled' %}
+                            {% endif %}
+                        </span>
+                    </div>
+                    <div class="action-buttons">
+                        <span class="divider">|</span>
                         {% if b.is_active %}
-                            <button class="btn btn-warning btn-xs" style="float: right"
+                            <button class="btn btn-warning btn-xs"
                                     {% if not b.can_disable %} disabled {% endif %}
                                     onclick="goTo('{{ b.get_disable_url }}')"
                             >
                                 {% trans 'Reset' %}
                             </button>
-                            <span class="help-inline">{{ b.help_text_of_disable }}</span>
                         {% else %}
-                            <button class="btn btn-primary btn-xs" style="float: right"
+                            <button class="btn btn-primary btn-xs"
                                     onclick="goTo('{{ b.get_enable_url }}')"
                             >
                                 {% trans 'Enable' %}
                             </button>
-                            <span class="help-inline">{{ b.help_text_of_enable }}</span>
                         {% endif %}
-                    </span>
                     </div>
-                {% endfor %}
+                </div>
             </div>
-        </div>
-    </article>
+        {% endfor %}
+    </div>
     <script src="{% static 'js/jumpserver.js' %}"></script>
     <script>
-    function goTo(url) {
-        window.open(url, '_self')
-    }
-
-    function switchMFA() {
-        const switchRef = $('#mfa-switch')
-        const enabled = switchRef.is(":checked")
-        requestApi({
-            url: '/api/v1/users/profile/',
-            data: {
-                mfa_level: enabled ? 1 : 0
-            },
-            method: 'PATCH',
-            success() {
-                showSettingOrNot()
-            },
-            error() {
-                switchRef.prop('checked', !enabled)
-            }
-        })
-        showSettingOrNot()
-    }
-
-    function showSettingOrNot() {
-        const enabled = $('#mfa-switch').is(":checked")
-        const settingRef = $('#mfa-setting')
-        if (enabled) {
-            settingRef.show()
-        } else {
-            settingRef.hide()
+        function goTo(url) {
+            window.open(url, '_self')
         }
-    }
 
-    window.onload = function () {
-        showSettingOrNot()
-    }
+        function switchMFA() {
+            const switchRef = $('#mfa-switch')
+            const enabled = switchRef.is(":checked")
+            requestApi({
+                url: '/api/v1/users/profile/',
+                data: {
+                    mfa_level: enabled ? 1 : 0
+                },
+                method: 'PATCH',
+                success() {
+                    showSettingOrNot()
+                },
+                error() {
+                    switchRef.prop('checked', !enabled)
+                }
+            })
+            showSettingOrNot()
+        }
+
+        function showSettingOrNot() {
+            const enabled = $('#mfa-switch').is(":checked")
+            const settingRef = $('#mfa-setting')
+            if (enabled) {
+                settingRef.show()
+            } else {
+                settingRef.hide()
+            }
+        }
+
+        window.onload = function () {
+            showSettingOrNot()
+        }
     </script>
 {% endblock %}