Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix retrieving csrf token

Browse Source
This commit is contained in:
Pig Fang 2018-09-08 14:31:08 +08:00
parent 23b360e8d7
commit cd43fb6f0e
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/assets/src/js/net.js
View File

@ -18,8 +18,11 @@ function retrieveToken() {
return csrfField && csrfField.content; return csrfField && csrfField.content;
} }
/**
* @param {Request} request
*/
export async function walkFetch(request) { export async function walkFetch(request) {
request.headers['X-CSRF-TOKEN'] = retrieveToken(); request.headers.set('X-CSRF-TOKEN', retrieveToken());
emit('beforeFetch', request); emit('beforeFetch', request);

19
resources/assets/tests/js/net.test.js
View File

@ -4,16 +4,19 @@ import { showAjaxError } from '@/js/notify';
jest.mock('@/js/notify'); jest.mock('@/js/notify');
window.Request = function Request(url, init) {
this.url = url;
Object.keys(init).forEach(key => this[key] = init[key]);
this.headers = new Map(Object.entries(init.headers));
};
test('the GET method', async () => { test('the GET method', async () => {
const json = jest.fn().mockResolvedValue({}); const json = jest.fn().mockResolvedValue({});
window.fetch = jest.fn().mockResolvedValue({ window.fetch = jest.fn().mockResolvedValue({
ok: true, ok: true,
json json
}); });
window.Request = jest.fn(function (url, init) {
this.url = url;
Object.keys(init).forEach(key => this[key] = init[key]);
});
await net.get('/abc', { a: 'b' }); await net.get('/abc', { a: 'b' });
expect(window.fetch.mock.calls[0][0].url).toBe('/abc?a=b'); expect(window.fetch.mock.calls[0][0].url).toBe('/abc?a=b');
@ -28,10 +31,6 @@ test('the POST method', async () => {
ok: true, ok: true,
json: () => Promise.resolve({}) json: () => Promise.resolve({})
}); });
window.Request = jest.fn(function (url, init) {
this.url = url;
Object.keys(init).forEach(key => this[key] = init[key]);
});
const meta = document.createElement('meta'); const meta = document.createElement('meta');
meta.name = 'csrf-token'; meta.name = 'csrf-token';
@ -43,7 +42,7 @@ test('the POST method', async () => {
expect(request.url).toBe('/abc'); expect(request.url).toBe('/abc');
expect(request.method).toBe('POST'); expect(request.method).toBe('POST');
expect(request.body).toBe(JSON.stringify({ a: 'b' })); expect(request.body).toBe(JSON.stringify({ a: 'b' }));
expect(request.headers['X-CSRF-TOKEN']).toBe('token'); expect(request.headers.get('X-CSRF-TOKEN')).toBe('token');
await net.post('/abc'); await net.post('/abc');
expect(window.fetch.mock.calls[1][0].body).toBe('{}'); expect(window.fetch.mock.calls[1][0].body).toBe('{}');
@ -64,7 +63,7 @@ test('low level fetch', async () => {
const stub = jest.fn(); const stub = jest.fn();
on('beforeFetch', stub); on('beforeFetch', stub);
const request = { headers: {} }; const request = { headers: new Map() };
await net.walkFetch(request); await net.walkFetch(request);
expect(showAjaxError.mock.calls[0][0]).toBeInstanceOf(Error); expect(showAjaxError.mock.calls[0][0]).toBeInstanceOf(Error);