github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

登录界面会根据系统默认设置显示合适的认证方式了。

pull/105/head
Apex Liu 2017-11-30 02:02:21 +08:00
parent 711cb139e7
commit 201f68b1b1
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/www/teleport/static/js/auth/login.js
View File

@ -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(); cb_stack.exec();
}; };

14
server/www/teleport/view/auth/login.mako
View File

@ -46,7 +46,7 @@
</div> </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"> <div class="input-group input-group-lg">
<span class="input-group-addon"><i class="fa fa-check-square-o fa-fw"></i></span> <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"> <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> <p class="input-addon-desc">验证码，点击图片可更换</p>
</div> </div>
<div id="login-area-oath" style="display:none;"> <div id="login-area-oath" class="inputbox" style="display:none;">
<div class="inputbox"> <div class="input-group input-group-lg">
<div class="input-group input-group-lg"> <span class="input-group-addon"><i class="fa fa-shield fa-fw"></i></span>
<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">
<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> </div>
<p class="input-addon-desc"><a href="/user/bind-oath">尚未绑定身份验证器？</a></p>
</div> </div>

4
server/www/teleport/webroot/app/controller/auth.py
View File

@ -44,9 +44,11 @@ class LoginHandler(TPBaseHandler):
else: else:
username = _user['username'] username = _user['username']
default_auth_type = get_cfg().sys.login.auth
param = { param = {
'ref': _ref, 'ref': _ref,
'username': username 'username': username,
'default_auth': default_auth_type
} }
self.render('auth/login.mako', page_param=json.dumps(param)) self.render('auth/login.mako', page_param=json.dumps(param))