Merge branch 'main' into bug/handle-http-error-oauth-exchange

config/settings/base.py

@@ -460,7 +460,7 @@ def safe_key() -> str:
     ],
     'DEFAULT_THROTTLE_RATES': {
         'anon': '4/second',
-        'user': '4/second'
+        'user': '4/second',
     }
 
 }

locales_dev/en/translation.json

@@ -99,6 +99,7 @@
   "Share Link to Installation Job": "Share Link to Installation Job",
   "Show Logs": "Show Logs",
   "Skipped": "Skipped",
+  "Something went wrong. Please try again later.": "Something went wrong. Please try again later.",
   "Start Pre-Install Validation": "Start Pre-Install Validation",
   "Start Pre-Install Validation on Scratch Org": "Start Pre-Install Validation on Scratch Org",
   "Steps": "Steps",

metadeploy/adminapi/api.py

@@ -138,6 +138,7 @@ class Meta:
 class PlanTemplateViewSet(AdminAPIViewSet):
     model_name = "PlanTemplate"
     serializer_base = PlanTemplateSerializer
+    throttle_classes = []
 
 
 class PlanFilter(filters.FilterSet):
@@ -150,22 +151,27 @@ class PlanViewSet(AdminAPIViewSet):
     model_name = "Plan"
     serializer_base = PlanSerializer
     filterset_class = PlanFilter
+    throttle_classes = []
 
 
 class PlanSlugViewSet(AdminAPIViewSet):
     model_name = "PlanSlug"
+    throttle_classes = []
 
 
 class VersionViewSet(AdminAPIViewSet):
     model_name = "Version"
+    throttle_classes = []
 
 
 class ProductCategoryViewSet(AdminAPIViewSet):
     model_name = "ProductCategory"
+    throttle_classes = []
 
 
 class AllowedListViewSet(AdminAPIViewSet):
     model_name = "AllowedList"
+    throttle_classes = []
 
 
 class AllowedListOrgSerializer(AdminAPISerializer):
@@ -175,6 +181,7 @@ class AllowedListOrgSerializer(AdminAPISerializer):
 class AllowedListOrgViewSet(AdminAPIViewSet):
     model_name = "AllowedListOrg"
     serializer_base = AllowedListOrgSerializer
+    throttle_classes = []
 
 
 class TranslationViewSet(viewsets.ViewSet):
@@ -194,6 +201,7 @@ class TranslationViewSet(viewsets.ViewSet):
 
     permission_classes = [IsAPIUser]
     model_name = "Translation"
+    throttle_classes = []
 
     def partial_update(self, request, pk=None):
         # Add or update a Translation record for each message

metadeploy/adminapi/tests/test_api.py

@@ -86,6 +86,14 @@ def test_list(self, admin_api_client, plan_factory):
             "meta": {"page": {"total": 1}},
         }
 
+    def test_throttle(self, admin_api_client):
+        url = "http://testserver/admin/rest/allowedlistorgs"
+        for i in range(0, 4):
+            response = admin_api_client.get(url)
+
+        response = admin_api_client.get(url)
+        assert response.status_code == 200
+
     def test_retrieve(self, admin_api_client, step_factory):
         step = step_factory()
         plan = step.plan

package.json

@@ -52,7 +52,6 @@
     "heroku-postbuild": "yarn prod"
   },
   "dependencies": {
-    "@omnistudio/omniscript-lwc-compiler": "^244.4.0",
     "@react-hook/window-scroll": "^1.3.0",
     "@salesforce-ux/design-system": "^2.18.1",
     "@salesforce/design-system-react": "^0.10.48",
@@ -154,6 +153,9 @@
     "webpack-dev-server": "^4.9.3",
     "webpack-merge": "^5.8.0"
   },
+  "optionalDependencies": {
+    "@omnistudio/omniscript-lwc-compiler": "^244.4.0"
+  },
   "resolutions": {
     "@storybook/**/ansi-regex": "^5.0.1",
     "@storybook/**/glob-parent": "^5.1.2",

src/js/components/apiErrors.tsx

@@ -18,6 +18,15 @@ const ErrorToast = ({
   doRemoveError: typeof removeError;
 }) => {
   const { t } = useTranslation();
+
+  if (
+    error.message &&
+    typeof error.message === 'string' &&
+    /<[a-z][\s\S]*>/i.test(error.message)
+  ) {
+    error.message = t('Something went wrong. Please try again later.');
+  }
+
   return (
     <Toast
       labels={{

src/js/utils/api.ts

@@ -72,6 +72,9 @@ const apiFetch = (
             msg = body.non_field_errors;
           }
         }
+        if (response.status > 500 && response.status <= 600) {
+          msg = 'Something went wrong. Please try again later.';
+        }
         dispatch(addError(msg));
         const error: ApiError = new Error(msg);
         error.response = response;

test/js/components/apiErrors.test.js

@@ -16,6 +16,16 @@ describe('<Errors />', () => {
     return { getByText };
   };
 
+  const setupforRawHTML = () => {
+    const errors = [
+      { id: 'err1', message: '<html><div>This is Error</div></html>' },
+    ];
+    const { getByText } = render(
+      <Errors errors={errors} doRemoveError={doRemoveError} />,
+    );
+    return { getByText };
+  };
+
   test('calls window.location.reload on link click', () => {
     const { getByText } = setup();
 
@@ -24,6 +34,13 @@ describe('<Errors />', () => {
 
     expect(window.location.reload).toHaveBeenCalledTimes(1);
   });
+  test('for raw html error', () => {
+    const { getByText } = setupforRawHTML();
+
+    expect(
+      getByText('Something went wrong. Please try again later.'),
+    ).toBeVisible();
+  });
 
   test('calls doRemoveError on close click', () => {
     const { getByText } = setup();

test/js/utils/api.test.js

@@ -35,6 +35,14 @@ describe('apiFetch', () => {
   });
 
   describe('error', () => {
+    test('throws Error for status code greater than 500', () => {
+      fetchMock.getOnce('/test/url/', { status: 503, body: {} });
+
+      expect.assertions(1);
+      return expect(apiFetch('/test/url/', dispatch)).rejects.toThrow(
+        'Something went wrong. Please try again later.',
+      );
+    });
     test('throws Error without response', () => {
       fetchMock.getOnce('/test/url/', { status: 500, body: {} });