Skip to content

Commit 7a67415

Browse files
committed
fix auth multiple values error close #160
1 parent c42c389 commit 7a67415

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

geo/Geoserver.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ def get_datastores(self, workspace: Optional[str] = None):
475475
url = "{}/rest/workspaces/{}/datastores.json".format(
476476
self.service_url, workspace
477477
)
478-
r = self._requests("get", url, auth=(self.username, self.password))
478+
r = self._requests("get", url)
479479
if r.status_code == 200:
480480
return r.json()
481481
else:
@@ -536,7 +536,7 @@ def get_coveragestores(self, workspace: str = None):
536536
workspace = "default"
537537

538538
url = "{}/rest/workspaces/{}/coveragestores".format(self.service_url, workspace)
539-
r = self._requests("get", url, auth=(self.username, self.password))
539+
r = self._requests("get", url)
540540
if r.status_code == 200:
541541
return r.json()
542542
else:
@@ -725,7 +725,7 @@ def get_layers(self, workspace: Optional[str] = None):
725725

726726
if workspace is not None:
727727
url = "{}/rest/workspaces/{}/layers".format(self.service_url, workspace)
728-
r = self._requests("get", url, auth=(self.username, self.password))
728+
r = self._requests("get", url)
729729
if r.status_code == 200:
730730
return r.json()
731731
else:
@@ -790,7 +790,7 @@ def get_layergroups(self, workspace: Optional[str] = None):
790790
url = "{}/rest/workspaces/{}/layergroups".format(
791791
self.service_url, workspace
792792
)
793-
r = self._requests("get", url, auth=(self.username, self.password))
793+
r = self._requests("get", url)
794794
if r.status_code == 200:
795795
return r.json()
796796
else:
@@ -1474,7 +1474,7 @@ def get_styles(self, workspace: Optional[str] = None):
14741474
url = "{}/rest/workspaces/{}/styles.json".format(
14751475
self.service_url, workspace
14761476
)
1477-
r = self._requests("get", url, auth=(self.username, self.password))
1477+
r = self._requests("get", url)
14781478
if r.status_code == 200:
14791479
return r.json()
14801480
else:
@@ -2752,7 +2752,7 @@ def get_featuretypes(self, workspace: str = None, store_name: str = None) -> Lis
27522752
url = "{}/rest/workspaces/{}/datastores/{}/featuretypes.json".format(
27532753
self.service_url, workspace, store_name
27542754
)
2755-
r = self._requests("get", url, auth=(self.username, self.password))
2755+
r = self._requests("get", url)
27562756
if r.status_code == 200:
27572757
r_dict = r.json()
27582758
features = [i["name"] for i in r_dict["featureTypes"]["featureType"]]
@@ -2788,7 +2788,7 @@ def get_feature_attribute(
27882788
url = "{}/rest/workspaces/{}/datastores/{}/featuretypes/{}.json".format(
27892789
self.service_url, workspace, store_name, feature_type_name
27902790
)
2791-
r = self._requests("get", url, auth=(self.username, self.password))
2791+
r = self._requests("get", url)
27922792
if r.status_code == 200:
27932793
r_dict = r.json()
27942794
attribute = [
@@ -2822,7 +2822,7 @@ def get_featurestore(self, store_name: str, workspace: str) -> dict:
28222822
url = "{}/rest/workspaces/{}/datastores/{}".format(
28232823
self.service_url, workspace, store_name
28242824
)
2825-
r = self._requests("get", url, auth=(self.username, self.password))
2825+
r = self._requests("get", url)
28262826
if r.status_code == 200:
28272827
r_dict = r.json()
28282828
return r_dict["dataStore"]
@@ -2858,7 +2858,7 @@ def delete_featurestore(
28582858
)
28592859
if workspace is None:
28602860
url = "{}/datastores/{}".format(self.service_url, featurestore_name)
2861-
r = self._requests("delete", url, auth=(self.username, self.password), params=payload)
2861+
r = self._requests("delete", url, params=payload)
28622862

28632863
if r.status_code == 200:
28642864
return "Status code: {}, delete featurestore".format(r.status_code)
@@ -2898,7 +2898,7 @@ def delete_coveragestore(
28982898
self.service_url, coveragestore_name
28992899
)
29002900

2901-
r = self._requests("delete", url, auth=(self.username, self.password), params=payload)
2901+
r = self._requests("delete", url, params=payload)
29022902

29032903
if r.status_code == 200:
29042904
return "Coverage store deleted successfully"
@@ -2937,7 +2937,7 @@ def get_all_users(self, service=None) -> dict:
29372937
url += "service/{}/users/".format(service)
29382938

29392939
headers = {"accept": "application/xml"}
2940-
r = self._requests("get", url, auth=(self.username, self.password), headers=headers)
2940+
r = self._requests("get", url, headers=headers)
29412941

29422942
if r.status_code == 200:
29432943
return parse(r.content)
@@ -3073,7 +3073,7 @@ def delete_user(self, username: str, service=None) -> str:
30733073
url += "service/{}/user/{}".format(service, username)
30743074

30753075
headers = {"accept": "application/json"}
3076-
r = self._requests("delete", url, auth=(self.username, self.password), headers=headers)
3076+
r = self._requests("delete", url, headers=headers)
30773077

30783078
if r.status_code == 200:
30793079
return "User deleted successfully"
@@ -3105,7 +3105,7 @@ def get_all_usergroups(self, service=None) -> dict:
31053105
else:
31063106
url += "service/{}/groups/".format(service)
31073107

3108-
r = self._requests("get", url, auth=(self.username, self.password))
3108+
r = self._requests("get", url)
31093109

31103110
if r.status_code == 200:
31113111
return parse(r.content)
@@ -3138,7 +3138,7 @@ def create_usergroup(self, group: str, service=None) -> str:
31383138
url += "group/{}".format(group)
31393139
else:
31403140
url += "service/{}/group/{}".format(service, group)
3141-
r = self._requests("post", url, auth=(self.username, self.password))
3141+
r = self._requests("post", url)
31423142

31433143
if r.status_code == 201:
31443144
return "Group created successfully"
@@ -3172,7 +3172,7 @@ def delete_usergroup(self, group: str, service=None) -> str:
31723172
else:
31733173
url += "service/{}/group/{}".format(service, group)
31743174

3175-
r = self._requests("delete", url, auth=(self.username, self.password))
3175+
r = self._requests("delete", url)
31763176

31773177
if r.status_code == 200:
31783178
return "Group deleted successfully"

0 commit comments

Comments
 (0)