fix: changes as requested in PR #310 #302

codegouvfr · Sep 17, 2024 · e89a22e · e89a22e
1 parent 1e14075
commit e89a22e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/src/consentManagement/createConsentManagement.ts b/src/consentManagement/createConsentManagement.ts
@@ -29,7 +29,7 @@ export function createConsentManagement<
         finalityDescription,
         personalDataPolicyLinkProps,
         consentCallback,
-        localStorageKeyPrefix
+        localStorageKeyPrefix = defaultLocalStorageKeyPrefix
     } = params;
 
     const finalities = getFinalitiesFromFinalityDescription({
@@ -39,9 +39,7 @@ export function createConsentManagement<
                 : finalityDescription
     });
 
-    const localStorageKey = `${
-        localStorageKeyPrefix ?? defaultLocalStorageKeyPrefix
-    } ${finalities.join("-")}`;
+    const localStorageKey = `${localStorageKeyPrefix} ${finalities.join("-")}`;
 
     const $finalityConsent = createStatefulObservable<FinalityConsent<Finality> | undefined>(() => {
         if (!isBrowser) {
@@ -106,8 +104,7 @@ export function createConsentManagement<
         useConsent,
         ConsentBannerAndConsentManagement,
         FooterConsentManagementItem,
-        FooterPersonalDataPolicyItem,
-        consentLocalStorageKey: localStorageKey
+        FooterPersonalDataPolicyItem
     };
 }
 

diff --git a/stories/ConsentManagement.stories.tsx b/stories/ConsentManagement.stories.tsx
@@ -34,8 +34,7 @@ export const {
     ConsentBannerAndConsentManagement, 
     FooterConsentManagementItem, 
     FooterPersonalDataPolicyItem,
-    useConsent,
-    consentLocalStorageKey
+    useConsent
 } = createConsentManagement({
     /* 
         Can be an object or a function that take the current language as argument.
@@ -122,13 +121,7 @@ export const {
         }
         */
 
-    },
-
-    /*
-    This optional parameter let's you personalise the key that is used to store user's consents in the localStorage.
-    The default value is "${defaultLocalStorageKeyPrefix}"
-    */
-    "localStorageKeyPrefix": "company-name/app-name"
+    }
 });
 \`\`\`
 
@@ -220,8 +213,7 @@ const {
     ConsentBannerAndConsentManagement,
     FooterConsentManagementItem,
     FooterPersonalDataPolicyItem,
-    useConsent,
-    consentLocalStorageKey
+    useConsent
 } = createConsentManagement({
     "finalityDescription": {
         "advertising": {
@@ -292,7 +284,7 @@ function Story() {
             <Button
                 onClick={() => {
                     Object.keys(localStorage)
-                        .filter(key => key.startsWith(consentLocalStorageKey))
+                        .filter(key => key.startsWith(defaultLocalStorageKeyPrefix))
                         .forEach(key => localStorage.removeItem(key));
 
                     location.reload();

diff --git a/test/integration/vite/src/consentManagement.tsx b/test/integration/vite/src/consentManagement.tsx
@@ -6,8 +6,7 @@ export const {
     ConsentBannerAndConsentManagement, 
     FooterConsentManagementItem, 
     FooterPersonalDataPolicyItem,
-    useConsent,
-    consentLocalStorageKey
+    useConsent
 } = createConsentManagement({
     "finalityDescription": ({ lang }) => ({
         "advertising": {
@@ -42,6 +41,5 @@ export const {
         }
 
         console.log("callback from gdpr hook");
-    },
-    "localStorageKeyPrefix": "company-name/app-name finalityConsent"
+    }
 });