project-booster-vue 9.18.6 → 9.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.18.6",
+  "version": "9.19.1",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -45,7 +45,6 @@
     "core-js": "3.21.1",
     "date-fns": "2.22.1",
     "firebase": "8.6.7",
-    "he": "1.2.0",
     "hooper": "nicoinch/hooper#1.0.5",
     "lodash.clonedeep": "4.5.0",
     "lodash.debounce": "4.0.8",

package/src/components/appointment/PbAppointmentForm.vue

@@ -1,6 +1,11 @@
 <template>
   <m-flex class="pb-appointment-form__container">
-    <iframe v-if="appointmentFormUrl" :src="appointmentFormUrl" style="border: 0; min-height: 110rem; width: 100%">
+    <iframe
+      v-if="appointmentFormUrl"
+      :src="appointmentFormUrl"
+      style="border: 0; min-height: 110rem; width: 100%"
+      id="clickrdv"
+    >
       <p>
         Your browser doesn't support iframes. To book an appointment, please follow this link :
         <a :href="appointmentFormUrl">{{ appointmentFormUrl }}</a>
@@ -44,6 +49,13 @@ export default defineComponent({
       appointmentFormUrl,
     };
   },
+  mounted() {
+    window.addEventListener('message', (event) => {
+      if (event.origin.indexOf('clicrdv.com') > -1) {
+        window.scrollTo(0, 0);
+      }
+    });
+  },
 });
 </script>
 

package/src/components/question/amount-input/default-payload.json

@@ -5,7 +5,7 @@
       "minValue": 0,
       "minErrorMessage": "Veuillez saisir un nombre entier plus grand que 0",
       "maxValue": 1500000,
-      "maxErrorMessage": "Veuillez saisir un nombre plus petit que 50"
+      "maxErrorMessage": "Veuillez saisir un nombre plus petit"
     },
     "backLabel": "Question précédente",
     "label": "Quel est votre budget ?",

package/src/services/api/appointmentQualificationsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -41,7 +41,7 @@ const saveAnswersByAppointmentQualificationId = async (appointmentQualificationI
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -53,7 +53,7 @@ const declarationsWithAppointment = async (data: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -65,7 +65,7 @@ const declarationsWithoutAppointment = async (data: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -81,7 +81,7 @@ const linkInhabitantProjectToAppointmentQualification = async (data: any, inhabi
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/configApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -23,7 +23,7 @@ const getConfiguration = async () => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/configurationsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -39,7 +39,7 @@ const getProjectConfigurationsForProjectType = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -56,7 +56,7 @@ const getAllProjectConfigurations = async (inhabitantProjectId: string, forceNoP
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -66,7 +66,7 @@ const linkConfiguration = async (id: string, inhabitantProjectId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/consentApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -23,7 +23,7 @@ export const getConsents = async () => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/documentsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -53,7 +53,7 @@ const getDocumentsByInhabitantProjectId = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -63,7 +63,7 @@ const getDocumentById = async (inhabitantProjectId: string, documentId: string)
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/estimatesApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 import { Estimate } from '@/types/pb/Estimate';
 import { ScenarioAnswer } from '@/types/pb/Scenario';
 
@@ -31,7 +31,7 @@ export const getAllEstimates = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -41,7 +41,7 @@ export const getEstimateById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -51,7 +51,7 @@ export const deleteEstimateById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -65,7 +65,7 @@ export const saveEstimate = async (estimate: Estimate) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -80,7 +80,7 @@ export const estimate = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/eventsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -25,7 +25,7 @@ export const buildEventApi = (target: string) => async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -37,7 +37,7 @@ export const sendAppointmentQualificationEvent = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -49,7 +49,7 @@ export const sendAppointmentQualificationAnswers = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -76,7 +76,7 @@ export const sendDocumentsEvent = async (event: {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -100,7 +100,7 @@ export const sendMediaEvent = async (event: {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -112,7 +112,7 @@ export const sendCardClickEvent = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -124,7 +124,7 @@ export const sendDeclarationEvent = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -136,7 +136,7 @@ export const sendSimulationEvent = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/inhabitantsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -23,7 +23,7 @@ export const getInhabitantById = async (inhabitantId: string, buId = '001') => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/mediaApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -23,7 +23,7 @@ const getAllMedia = async (start: number, end: number, inhabitantProjectId: stri
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -33,7 +33,7 @@ const getMediumById = async (mediumId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/productsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -24,7 +24,7 @@ export const getWorkKindsByProjectTypeId = async (projectTypeId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -34,7 +34,7 @@ export const getProductsByWorkKind = async (workKindId: string, storeId: string)
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -44,7 +44,7 @@ export const getProductsFeatureFlag = async (projectTypeId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -56,7 +56,7 @@ export const saveWorkKinds = async (inhabitantProjectId: string, workKinds: any)
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -66,7 +66,7 @@ export const getWorkKindsByProjectId = async (inhabitantProjectId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/projectsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 import { Project, ProjectToSave } from '@/types/pb/Project';
 
 export const clientApi = axios.create({
@@ -26,7 +26,7 @@ export const getAllProjects = async (currentProjectsPage: number, projectsPerPag
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -42,7 +42,7 @@ export const getAllProjectsForUserId = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -52,7 +52,7 @@ export const getProjectById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -62,7 +62,7 @@ export const deleteProjectById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -81,7 +81,7 @@ export const saveProjectDeclaration = async (projectDeclaration: ProjectToSave)
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -91,7 +91,7 @@ export const getProjectAttributesById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -101,7 +101,7 @@ export const getAppointmentById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/toolsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({});
 
@@ -17,7 +17,7 @@ export const getAllTools = async (projectType: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/htmlEscape.ts

@@ -0,0 +1,27 @@
+// Issue with kobi rewriting the lib we extract the part that we need here
+
+const regexEscape: RegExp = /["&'<>`]/g;
+
+const escapeMap: Record<string, string> = {
+  '"': '&quot;',
+  '&': '&amp;',
+  "'": '&#x27;',
+  '<': '&lt;',
+  // See https://mathiasbynens.be/notes/ambiguous-ampersands: in HTML, the
+  // following is not strictly necessary unless it’s part of a tag or an
+  // unquoted attribute value. We’re only escaping it to support those
+  // situations, and for XML support.
+  '>': '&gt;',
+  // In Internet Explorer ≤ 8, the backtick character can be used
+  // to break out of (un)quoted attribute values or HTML comments.
+  // See http://html5sec.org/#102, http://html5sec.org/#108, and
+  // http://html5sec.org/#133.
+  '`': '&#x60;',
+};
+
+export const escape = (string: string) => {
+  return string.replace(regexEscape, function ($0) {
+    // Note: there is no need to check `has(escapeMap, $0)` here.
+    return escapeMap[$0];
+  });
+};