# Server proxy for client parcel wfs

* refactors map_proxy.py
* adds proxy support for parcel wfs

konova/views/map_proxy.py

@@ -10,31 +10,80 @@ import json
 import requests
 from django.contrib.auth.decorators import login_required
 from django.http import JsonResponse, HttpRequest
+from django.utils.decorators import method_decorator
+from django.utils.http import urlencode
+from django.views import View
+from requests.auth import HTTPDigestAuth
 
-from konova.sub_settings.proxy_settings import PROXIES
+from konova.sub_settings.proxy_settings import PROXIES, CLIENT_PROXY_AUTH_USER, CLIENT_PROXY_AUTH_PASSWORD
 
 
-@login_required
-def map_client_proxy_view(request: HttpRequest):
+class BaseClientProxyView(View):
     """ Provides proxy functionality for NETGIS map client.
 
-    Used for fetching content of a provided url
-
-    Args:
-        request (HttpRequest): The incoming request
-
-    Returns:
-
     """
-    url = request.META.get("QUERY_STRING")
-    response = requests.get(url, proxies=PROXIES)
-    content = response.content
-    if isinstance(content, bytes):
-        content = content.decode("utf-8")
-    body = json.loads(content)
-    if response.status_code != 200:
-        return JsonResponse({
-            "status_code": response.status_code,
-            "content": body,
-        })
-    return JsonResponse(body)
+    class Meta:
+        abstract = True
+
+    @method_decorator(login_required)
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
+
+    def perform_url_call(self, url, headers={}, auth=None):
+        """ Generic proxied call
+
+        Args:
+            url (str): The url to call
+            headers (dict): Optional headers
+            auth: Optional authentication info
+
+        Returns:
+
+        """
+        response = requests.get(
+            url,
+            proxies=PROXIES,
+            headers=headers,
+            auth=auth
+        )
+        content = response.content
+        if isinstance(content, bytes):
+            content = content.decode("utf-8")
+        return content, response.status_code
+
+
+class ClientProxyParcelSearch(BaseClientProxyView):
+
+    def get(self, request: HttpRequest):
+        url = request.META.get("QUERY_STRING")
+        content, response_code = self.perform_url_call(url)
+        body = json.loads(content)
+        if response_code != 200:
+            return JsonResponse({
+                "status_code": response_code,
+                "content": body,
+            })
+        return JsonResponse(body)
+
+
+class ClientProxyParcelWFS(BaseClientProxyView):
+
+    def get(self, request: HttpRequest):
+        params = request.GET.dict()
+        params["version"] = "2.0.0"
+        params["outputformat"] = "application/json; subtype=geojson"
+        base_url = "https://www.geoportal.rlp.de/registry/wfs/519"
+        url = f"{base_url}?{urlencode(params, doseq=True)}"
+
+        url = url.replace("typename", "typenames")
+        auth = HTTPDigestAuth(CLIENT_PROXY_AUTH_USER, CLIENT_PROXY_AUTH_PASSWORD)
+
+        content, response_code = self.perform_url_call(url, auth=auth)
+        body = json.loads(content)
+        if response_code != 200:
+            return JsonResponse({
+                "status_code": response_code,
+                "content": body,
+            })
+        resp = JsonResponse(body)
+        return resp