xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成两步验证的逻辑

Browse Source
This commit is contained in:
virusdefender
2015-12-12 21:12:00 +08:00
parent 0f8dedb540
commit c297e4cf0f
13 changed files with 195 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
static/src/css/oj.css
View File

@@ -118,3 +118,13 @@ li.problem-tag {
padding-top: 7.5px;
padding-bottom: 7.5px;
}
#tfa-qrcode{
height: 40%;
width: 40%;
}
#tfa-area{
display: none;
}

23
static/src/js/app/oj/account/login.js
View File

@@ -4,23 +4,31 @@ require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, c
if (!e.isDefaultPrevented()) {
var username = $("#username").val();
var password = $("#password").val();
var captcha = $("#captcha").val();
var tfaCode = $("#tfa-code").val();
console.log(tfaCode);
if(tfaCode.length && tfaCode.length != 6){
bsAlert("验证码为六位数字");
return false;
}
$.ajax({
beforeSend: csrfTokenHeader,
url: "/api/login/",
data: {username: username, password: password, captcha: captcha},
data: {username: username, password: password, tfa_code: tfaCode},
dataType: "json",
method: "post",
success: function (data) {
if (!data.code) {
if(data.data == "tfa_required"){
$("#tfa-area").show();
return false;
}
function getLocationVal(id){
var temp = unescape(location.search).split(id+"=")[1] || "";
return temp.indexOf("&")>=0 ? temp.split("&")[0] : temp;
}
var from = getLocationVal("__from");
if(from != ""){
console.log(from);
window.location.href = from;
}
else{
@@ -28,7 +36,6 @@ require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, c
}
}
else {
refresh_captcha();
bsAlert(data.data);
}
},
@@ -40,11 +47,5 @@ require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, c
return false;
}
});
function refresh_captcha(){
$("#captcha-img")[0].src = "/captcha/?" + Math.random();
$("#captcha")[0].value = "";
}
$("#captcha-img").click(function(){
refresh_captcha();
});
});

27
static/src/js/app/oj/account/twoFactorAuth.js Normal file
View File

@@ -0,0 +1,27 @@
require(["jquery", "bsAlert", "csrfToken"], function ($, bsAlert, csrfTokenHeader) {
$("#tfa_submit").click(function(){
var code = $("#tfa_code").val();
if (code.length != 6){
bsAlert("验证码是6位数字");
return;
}
$.ajax({
beforeSend: csrfTokenHeader,
url: "/api/two_factor_auth/",
data: {code: code},
dataType: "json",
method: "post",
success: function(data){
if(data.code){
bsAlert(data.data);
}
else{
bsAlert("两步验证开启成功");
location.reload();
}
}
})
})
});

104
static/src/js/build.js
View File

@@ -54,31 +54,32 @@
//以下都是页面 script 标签引用的js
announcement_0_pack: "app/admin/announcement/announcement",
userList_1_pack: "app/admin/user/userList",
problem_2_pack: "app/oj/problem/problem",
submissionList_3_pack: "app/admin/problem/submissionList",
contestCountdown_4_pack: "app/oj/contest/contestCountdown",
avatar_5_pack: "app/oj/account/avatar",
addProblem_6_pack: "app/admin/problem/addProblem",
problem_7_pack: "app/admin/problem/problem",
contestList_8_pack: "app/admin/contest/contestList",
admin_9_pack: "app/admin/admin",
login_10_pack: "app/oj/account/login",
applyResetPassword_11_pack: "app/oj/account/applyResetPassword",
addContest_12_pack: "app/admin/contest/addContest",
contestPassword_13_pack: "app/oj/contest/contestPassword",
changePassword_14_pack: "app/oj/account/changePassword",
monitor_15_pack: "app/admin/monitor/monitor",
editProblem_16_pack: "app/admin/contest/editProblem",
joinGroupRequestList_17_pack: "app/admin/group/joinGroupRequestList",
group_18_pack: "app/oj/group/group",
contestProblemList_19_pack: "app/admin/contest/contestProblemList",
editProblem_20_pack: "app/admin/problem/editProblem",
register_21_pack: "app/oj/account/register",
groupDetail_22_pack: "app/admin/group/groupDetail",
editContest_23_pack: "app/admin/contest/editContest",
resetPassword_24_pack: "app/oj/account/resetPassword",
group_25_pack: "app/admin/group/group",
settings_26_pack: "app/oj/account/settings"
twoFactorAuth_2_pack: "app/oj/account/twoFactorAuth",
problem_3_pack: "app/oj/problem/problem",
submissionList_4_pack: "app/admin/problem/submissionList",
contestCountdown_5_pack: "app/oj/contest/contestCountdown",
avatar_6_pack: "app/oj/account/avatar",
addProblem_7_pack: "app/admin/problem/addProblem",
problem_8_pack: "app/admin/problem/problem",
contestList_9_pack: "app/admin/contest/contestList",
admin_10_pack: "app/admin/admin",
login_11_pack: "app/oj/account/login",
applyResetPassword_12_pack: "app/oj/account/applyResetPassword",
addContest_13_pack: "app/admin/contest/addContest",
contestPassword_14_pack: "app/oj/contest/contestPassword",
changePassword_15_pack: "app/oj/account/changePassword",
monitor_16_pack: "app/admin/monitor/monitor",
editProblem_17_pack: "app/admin/contest/editProblem",
joinGroupRequestList_18_pack: "app/admin/group/joinGroupRequestList",
group_19_pack: "app/oj/group/group",
contestProblemList_20_pack: "app/admin/contest/contestProblemList",
editProblem_21_pack: "app/admin/problem/editProblem",
register_22_pack: "app/oj/account/register",
groupDetail_23_pack: "app/admin/group/groupDetail",
editContest_24_pack: "app/admin/contest/editContest",
resetPassword_25_pack: "app/oj/account/resetPassword",
group_26_pack: "app/admin/group/group",
settings_27_pack: "app/oj/account/settings"
},
shim: {
avalon: {
@@ -96,79 +97,82 @@
name: "userList_1_pack"
},
{
name: "problem_2_pack"
name: "twoFactorAuth_2_pack"
},
{
name: "submissionList_3_pack"
name: "problem_3_pack"
},
{
name: "contestCountdown_4_pack"
name: "submissionList_4_pack"
},
{
name: "avatar_5_pack"
name: "contestCountdown_5_pack"
},
{
name: "addProblem_6_pack"
name: "avatar_6_pack"
},
{
name: "problem_7_pack"
name: "addProblem_7_pack"
},
{
name: "contestList_8_pack"
name: "problem_8_pack"
},
{
name: "admin_9_pack"
name: "contestList_9_pack"
},
{
name: "login_10_pack"
name: "admin_10_pack"
},
{
name: "applyResetPassword_11_pack"
name: "login_11_pack"
},
{
name: "addContest_12_pack"
name: "applyResetPassword_12_pack"
},
{
name: "contestPassword_13_pack"
name: "addContest_13_pack"
},
{
name: "changePassword_14_pack"
name: "contestPassword_14_pack"
},
{
name: "monitor_15_pack"
name: "changePassword_15_pack"
},
{
name: "editProblem_16_pack"
name: "monitor_16_pack"
},
{
name: "joinGroupRequestList_17_pack"
name: "editProblem_17_pack"
},
{
name: "group_18_pack"
name: "joinGroupRequestList_18_pack"
},
{
name: "contestProblemList_19_pack"
name: "group_19_pack"
},
{
name: "editProblem_20_pack"
name: "contestProblemList_20_pack"
},
{
name: "register_21_pack"
name: "editProblem_21_pack"
},
{
name: "groupDetail_22_pack"
name: "register_22_pack"
},
{
name: "editContest_23_pack"
name: "groupDetail_23_pack"
},
{
name: "resetPassword_24_pack"
name: "editContest_24_pack"
},
{
name: "group_25_pack"
name: "resetPassword_25_pack"
},
{
name: "settings_26_pack"
name: "group_26_pack"
},
{
name: "settings_27_pack"
}
],
optimizeCss: "standard",

