Skip to content

Commit af8f66c

Browse files
fix lint
1 parent 6cfe215 commit af8f66c

File tree

4 files changed

+99
-98
lines changed

4 files changed

+99
-98
lines changed

apps/demos/Demos/DataGrid/BatchUpdateRequest/React/App.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'whatwg-fetch';
66

77
const BASE_PATH = 'https://js.devexpress.com/Demos/NetCore';
88
const URL = `${BASE_PATH}/api/DataGridBatchUpdateWebApi`;
9-
109
const ordersStore = createStore({
1110
key: 'OrderID',
1211
loadUrl: `${URL}/Orders`,

apps/demos/Demos/DataGrid/BatchUpdateRequest/ReactJs/App.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'whatwg-fetch';
55

66
const BASE_PATH = 'https://js.devexpress.com/Demos/NetCore';
77
const URL = `${BASE_PATH}/api/DataGridBatchUpdateWebApi`;
8-
98
const ordersStore = createStore({
109
key: 'OrderID',
1110
loadUrl: `${URL}/Orders`,

apps/demos/shared/anti-forgery/frameworks.js

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,59 +5,59 @@ const fetchOrig = fetch;
55
const BASE_PATH = 'https://js.devexpress.com/Demos/NetCore';
66

77
ajax.sendRequest = (options) => {
8-
options.xhrFields = {
9-
withCredentials: true,
10-
};
11-
12-
return sendRequestOrig(options);
13-
}
8+
options.xhrFields = {
9+
withCredentials: true,
10+
};
11+
12+
return sendRequestOrig(options);
13+
};
1414

1515
async function fetchAntiForgeryToken() {
16-
try {
17-
const response = await fetchOrig(`${BASE_PATH}/api/Common/GetAntiForgeryToken`, {
18-
method: 'GET',
19-
credentials: 'include',
20-
cache: 'no-cache',
21-
});
22-
23-
if (!response.ok) {
24-
const errorMessage = await response.text();
25-
throw new Error(`Failed to retrieve anti-forgery token: ${errorMessage || response.statusText}`);
26-
}
27-
28-
return await response.json();
29-
} catch (error) {
30-
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
31-
throw new Error(errorMessage);
16+
try {
17+
const response = await fetchOrig(`${BASE_PATH}/api/Common/GetAntiForgeryToken`, {
18+
method: 'GET',
19+
credentials: 'include',
20+
cache: 'no-cache',
21+
});
22+
23+
if (!response.ok) {
24+
const errorMessage = await response.text();
25+
throw new Error(`Failed to retrieve anti-forgery token: ${errorMessage || response.statusText}`);
3226
}
27+
28+
return await response.json();
29+
} catch (error) {
30+
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
31+
throw new Error(errorMessage);
32+
}
3333
}
3434

3535
async function getAntiForgeryTokenValue() {
36-
const tokenMeta = document.querySelector('meta[name="csrf-token"]');
37-
if (tokenMeta) {
38-
const headerName = tokenMeta.dataset.headerName || 'RequestVerificationToken';
39-
const token = tokenMeta.getAttribute('content') || '';
40-
return Promise.resolve({ headerName, token });
41-
}
42-
43-
const tokenData = await fetchAntiForgeryToken();
44-
const meta = document.createElement('meta');
45-
meta.name = 'csrf-token';
46-
meta.content = tokenData.token;
47-
meta.dataset.headerName = tokenData.headerName;
48-
document.head.appendChild(meta);
49-
return tokenData;
36+
const tokenMeta = document.querySelector('meta[name="csrf-token"]');
37+
if (tokenMeta) {
38+
const headerName = tokenMeta.dataset.headerName || 'RequestVerificationToken';
39+
const token = tokenMeta.getAttribute('content') || '';
40+
return Promise.resolve({ headerName, token });
41+
}
42+
43+
const tokenData = await fetchAntiForgeryToken();
44+
const meta = document.createElement('meta');
45+
meta.name = 'csrf-token';
46+
meta.content = tokenData.token;
47+
meta.dataset.headerName = tokenData.headerName;
48+
document.head.appendChild(meta);
49+
return tokenData;
5050
}
5151

5252
window.fetch = async (url, options = {}) => {
53-
const { headerName, token } = await getAntiForgeryTokenValue();
54-
55-
options.headers = {
56-
[headerName]: token,
57-
...(options.headers || {})
58-
};
59-
60-
options.credentials = 'include';
61-
62-
return await fetchOrig(url, options);
63-
}
53+
const { headerName, token } = await getAntiForgeryTokenValue();
54+
55+
options.headers = {
56+
[headerName]: token,
57+
...(options.headers || {}),
58+
};
59+
60+
options.credentials = 'include';
61+
62+
return fetchOrig(url, options);
63+
};
Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,65 @@
1+
/* global $ */
12
const orig$ = $;
23

34
function fetchAntiForgeryToken() {
4-
const d = orig$.Deferred();
5-
6-
orig$.ajax({
7-
url: `https://js.devexpress.com/Demos/NetCore/api/Common/GetAntiForgeryToken`,
8-
method: 'GET',
9-
xhrFields: { withCredentials: true },
10-
cache: false,
11-
}).done((data) => {
12-
d.resolve(data);
13-
}).fail((xhr) => {
14-
const error = xhr.responseJSON?.message || xhr.statusText || 'Unknown error';
15-
d.reject(new Error(`Failed to retrieve anti-forgery token: ${error}`));
16-
});
17-
return d.promise();
5+
const d = orig$.Deferred();
6+
7+
orig$.ajax({
8+
url: 'https://js.devexpress.com/Demos/NetCore/api/Common/GetAntiForgeryToken',
9+
method: 'GET',
10+
xhrFields: { withCredentials: true },
11+
cache: false,
12+
}).done((data) => {
13+
d.resolve(data);
14+
}).fail((xhr) => {
15+
const error = xhr.responseJSON?.message || xhr.statusText || 'Unknown error';
16+
d.reject(new Error(`Failed to retrieve anti-forgery token: ${error}`));
17+
});
18+
return d.promise();
1819
}
1920

2021
function getAntiForgeryTokenValue() {
21-
const tokenMeta = document.querySelector('meta[name="csrf-token"]');
22-
if (tokenMeta) {
23-
const headerName = tokenMeta.dataset.headerName || 'RequestVerificationToken';
24-
const token = tokenMeta.getAttribute('content');
25-
return orig$.Deferred().resolve({ headerName, token });
26-
}
22+
const tokenMeta = document.querySelector('meta[name="csrf-token"]');
23+
if (tokenMeta) {
24+
const headerName = tokenMeta.dataset.headerName || 'RequestVerificationToken';
25+
const token = tokenMeta.getAttribute('content');
26+
return orig$.Deferred().resolve({ headerName, token });
27+
}
2728

28-
return fetchAntiForgeryToken().then((tokenData) => {
29-
const meta = document.createElement('meta');
30-
meta.name = 'csrf-token';
31-
meta.content = tokenData.token;
32-
meta.dataset.headerName = tokenData.headerName;
33-
document.head.appendChild(meta);
34-
return tokenData;
35-
});
29+
return fetchAntiForgeryToken().then((tokenData) => {
30+
const meta = document.createElement('meta');
31+
meta.name = 'csrf-token';
32+
meta.content = tokenData.token;
33+
meta.dataset.headerName = tokenData.headerName;
34+
document.head.appendChild(meta);
35+
return tokenData;
36+
});
3637
}
3738

3839
async function setAntiForgery() {
39-
const originalAjax = orig$.ajax;
40-
const tokenData = await getAntiForgeryTokenValue();
41-
42-
$ = orig$;
43-
44-
$.ajax = (url, options) => {
45-
if (typeof url !== 'string') {
46-
options = url;
47-
} else {
48-
options.url = url;
49-
}
50-
options.headers = { [tokenData.headerName]: tokenData.token, ...(options.headers || {}) };
51-
options.xhrFields = {withCredentials: true, ...(options.xhrFields || {})};
52-
53-
return originalAjax.call(this, options);
54-
};
55-
}
40+
const originalAjax = orig$.ajax;
41+
const tokenData = await getAntiForgeryTokenValue();
42+
43+
// eslint-disable-next-line no-global-assign
44+
$ = orig$;
5645

46+
$.ajax = (url, options) => {
47+
if (typeof url !== 'string') {
48+
// eslint-disable-next-line no-param-reassign
49+
options = url;
50+
} else {
51+
options.url = url;
52+
}
53+
options.headers = { [tokenData.headerName]: tokenData.token, ...(options.headers || {}) };
54+
options.xhrFields = { withCredentials: true, ...(options.xhrFields || {}) };
55+
56+
return originalAjax.call(this, options);
57+
};
58+
}
5759

60+
// eslint-disable-next-line no-global-assign
5861
$ = (...args) => orig$(async () => {
59-
await setAntiForgery();
60-
61-
return $(...args);
62-
})
62+
await setAntiForgery();
63+
64+
return $(...args);
65+
});

0 commit comments

Comments
 (0)