merge in main

.codeclimate.yml

@@ -1,18 +1,19 @@
 version: "2"
 exclude_patterns:
+  - components/
   - config/
-  - "**/db/"
   - dist/
   - features/
-  - "**/node_modules/"
   - script/
+  - Tests/
+  - "**/*.d.ts"
+  - "**/*_test.go"
+  - "**/db/"
+  - "**/node_modules/"
   - "**/spec/"
   - "**/test/"
   - "**/tests/"
-  - Tests/
   - "**/vendor/"
-  - "**/*_test.go"
-  - "**/*.d.ts"
 plugins:
   csslint:
     enabled: true

.devcontainer/chefs_local/local.json.sample

@@ -53,8 +53,9 @@
       "port": "8080",
       "rateLimit" : {
         "public": {
-          "windowMs": "900000",
-          "max": "100"
+          "limitApiKey": "120",
+          "limitFrontend": "500",
+          "windowMs": "60000",
         }
       },
       "encryption": {

.github/actions/deploy-to-environment/action.yaml

@@ -43,6 +43,10 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Install OpenShift CLI tools
+      uses: redhat-actions/openshift-tools-installer@v1
+      with:
+        oc: "4.14"
     - name: Checkout repository from pull request
       uses: actions/checkout@v4
       with:

.github/pull_request_template.md

@@ -1,14 +1,25 @@
-<!-- Provide a general summary of your changes in the Title above -->
+<!--
+The above Title for the Pull Request should use the format:
+    type: FORMS-ABCD your change description
+
+For example:
+    feat: FORMS-1234 add Assigned To column to submission table
+-->
 
 # Description
 
-<!-- Describe your changes in detail -->
-<!-- Why is this change required? What problem does it solve? -->
-<!-- If it fixes an open issue, please link to the issue here. -->
+<!--
+Describe your changes in detail.
+ - Why is this change required?
+ - What problem does it solve?
+-->
 
-## Types of changes
+## Type of Change
 
-<!-- Uncomment the main reason for the change (for example, all feat PRs should include docs and test, but only uncomment feat): -->
+<!--
+Uncomment the main reason for the change. For example: all "feat" PRs should
+include documentation ("docs") and tests ("test"), but only uncomment "feat".
+-->
 
 <!-- feat (a new feature) -->
 <!-- fix (a bug fix) -->
@@ -18,6 +29,7 @@
 <!-- docs (change to documentation) -->
 <!-- perf (change to improve performance) -->
 <!-- refactor (change to improve code quality) -->
+<!-- revert (reverts changes in a previous commit) -->
 <!-- style (change to code style/formatting) -->
 <!-- test (add missing tests or correct existing tests) -->
 
@@ -27,8 +39,10 @@ This is a breaking change because ...
 
 ## Checklist
 
-<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+<!--
+Go over all the following points, and put an `x` in all the boxes that apply. If
+you're unsure about any of these, don't hesitate to ask. We're here to help!
+-->
 
 - [ ] I have read the [CONTRIBUTING](/bcgov/common-hosted-form-service/blob/main/CONTRIBUTING.md) doc
 - [ ] I have checked that unit tests pass locally with my changes
@@ -39,4 +53,8 @@ This is a breaking change because ...
 
 ## Further comments
 
-<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
+<!--
+If this is a relatively large or complex change, kick off the discussion by
+explaining why you chose the solution you did and what alternatives you
+considered, etc...
+-->

.github/workflows/unit-tests.yaml

@@ -142,5 +142,5 @@ jobs:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         with:
           coverageLocations: |
-            ${{ github.workspace }}/**/lcov.info:lcov
+            ${{ github.workspace }}/**/clover.xml:clover
           prefix: ${{ github.workplace }}

app/app.js

@@ -8,6 +8,7 @@ const querystring = require('querystring');
 const log = require('./src/components/log')(module.filename);
 const httpLogger = require('./src/components/log').httpLogger;
 const middleware = require('./src/forms/common/middleware');
+const rateLimiter = require('./src/forms/common/middleware').apiKeyRateLimiter;
 const v1Router = require('./src/routes/v1');
 
 const DataConnection = require('./src/db/dataConnection');
@@ -52,6 +53,8 @@ app.use((_req, res, next) => {
   }
 });
 
+app.use(config.get('server.basePath') + config.get('server.apiPath'), rateLimiter);
+
 // Frontend configuration endpoint
 apiRouter.use('/config', (_req, res, next) => {
   try {

app/config/default.json

@@ -53,8 +53,9 @@
     "port": "8080",
     "rateLimit": {
       "public": {
-        "windowMs": "60000",
-        "max": "120"
+        "limitApiKey": "120",
+        "limitFrontend": "500",
+        "windowMs": "60000"
       }
     },
     "encryption": {

app/frontend/package.json

@@ -35,6 +35,7 @@
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/vue-fontawesome": "^3.0.3",
+    "@vueuse/core": "^11.1.0",
     "axios": "^1.4.0",
     "bootstrap-scss": "^5.3.1",
     "crypto-js": "^4.1.1",

app/frontend/src/components/admin/AddOwner.vue

@@ -1,48 +1,40 @@
-<script>
-import { mapActions } from 'pinia';
+<script setup>
 import { version as uuidVersion, validate as uuidValidate } from 'uuid';
 import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
 
 import { useAdminStore } from '~/store/admin';
 import { FormRoleCodes } from '~/utils/constants';
 
-export default {
-  props: {
-    formId: {
-      type: String,
-      required: true,
-    },
-  },
-  setup() {
-    const { locale } = useI18n({ useScope: 'global' });
+const { locale } = useI18n({ useScope: 'global' });
 
-    return { locale };
-  },
-  data() {
-    return {
-      userGuid: '',
-      valid: false,
-      userGuidRules: [
-        (v) => !!v || 'User ID required',
-        (v) =>
-          (uuidValidate(v) && uuidVersion(v) === 4) ||
-          'Enter a valid User ID GUID',
-      ],
-    };
-  },
-  methods: {
-    ...mapActions(useAdminStore, ['addFormUser', 'readRoles']),
-    async addOwner() {
-      if (this.$refs.addUserForm.validate()) {
-        await this.addFormUser({
-          userId: this.userGuid,
-          formId: this.formId,
-          roles: [FormRoleCodes.OWNER],
-        });
-      }
-    },
+const properties = defineProps({
+  formId: {
+    type: String,
+    required: true,
   },
-};
+});
+
+const addUserForm = ref(null);
+const userGuid = ref('');
+const valid = ref(false);
+const userGuidRules = ref([
+  (v) => !!v || 'User ID required',
+  (v) =>
+    (uuidValidate(v) && uuidVersion(v) === 4) || 'Enter a valid User ID GUID',
+]);
+
+const adminStore = useAdminStore();
+
+async function addOwner() {
+  if (addUserForm.value.validate()) {
+    await adminStore.addFormUser({
+      userId: userGuid.value,
+      formId: properties.formId,
+      roles: [FormRoleCodes.OWNER],
+    });
+  }
+}
 </script>
 
 <template>