51
static/src/js/config.js
View File

@@ -56,31 +56,32 @@ var require = {
//以下都是页面 script 标签引用的js
announcement_0_pack: "app/admin/announcement/announcement",
userList_1_pack: "app/admin/user/userList",
problem_2_pack: "app/oj/problem/problem",
submissionList_3_pack: "app/admin/problem/submissionList",
contestCountdown_4_pack: "app/oj/contest/contestCountdown",
avatar_5_pack: "app/oj/account/avatar",
addProblem_6_pack: "app/admin/problem/addProblem",
problem_7_pack: "app/admin/problem/problem",
contestList_8_pack: "app/admin/contest/contestList",
admin_9_pack: "app/admin/admin",
login_10_pack: "app/oj/account/login",
applyResetPassword_11_pack: "app/oj/account/applyResetPassword",
addContest_12_pack: "app/admin/contest/addContest",
contestPassword_13_pack: "app/oj/contest/contestPassword",
changePassword_14_pack: "app/oj/account/changePassword",
monitor_15_pack: "app/admin/monitor/monitor",
editProblem_16_pack: "app/admin/contest/editProblem",
joinGroupRequestList_17_pack: "app/admin/group/joinGroupRequestList",
group_18_pack: "app/oj/group/group",
contestProblemList_19_pack: "app/admin/contest/contestProblemList",
editProblem_20_pack: "app/admin/problem/editProblem",
register_21_pack: "app/oj/account/register",
groupDetail_22_pack: "app/admin/group/groupDetail",
editContest_23_pack: "app/admin/contest/editContest",
resetPassword_24_pack: "app/oj/account/resetPassword",
group_25_pack: "app/admin/group/group",
settings_26_pack: "app/oj/account/settings",
twoFactorAuth_2_pack: "app/oj/account/twoFactorAuth",
problem_3_pack: "app/oj/problem/problem",
submissionList_4_pack: "app/admin/problem/submissionList",
contestCountdown_5_pack: "app/oj/contest/contestCountdown",
avatar_6_pack: "app/oj/account/avatar",
addProblem_7_pack: "app/admin/problem/addProblem",
problem_8_pack: "app/admin/problem/problem",
contestList_9_pack: "app/admin/contest/contestList",
admin_10_pack: "app/admin/admin",
login_11_pack: "app/oj/account/login",
applyResetPassword_12_pack: "app/oj/account/applyResetPassword",
addContest_13_pack: "app/admin/contest/addContest",
contestPassword_14_pack: "app/oj/contest/contestPassword",
changePassword_15_pack: "app/oj/account/changePassword",
monitor_16_pack: "app/admin/monitor/monitor",
editProblem_17_pack: "app/admin/contest/editProblem",
joinGroupRequestList_18_pack: "app/admin/group/joinGroupRequestList",
group_19_pack: "app/oj/group/group",
contestProblemList_20_pack: "app/admin/contest/contestProblemList",
editProblem_21_pack: "app/admin/problem/editProblem",
register_22_pack: "app/oj/account/register",
groupDetail_23_pack: "app/admin/group/groupDetail",
editContest_24_pack: "app/admin/contest/editContest",
resetPassword_25_pack: "app/oj/account/resetPassword",
group_26_pack: "app/admin/group/group",
settings_27_pack: "app/oj/account/settings"
},
shim: {
avalon: {