Cookies fix (#159)

* fix privacy slider

fix getCookie

fix is Analytics allowed

debuggin analytics - subtract isAllowed consitional

add the debug built

add privacy test

refactor privacy function out of the about control

space

clean up

refactor is analytics allowed method

* new build

* add is privacy social and usage enabled

* additional test for privacy

* clean up

* new build

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "bldrs-ai",
-  "version": "1.0.0-r268",
+  "name": "buildrs",
+  "version": "1.0.0-r270",
   "main": "src/index.jsx",
   "homepage": "https://github.com/bldrs-ai/Share",
   "bugs": {

src/Components/AboutControl.jsx

@@ -1,4 +1,4 @@
-import React, {useState} from 'react'
+import React, {useState, useEffect} from 'react'
 import Slider from '@mui/material/Slider'
 import Typography from '@mui/material/Typography'
 import {makeStyles} from '@mui/styles'
@@ -69,6 +69,16 @@ function AboutDialog({isDialogDisplayed, setIsDialogDisplayed, installPrefix}) {
  */
 function AboutContent({installPrefix}) {
   const classes = useStyles()
+  const [privacySlider, setPrivacySlider] = useState(0)
+  useEffect(()=>{
+    if (Privacy.isPrivacySocialEnabled()) {
+      setPrivacySlider(20)
+    } else if (Privacy.isPrivacyUsageEnabled()) {
+      setPrivacySlider(10)
+    } else {
+      setPrivacySlider(0)
+    }
+  }, [])
   const marks = [
     {value: 0, label: 'Functional', info: 'Theme, UI state, cookie preference'},
     {value: 10, label: 'Usage', info: 'Stats from your use of Bldrs'},
@@ -77,11 +87,21 @@ function AboutContent({installPrefix}) {
   const setPrivacy = (event) => {
     debug().log('AboutContent#setPrivacy: ', event.target.value)
     switch (event.target.value) {
-      case 0: Privacy.setUsageAndSocialEnabled(false, false); break
-      case 10: Privacy.setUsageAndSocialEnabled(true, false); break
-      case 20: Privacy.setUsageAndSocialEnabled(true, true); break
+      case 0:
+        Privacy.setUsageAndSocialEnabled(false, false)
+        setPrivacySlider(0)
+        break
+      case 10:
+        Privacy.setUsageAndSocialEnabled(true, false)
+        setPrivacySlider(10)
+        break
+      case 20:
+        Privacy.setUsageAndSocialEnabled(true, true)
+        setPrivacySlider(20)
+        break
     }
   }
+
   return (
     <div className={classes.content}>
       <Typography
@@ -116,7 +136,7 @@ function AboutContent({installPrefix}) {
         <Slider
           onChange={setPrivacy}
           marks={marks}
-          defaultValue={30}
+          value={privacySlider}
           step={10}
           min={0}
           max={20}

src/privacy/Privacy.js

@@ -21,18 +21,6 @@ export function getCookie({component, name, defaultValue}) {
 }
 
 
-/**
- * @param {boolean} isUsageEnabled
- * @param {boolean} isSocialEnabled
- */
-export function setUsageAndSocialEnabled(isUsageEnabled, isSocialEnabled) {
-  assertDefined(isUsageEnabled, isSocialEnabled)
-  debug().log('Privacy#setUsageAndSocialEnabled: ', isUsageEnabled, isSocialEnabled)
-  setCookieBoolean({component: 'cookies', name: 'usage', value: isUsageEnabled})
-  setCookieBoolean({component: 'cookies', name: 'social', value: isSocialEnabled})
-}
-
-
 /**
  * @param {string} component
  * @param {string} name
@@ -69,3 +57,41 @@ export function setCookieBoolean({component, name, value}) {
   assertDefined(component, name, value)
   setCookiePrivate(name, value)
 }
+
+
+/**
+ * @param {boolean} isUsageEnabled
+ * @param {boolean} isSocialEnabled
+ */
+export function setUsageAndSocialEnabled(isUsageEnabled, isSocialEnabled) {
+  assertDefined(isUsageEnabled, isSocialEnabled)
+  debug().log('Privacy#setUsageAndSocialEnabled: ', isUsageEnabled, isSocialEnabled)
+  setCookieBoolean({component: 'cookies', name: 'usage', value: isUsageEnabled})
+  setCookieBoolean({component: 'cookies', name: 'social', value: isSocialEnabled})
+}
+
+
+/**
+ * @return {boolean} for social privacy level
+ */
+export function isPrivacySocialEnabled() {
+  return (
+    getCookieBoolean({
+      component: 'privacy',
+      name: 'social',
+      defaultValue: true})
+  )
+}
+
+
+/**
+ * @return {boolean} for usage privacy level
+ */
+export function isPrivacyUsageEnabled() {
+  return (
+    getCookieBoolean({
+      component: 'privacy',
+      name: 'usage',
+      defaultValue: true})
+  )
+}

src/privacy/Privacy.test.js

@@ -0,0 +1,35 @@
+import * as Privacy from './Privacy'
+
+
+test('getCookie', () => {
+  Privacy.setCookie({component: 'component', name: 'name', value: 'true'})
+  const retValue = Privacy.getCookie({
+    component: 'component',
+    name: 'name',
+    defaultValue: 'defaultValue'})
+  expect(retValue).toBe('true')
+})
+
+
+test('getCookieBoolean', () => {
+  Privacy.setCookie({component: 'component', name: 'name', value: 'true'})
+  const retValue = Privacy.getCookieBoolean({
+    component: 'component',
+    name: 'name',
+    defaultValue: 'value'})
+  expect(retValue).toBe(true)
+})
+
+
+test('isPrivacySocialEnabled', () => {
+  Privacy.setCookie({component: 'privacy', name: 'social', value: 'true'})
+  const retValue = Privacy.isPrivacySocialEnabled()
+  expect(retValue).toBe(true)
+})
+
+
+test('isPrivacyUsageEnabled', () => {
+  Privacy.setCookie({component: 'privacy', name: 'usage', value: 'true'})
+  const retValue = Privacy.isPrivacySocialEnabled()
+  expect(retValue).toBe(true)
+})

src/privacy/analytics.js

@@ -1,5 +1,6 @@
 import gtag from '../utils/gtag'
 import * as Functional from './functional'
+import * as Privacy from './Privacy'
 import {assertDefined} from '../utils/assert'
 
 
@@ -20,10 +21,10 @@ export function recordEvent(commandParameters, additionalConfigInfo) {
 
 
 /**
- * @return {boolean} is analytics enabled
+ * @return {boolean} is social level of privacy enabled
  */
 export function isAnalyticsAllowed() {
-  return Functional.getCookieBoolean('isAnalyticsAllowed', false) // defaultValue
+  return Privacy.isPrivacySocialEnabled()
 }
 
 

src/privacy/functional.js

@@ -39,16 +39,14 @@ export function isCookieSet(name) {
  */
 export function getCookie(name, defaultValue) {
   assertDefined(name, defaultValue)
-  const namePrefix = name + '='
   const decodedCookie = decodeURIComponent(document.cookie)
-  const ca = decodedCookie.split(';')
-  for (let i = 0; i < ca.length; i++) {
-    let c = ca[i]
-    while (c.charAt(0) == ' ') {
-      c = c.substring(1)
-    }
-    if (c.indexOf(namePrefix) == 0) {
-      return c.substring(namePrefix.length, c.length)
+  const properties = decodedCookie.split(';')
+  for (let i = 0; i < properties.length; i++) {
+    const parts = properties[i].trim().split('=')
+    const propName = parts[0]
+    const propValue = parts[1]
+    if (propName == name) {
+      return propValue
     }
   }
   return defaultValue + ''