Merge branch 'main' into bug/pre-flight-results-breaks

config/settings/base.py

@@ -97,6 +97,7 @@ def safe_key() -> str:
 MIDDLEWARE = [
     "metadeploy.logging_middleware.LoggingMiddleware",
     "sfdo_template_helpers.admin.middleware.AdminRestrictMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -460,7 +461,7 @@ def safe_key() -> str:
     ],
     'DEFAULT_THROTTLE_RATES': {
         'anon': '4/second',
-        'user': '4/second'
+        'user': '4/second',
     }
 
 }

locales/en-gb/translation.json

@@ -136,14 +136,14 @@
   "a_or_b": "<0></0> or <2></2>",
   "anErrorOccurred": "An error occurred. Try the <1>home page</1>?",
   "completed": "Completed",
-  "credentialsHoldTime": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minute or until your requested installation is complete.",
-  "credentialsHoldTime_plural": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_0": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_1": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minute or until your requested installation is complete.",
-  "credentialsHoldTime_2": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_3": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_4": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_5": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
+  "credentialsHoldTime": "If no action is performed for <2>{{token_minutes}}</2> minute, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_plural": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_0": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_1": "If no action is performed for <2>{{token_minutes}}</2> minute, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_2": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_3": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_4": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_5": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
   "durationDays": "{{count}} day",
   "durationDays_plural": "{{count}} days",
   "durationDays_0": "{{count}} days",

locales/en/translation.json

@@ -73,12 +73,12 @@
   "Oh no! This installation encountered an error.": "Oh no! This installation encountered an error.",
   "One Time Apex": "One Time Apex",
   "Only I and Salesforce staff can view this installation job.": "Only I and Salesforce staff can view this installation job.",
-  "Oops! It looks like you don’t have permissions to run an installation on this org.": "Oops! It looks like you don’t have permissions to run an installation on this org.",
+  "Oops! It looks like you have been logged out or don’t have permissions to run an installation on this org.": "Oops! It looks like you have been logged out or don’t have permissions to run an installation on this org.",
   "Optional": "Optional",
   "Org:": "Org:",
   "Other": "Other",
   "Package": "Package",
-  "Please contact an Admin within your org or use the button below to log in with a different org.": "Please contact an Admin within your org or use the button below to log in with a different org.",
+  "Please log back in, contact an Admin, or use the button below to log in with a different org.": "Please log back in, contact an Admin, or use the button below to log in with a different org.",
   "Potential Issues": "Potential Issues",
   "Pre-Install Validation In Progress…": "Pre-Install Validation In Progress…",
   "Pre-install validation completed successfully.": "Pre-install validation completed successfully.",
@@ -140,14 +140,14 @@
   "a_or_b": "<0></0> or <2></2>",
   "anErrorOccurred": "An error occurred. Try the <1>home page</1>?",
   "completed": "Completed",
-  "credentialsHoldTime": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minute or until your requested installation is complete.",
-  "credentialsHoldTime_plural": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_0": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_1": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minute or until your requested installation is complete.",
-  "credentialsHoldTime_2": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_3": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_4": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_5": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
+  "credentialsHoldTime": "If no action is performed for <2>{{token_minutes}}</2> minute, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_plural": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_0": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_1": "If no action is performed for <2>{{token_minutes}}</2> minute, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_2": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_3": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_4": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_5": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
   "durationDays": "{{count}} day",
   "durationDays_plural": "{{count}} days",
   "durationDays_0": "{{count}} days",

locales_dev/en/translation.json

@@ -67,10 +67,10 @@
   "Not Connected to Salesforce": "Not Connected to Salesforce",
   "Oh no! This installation encountered an error.": "Oh no! This installation encountered an error.",
   "Only I and Salesforce staff can view this installation job.": "Only I and Salesforce staff can view this installation job.",
-  "Oops! It looks like you don’t have permissions to run an installation on this org.": "Oops! It looks like you don’t have permissions to run an installation on this org.",
+  "Oops! It looks like you have been logged out or don’t have permissions to run an installation on this org.": "Oops! It looks like you have been logged out or don’t have permissions to run an installation on this org.",
   "Optional": "Optional",
   "Org:": "Org:",
-  "Please contact an Admin within your org or use the button below to log in with a different org.": "Please contact an Admin within your org or use the button below to log in with a different org.",
+  "Please log back in, contact an Admin, or use the button below to log in with a different org.": "Please log back in, contact an Admin, or use the button below to log in with a different org.",
   "Potential Issues": "Potential Issues",
   "Pre-Install Validation In Progress…": "Pre-Install Validation In Progress…",
   "Pre-install validation completed successfully.": "Pre-install validation completed successfully.",
@@ -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",
@@ -128,8 +129,8 @@
   "a_or_b": "<0></0> or <2></2>",
   "anErrorOccurred": "An error occurred. Try the <1>home page</1>?",
   "completed": "Completed",
-  "credentialsHoldTime": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
-  "credentialsHoldTime_plural": "The credentials to your Salesforce org will only be held for <2>{{token_minutes}}</2> minutes or until your requested installation is complete.",
+  "credentialsHoldTime": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
+  "credentialsHoldTime_plural": "If no action is performed for <2>{{token_minutes}}</2> minutes, you will be automatically logged out and will need to log in again.",
   "durationDays": "durationDays",
   "durationDays_plural": "durationDays",
   "durationHours": "durationHours",

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",