Thanks to visit codestin.com
Credit goes to github.com

Skip to content

PPS-588 Fix/csrf #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfshao merged 10 commits into from
Dec 18, 2023
Merged

PPS-588 Fix/csrf #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c27ef68
add csrf
mfshao Dec 14, 2023
920b7c8
add more csrf
mfshao Dec 14, 2023
835e939
remove unneeded pkg
mfshao Dec 14, 2023
3202c07
fix: missing args
mfshao Dec 14, 2023
c875baa
fix missing
mfshao Dec 14, 2023
c92ed0f
ask when token ready
mfshao Dec 15, 2023
06bed48
add missing pass over
mfshao Dec 15, 2023
8d2adb7
remove unneeded logic
mfshao Dec 15, 2023
c9a6e20
update version
mfshao Dec 15, 2023
eb0c165
fix according to suggestions
mfshao Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions devHelper/scripts/commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ curl -iv -X PUT "${ESHOST}/${indexName}" \
"some_string_inside_nested": { "type": "keyword", "fields": { "analyzed": {"type": "text", "analyzer": "ngram_analyzer", "search_analyzer": "search_analyzer", "term_vector": "with_positions_offsets"} } }
}
},
"consortium_id": { "type": "integer" },
"some_integer_field": { "type": "integer" },
"some_long_field": { "type": "long" },
"sensitive": { "type": "keyword" }
Expand Down
200 changes: 2 additions & 198 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gen3/guppy",
"version": "0.17.1",
"version": "0.18.0",
"description": "Server that support GraphQL queries on data from elasticsearch",
"main": "src/server/server.js",
"directories": {
Expand Down Expand Up @@ -34,7 +34,6 @@
"array.prototype.flatmap": "^1.3.2",
"body-parser": "^1.20.2",
"cors": "^2.8.5",
"csurf": "^1.11.0",
"dd-trace": "^4.5.0",
"express": "^4.18.2",
"file-saver": "^2.0.5",
Expand Down
7 changes: 6 additions & 1 deletion src/components/ConnectedFilter/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class ConnectedFilter extends React.Component {
this.state.allAsTextAggFields,
this.state.filter,
this.state.accessibility,
this.props.csrfToken,
)
.then((res) => {
if (!res.data) {
Expand Down Expand Up @@ -112,7 +113,7 @@ class ConnectedFilter extends React.Component {
}

/**
* Handler function that is called everytime filter changes
* Handler function that is called every time filter changes
* What this function does:
* 1. Ask guppy for aggregation data using (processed) filter
* 2. After get aggregation response, call `handleReceiveNewAggsData` handler
Expand All @@ -137,6 +138,7 @@ class ConnectedFilter extends React.Component {
this.state.allAsTextAggFields,
mergedFilterResults,
this.state.accessibility,
this.props.csrfToken,
)
.then((res) => {
this.handleReceiveNewAggsData(
Expand Down Expand Up @@ -285,6 +287,7 @@ class ConnectedFilter extends React.Component {
this.props.guppyConfig,
this.arrayFields,
this.props.filterValuesToHide,
this.props.csrfToken,
);
const filterStatus = this.state.filterStatusArray
? this.state.filterStatusArray[index] : null;
Expand Down Expand Up @@ -371,6 +374,7 @@ ConnectedFilter.propTypes = {
userFilterFromURL: PropTypes.object,
hideEmptyFilterSection: PropTypes.bool,
filterValuesToHide: PropTypes.arrayOf(PropTypes.string),
csrfToken: PropTypes.string,
};

ConnectedFilter.defaultProps = {
Expand All @@ -391,6 +395,7 @@ ConnectedFilter.defaultProps = {
userFilterFromURL: {},
hideEmptyFilterSection: false,
filterValuesToHide: [],
csrfToken: '',
};

export default ConnectedFilter;
Loading