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

Revert "fix: 修复服务端渲染请求缺少csrf token 问题" (#8780) 

This reverts commit 24a1738e73.
pull/8782/head
Jiangjie.Bai 2022-08-19 14:19:47 +08:00 committed by GitHub
parent 24a1738e73
commit 8ae98887ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/authentication/templates/authentication/login_wait_confirm.html
View File

@ -98,6 +98,9 @@ function doRequestAuth() {
}, },
error: function (text, data) { error: function (text, data) {
}, },
beforeSend: function(request) {
request.setRequestHeader("X-JMS-LOGIN-TYPE", "W");
},
flash_message: false, // 是否显示flash消息 flash_message: false, // 是否显示flash消息
}) })
} }

3
apps/static/js/jumpserver.js
View File

@ -132,7 +132,6 @@ function setAjaxCSRFToken() {
$.ajaxSetup({ $.ajaxSetup({
beforeSend: function (xhr, settings) { beforeSend: function (xhr, settings) {
xhr.setRequestHeader("X-JMS-LOGIN-TYPE", "W");
if (!csrfSafeMethod(settings.type) && !this.crossDomain) { if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
xhr.setRequestHeader("X-CSRFToken", csrftoken); xhr.setRequestHeader("X-CSRFToken", csrftoken);
} }
@ -271,11 +270,13 @@ function requestApi(props) {
if (typeof(dataBody) === "object") { if (typeof(dataBody) === "object") {
dataBody = JSON.stringify(dataBody) dataBody = JSON.stringify(dataBody)
} }
var beforeSend = props.beforeSend || function (request) {}
$.ajax({ $.ajax({
url: props.url, url: props.url,
type: props.method || "PATCH", type: props.method || "PATCH",
data: dataBody, data: dataBody,
beforeSend: beforeSend,
contentType: props.content_type || "application/json; charset=utf-8", contentType: props.content_type || "application/json; charset=utf-8",
dataType: props.data_type || "json" dataType: props.data_type || "json"
}).done(function (data, textStatue, jqXHR) { }).done(function (data, textStatue, jqXHR) {