Skip to content

Commit 27292fb

Browse files
Merge pull request #35 from Geode-solutions/next
Next
2 parents 9e4431d + 444ee71 commit 27292fb

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22

33

44

5-
## v1.3.1 (2023-11-02)
5+
## v1.4.0-rc.1 (2023-11-06)
6+
7+
### Feature
8+
9+
* feat(functions): validate_request function ([`124c2f1`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/124c2f1b13f2a4e0fbfa7ca2054b3aede3fed368))
610

711
### Unknown
812

9-
* Merge pull request #30 from Geode-solutions/next
13+
* Merge pull request #31 from Geode-solutions/feat_validate_request
1014

11-
Next ([`54858fb`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/54858fb2ffd30de465f92a2e91f945f713c6b6db))
15+
feat(functions): validate_request function ([`8a55224`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/8a5522405c1b432592835cbe3b4b0f42e6334c71))
1216

1317
* Merge branch 'master' into next ([`2a328b1`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/2a328b118581b6ff6db09ee6c616977e1497bfea))
1418

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
55

66
[project]
77
name = "OpenGeodeWeb-Back"
8-
version = "1.3.1"
8+
version = "1.4.0-rc.1"
99
dynamic = ["dependencies"]
1010
authors = [
1111
{ name="Geode-solutions", email="[email protected]" },

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#
55
# pip-compile --resolver=backtracking requirements.in
66
#
7-
geode-common==29.0.0
7+
geode-common==29.0.1
88
# via geode-viewables
9-
geode-viewables==2.1.2
9+
geode-viewables==2.1.3
1010
# via -r requirements.in
11-
opengeode-core==14.9.1
11+
opengeode-core==14.9.3
1212
# via
1313
# -r requirements.in
1414
# geode-common

src/opengeodeweb_back/geode_functions.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,15 @@ def extension_from_filename(filename):
234234
return os.path.splitext(filename)[1][1:]
235235

236236

237-
def form_variables(form, variables_array):
238-
variables_dict = {}
237+
def validate_request(request, variables_array):
238+
json_data = request.get_json(force=True, silent=True)
239+
240+
if json_data is None:
241+
flask.abort(400, f"No json sent")
242+
239243
for variable in variables_array:
240-
if form.get(variable) is None:
244+
if variable not in json_data.keys():
241245
flask.abort(400, f"No {variable} sent")
242-
else:
243-
variables_dict[variable] = form.get(variable)
244-
return variables_dict
245246

246247

247248
def geographic_coordinate_systems(geode_object: str):

0 commit comments

Comments
 (0)