From 7a6741536699d91f5f22ef73a7c1dd79227d1430 Mon Sep 17 00:00:00 2001 From: iamtekson Date: Thu, 25 Jul 2024 14:06:23 -0600 Subject: [PATCH] fix auth multiple values error close #160 --- geo/Geoserver.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/geo/Geoserver.py b/geo/Geoserver.py index b4a6232..29c19ce 100644 --- a/geo/Geoserver.py +++ b/geo/Geoserver.py @@ -475,7 +475,7 @@ def get_datastores(self, workspace: Optional[str] = None): url = "{}/rest/workspaces/{}/datastores.json".format( self.service_url, workspace ) - r = self._requests("get", url, auth=(self.username, self.password)) + r = self._requests("get", url) if r.status_code == 200: return r.json() else: @@ -536,7 +536,7 @@ def get_coveragestores(self, workspace: str = None): workspace = "default" url = "{}/rest/workspaces/{}/coveragestores".format(self.service_url, workspace) - r = self._requests("get", url, auth=(self.username, self.password)) + r = self._requests("get", url) if r.status_code == 200: return r.json() else: @@ -725,7 +725,7 @@ def get_layers(self, workspace: Optional[str] = None): if workspace is not None: url = "{}/rest/workspaces/{}/layers".format(self.service_url, workspace) - r = self._requests("get", url, auth=(self.username, self.password)) + r = self._requests("get", url) if r.status_code == 200: return r.json() else: @@ -790,7 +790,7 @@ def get_layergroups(self, workspace: Optional[str] = None): url = "{}/rest/workspaces/{}/layergroups".format( self.service_url, workspace ) - r = self._requests("get", url, auth=(self.username, self.password)) + r = self._requests("get", url) if r.status_code == 200: return r.json() else: @@ -1474,7 +1474,7 @@ def get_styles(self, workspace: Optional[str] = None): url = "{}/rest/workspaces/{}/styles.json".format( self.service_url, workspace ) - r = self._requests("get", url, auth=(self.username, self.password)) + r = self._requests("get", url) if r.status_code == 200: return r.json() else: @@ -2752,7 +2752,7 @@ def get_featuretypes(self, workspace: str = None, store_name: str = None) -> Lis url = "{}/rest/workspaces/{}/datastores/{}/featuretypes.json".format( self.service_url, workspace, store_name ) - r = self._requests("get", url, auth=(self.username, self.password)) + r = self._requests("get", url) if r.status_code == 200: r_dict = r.json() features = [i["name"] for i in r_dict["featureTypes"]["featureType"]] @@ -2788,7 +2788,7 @@ def get_feature_attribute( url = "{}/rest/workspaces/{}/datastores/{}/featuretypes/{}.json".format( self.service_url, workspace, store_name, feature_type_name ) - r = self._requests("get", url, auth=(self.username, self.password)) + r = self._requests("get", url) if r.status_code == 200: r_dict = r.json() attribute = [ @@ -2822,7 +2822,7 @@ def get_featurestore(self, store_name: str, workspace: str) -> dict: url = "{}/rest/workspaces/{}/datastores/{}".format( self.service_url, workspace, store_name ) - r = self._requests("get", url, auth=(self.username, self.password)) + r = self._requests("get", url) if r.status_code == 200: r_dict = r.json() return r_dict["dataStore"] @@ -2858,7 +2858,7 @@ def delete_featurestore( ) if workspace is None: url = "{}/datastores/{}".format(self.service_url, featurestore_name) - r = self._requests("delete", url, auth=(self.username, self.password), params=payload) + r = self._requests("delete", url, params=payload) if r.status_code == 200: return "Status code: {}, delete featurestore".format(r.status_code) @@ -2898,7 +2898,7 @@ def delete_coveragestore( self.service_url, coveragestore_name ) - r = self._requests("delete", url, auth=(self.username, self.password), params=payload) + r = self._requests("delete", url, params=payload) if r.status_code == 200: return "Coverage store deleted successfully" @@ -2937,7 +2937,7 @@ def get_all_users(self, service=None) -> dict: url += "service/{}/users/".format(service) headers = {"accept": "application/xml"} - r = self._requests("get", url, auth=(self.username, self.password), headers=headers) + r = self._requests("get", url, headers=headers) if r.status_code == 200: return parse(r.content) @@ -3073,7 +3073,7 @@ def delete_user(self, username: str, service=None) -> str: url += "service/{}/user/{}".format(service, username) headers = {"accept": "application/json"} - r = self._requests("delete", url, auth=(self.username, self.password), headers=headers) + r = self._requests("delete", url, headers=headers) if r.status_code == 200: return "User deleted successfully" @@ -3105,7 +3105,7 @@ def get_all_usergroups(self, service=None) -> dict: else: url += "service/{}/groups/".format(service) - r = self._requests("get", url, auth=(self.username, self.password)) + r = self._requests("get", url) if r.status_code == 200: return parse(r.content) @@ -3138,7 +3138,7 @@ def create_usergroup(self, group: str, service=None) -> str: url += "group/{}".format(group) else: url += "service/{}/group/{}".format(service, group) - r = self._requests("post", url, auth=(self.username, self.password)) + r = self._requests("post", url) if r.status_code == 201: return "Group created successfully" @@ -3172,7 +3172,7 @@ def delete_usergroup(self, group: str, service=None) -> str: else: url += "service/{}/group/{}".format(service, group) - r = self._requests("delete", url, auth=(self.username, self.password)) + r = self._requests("delete", url) if r.status_code == 200: return "Group deleted successfully"