Fix integration builder issues (#427)

- fix error when getting a response that is unexpected (not JSON)
- fix error when trying to edit a sync item
- fix masking oauth secrets

back/admin/integrations/exceptions.py

@@ -4,3 +4,7 @@ class FailedPaginatedResponseError(Exception):
 
 class KeyIsNotInDataError(Exception):
     pass
+
+
+class DataIsNotJSONError(Exception):
+    pass

back/admin/integrations/mixins.py

@@ -1,8 +1,10 @@
 import logging
+from json.decoder import JSONDecodeError
 
 from django.utils.translation import gettext_lazy as _
 
 from admin.integrations.exceptions import (
+    DataIsNotJSONError,
     FailedPaginatedResponseError,
     KeyIsNotInDataError,
 )
@@ -37,6 +39,14 @@ def extract_data_from_list_response(self, response):
                     "response": self.integration.clean_response(response.json()),
                 }
             )
+        except JSONDecodeError:
+            raise DataIsNotJSONError(
+                _("Response is not JSON: %(response)s")
+                % {
+                    "response": self.integration.clean_response(response.text),
+                }
+            )
+
         data_structure = self.integration.manifest["data_structure"]
         user_details = []
         for user_data in users:

back/admin/integrations/models.py

@@ -771,9 +771,25 @@ def clean_response(self, response) -> str:
                 response = str(response)
 
         for name, value in self.extra_args.items():
-            response = response.replace(
-                str(value), _("***Secret value for %(name)s***") % {"name": name}
-            )
+            if isinstance(value, dict):
+                for inner_name, inner_value in value.items():
+                    response = response.replace(
+                        str(inner_value),
+                        _("***Secret value for %(name)s***")
+                        % {"name": name + "." + inner_name},
+                    )
+            else:
+                response = response.replace(
+                    str(value), _("***Secret value for %(name)s***") % {"name": name}
+                )
+
+            if name == "Authorization" and value.startswith("Basic"):
+                response.replace(
+                    base64.b64encode(value.split(" ", 1)[1].encode("ascii")).decode(
+                        "ascii"
+                    ),
+                    "BASE64 ENCODED SECRET",
+                )
 
         return response
 

back/admin/integrations/views.py

@@ -248,6 +248,9 @@ def get_context_data(self, **kwargs):
         if pk := self.kwargs.get("pk", False):
             integration = get_object_or_404(Integration, id=pk)
             manifest = integration.manifest
+            if manifest.get("form", None) is None:
+                manifest["form"] = []
+
             context["object"] = integration
             if not manifest.get("exists", {}):
                 manifest["exists"] = {

back/admin/people/views.py

@@ -15,6 +15,7 @@
 
 from admin.admin_tasks.models import AdminTask
 from admin.integrations.exceptions import (
+    DataIsNotJSONError,
     FailedPaginatedResponseError,
     KeyIsNotInDataError,
 )
@@ -416,7 +417,11 @@ def get(self, request, pk, *args, **kwargs):
             # we are passing in the user who is requesting it, but we likely don't need
             # them.
             users = SyncUsers(integration).get_import_user_candidates()
-        except (KeyIsNotInDataError, FailedPaginatedResponseError) as e:
+        except (
+            KeyIsNotInDataError,
+            FailedPaginatedResponseError,
+            DataIsNotJSONError,
+        ) as e:
             return render(request, "_import_user_table.html", {"error": e})
 
         return render(