Merge pull request #701 from peaemaye/ServiceRejectIssue

Fix service reject issue & setCookieData() method deletes lastConsentTimestamp field
orestbida · Jul 2, 2024 · da3ca52 · da3ca52
2 parents c4d512f + 8785e50
commit da3ca52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/core/api.js b/src/core/api.js
@@ -614,13 +614,13 @@ const retrieveState = () => {
      * and calculate acceptType
      */
     if (!state._invalidConsent) {
-        state._enabledServices = {...state._acceptedServices};
-
         state._acceptedServices = {
             ...state._acceptedServices,
             ...services
         };
 
+        state._enabledServices = {...state._acceptedServices};
+
         setAcceptedCategories([
             ...state._readOnlyCategories,
             ...categories

diff --git a/src/utils/cookies.js b/src/utils/cookies.js
@@ -168,6 +168,10 @@ export const saveCookiePreferences = () => {
         consentId: state._consentId,
         services: deepCopy(state._acceptedServices)
     };
+
+    if (state._lastConsentTimestamp) {
+        state._savedCookieContent.lastConsentTimestamp = state._lastConsentTimestamp.toISOString();
+    }
 
     let isFirstConsent = false;
     const stateChanged = categoriesWereChanged || servicesWereChanged;