From 201f68b1b178779e8c47b2164c4499a167849d53 Mon Sep 17 00:00:00 2001
From: Apex Liu <apex.liu@qq.com>
Date: Thu, 30 Nov 2017 02:02:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E4=BC=9A?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B3=BB=E7=BB=9F=E9=BB=98=E8=AE=A4=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=98=BE=E7=A4=BA=E5=90=88=E9=80=82=E7=9A=84=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=96=B9=E5=BC=8F=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/www/teleport/static/js/auth/login.js        |  6 ++++++
 server/www/teleport/view/auth/login.mako           | 14 ++++++--------
 server/www/teleport/webroot/app/controller/auth.py |  4 +++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/server/www/teleport/static/js/auth/login.js b/server/www/teleport/static/js/auth/login.js
index c88dfc3..62d1de2 100644
--- a/server/www/teleport/static/js/auth/login.js
+++ b/server/www/teleport/static/js/auth/login.js
@@ -106,6 +106,12 @@ $app.on_init = function (cb_stack) {
         }
     });
 
+    if($app.options.default_auth & TP_LOGIN_AUTH_USERNAME_PASSWORD_CAPTCHA) {
+        $app.dom.btn_login_type_password.click();
+    } else if($app.options.default_auth & TP_LOGIN_AUTH_USERNAME_PASSWORD_OATH) {
+        $app.dom.btn_login_type_oath.click();
+    }
+
     cb_stack.exec();
 };
 
diff --git a/server/www/teleport/view/auth/login.mako b/server/www/teleport/view/auth/login.mako
index a40bff2..f7239f5 100644
--- a/server/www/teleport/view/auth/login.mako
+++ b/server/www/teleport/view/auth/login.mako
@@ -46,7 +46,7 @@
 
                         </div>
 
-                        <div id="login-area-captcha" class="inputbox">
+                        <div id="login-area-captcha" class="inputbox" style="display:none;">
                             <div class="input-group input-group-lg">
                                 <span class="input-group-addon"><i class="fa fa-check-square-o fa-fw"></i></span>
                                 <input id="captcha" type="text" class="form-control" placeholder="验证码" data-toggle="popover" data-trigger="manual" data-placement="top">
@@ -55,14 +55,12 @@
                             <p class="input-addon-desc">验证码，点击图片可更换</p>
                         </div>
 
-                        <div id="login-area-oath" style="display:none;">
-                            <div class="inputbox">
-                                <div class="input-group input-group-lg">
-                                    <span class="input-group-addon"><i class="fa fa-shield fa-fw"></i></span>
-                                    <input id="oath-code" type="text" class="form-control" placeholder="6位数字身份验证器动态验证码" data-toggle="popover" data-trigger="manual" data-placement="top">
-                                </div>
-                                <p class="input-addon-desc"><a href="/user/bind-oath">尚未绑定身份验证器？</a></p>
+                        <div id="login-area-oath" class="inputbox" style="display:none;">
+                            <div class="input-group input-group-lg">
+                                <span class="input-group-addon"><i class="fa fa-shield fa-fw"></i></span>
+                                <input id="oath-code" type="text" class="form-control" placeholder="6位数字身份验证器动态验证码" data-toggle="popover" data-trigger="manual" data-placement="top">
                             </div>
+                            <p class="input-addon-desc"><a href="/user/bind-oath">尚未绑定身份验证器？</a></p>
                         </div>
 
 
diff --git a/server/www/teleport/webroot/app/controller/auth.py b/server/www/teleport/webroot/app/controller/auth.py
index ab4e9e6..073fcfe 100644
--- a/server/www/teleport/webroot/app/controller/auth.py
+++ b/server/www/teleport/webroot/app/controller/auth.py
@@ -44,9 +44,11 @@ class LoginHandler(TPBaseHandler):
         else:
             username = _user['username']
 
+        default_auth_type = get_cfg().sys.login.auth
         param = {
             'ref': _ref,
-            'username': username
+            'username': username,
+            'default_auth': default_auth_type
         }
         self.render('auth/login.mako', page_param=json.dumps(param))