From 5e30a6599d80bc01271f7f46834d165ed7110179 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 31 Oct 2020 22:27:03 -0400 Subject: [PATCH] fixes #223 add X-CSRF-TOKEN to the header to integrate with light-portal --- package.json | 5 +++-- src/Markdown.js | 2 +- src/Taxonomy.js | 7 ++++++- yarn.lock | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 23fce0bb..c6de50a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-schema-form", - "version": "0.9.9", + "version": "0.9.10", "description": "React json schema form", "keywords": [ "json schema", @@ -78,6 +78,7 @@ "react-mde": "^11.0.0", "showdown": "^1.9.1", "supports-color": "^7.1.0", - "tv4": "^1.3.0" + "tv4": "^1.3.0", + "universal-cookie": "^4.0.4" } } diff --git a/src/Markdown.js b/src/Markdown.js index e23b2f2e..16e05ab8 100644 --- a/src/Markdown.js +++ b/src/Markdown.js @@ -24,7 +24,7 @@ const Markdown = (props) => { const [selectedTab, setSelectedTab] = useState('write') const [text, setText] = useState(value) useEffect(() => { - onChangeValidate({target: {value: text}}) + onChangeValidate({ target: { value: text } }) }, [text]) return ( diff --git a/src/Taxonomy.js b/src/Taxonomy.js index 1a1ca7f0..a40c9211 100644 --- a/src/Taxonomy.js +++ b/src/Taxonomy.js @@ -12,6 +12,7 @@ import AddBoxIcon from '@material-ui/icons/AddBox' import FolderIcon from '@material-ui/icons/Folder' import FolderOpenIcon from '@material-ui/icons/FolderOpen' import InsertDriveFileIcon from '@material-ui/icons/InsertDriveFile' +import Cookies from 'universal-cookie' import ComposedComponent from './ComposedComponent' function Taxonomy(props) { @@ -26,7 +27,11 @@ function Taxonomy(props) { }, [taxonomies]) const fetchCateogry = (url) => { - fetch(url) + const cookies = new Cookies() + const headers = { 'Content-Type': 'application/json' } + if (cookies.get('csrf')) + Object.assign(headers, { 'X-CSRF-TOKEN': cookies.get('csrf') }) + fetch(url, { headers, credentials: 'include' }) .then((res) => { if (res.ok) { return res.json() diff --git a/yarn.lock b/yarn.lock index 18bbf4dd..9854e5ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1759,6 +1759,11 @@ resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== +"@types/cookie@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803" + integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow== + "@types/eslint-visitor-keys@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" @@ -3483,6 +3488,11 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== + copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -11611,6 +11621,14 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" +universal-cookie@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/universal-cookie/-/universal-cookie-4.0.4.tgz#06e8b3625bf9af049569ef97109b4bb226ad798d" + integrity sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw== + dependencies: + "@types/cookie" "^0.3.3" + cookie "^0.4.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"