@flagship.io/react-sdk 3.0.0 → 3.0.1

package/dist/es/Flag.js

@@ -3,27 +3,27 @@ import { noVisitorMessage } from './constants';
 import { log } from './utils';
 export class Flag {
   constructor(defaultValue) {
-    log(LogLevel.ERROR, noVisitorMessage, 'GetFlag');
+    log(LogLevel.WARNING, noVisitorMessage, 'GetFlag');
     this._defaultValue = defaultValue;
   }
 
   getValue() {
-    log(LogLevel.ERROR, noVisitorMessage, 'exists');
+    log(LogLevel.WARNING, noVisitorMessage, 'getValue');
     return this._defaultValue;
   }
 
   exists() {
-    log(LogLevel.ERROR, noVisitorMessage, 'exists');
+    log(LogLevel.WARNING, noVisitorMessage, 'exists');
     return false;
   }
 
   userExposed() {
-    log(LogLevel.ERROR, noVisitorMessage, 'userExposed');
+    log(LogLevel.WARNING, noVisitorMessage, 'userExposed');
     return Promise.resolve();
   }
 
   get metadata() {
-    log(LogLevel.ERROR, noVisitorMessage, 'metadata');
+    log(LogLevel.WARNING, noVisitorMessage, 'metadata');
     return new FlagMetadata({
       campaignId: '',
       campaignType: '',

package/dist/es/FlagshipContext.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-use-before-define
-import React, { useState, useEffect, createContext, useRef } from 'react';
-import { Flagship, FlagshipStatus } from '@flagship.io/js-sdk';
-import { getModificationsFromCampaigns, logError, uuidV4 } from './utils';
+import React, { useState, useEffect, createContext, useRef } from "react";
+import { Flagship, FlagshipStatus } from "@flagship.io/js-sdk";
+import { getModificationsFromCampaigns, logError, useNonInitialEffect } from "./utils";
 const initStat = {
   status: {
     isLoading: true,
@@ -64,47 +64,20 @@ export const FlagshipProvider = ({
   const [lastModified, setLastModified] = useState();
   const stateRef = useRef();
   stateRef.current = state;
-  useEffect(() => {
+  useNonInitialEffect(() => {
     if (synchronizeOnBucketingUpdated) {
       var _state$visitor;
 
       (_state$visitor = state.visitor) === null || _state$visitor === void 0 ? void 0 : _state$visitor.fetchFlags();
     }
   }, [lastModified]);
-  useEffect(() => {
-    updateVisitor();
+  useNonInitialEffect(() => {
+    createVisitor(true);
   }, [JSON.stringify(visitorData)]);
   useEffect(() => {
     initSdk();
   }, [envId, apiKey, decisionMode]);
 
-  const updateVisitor = () => {
-    if (!state.visitor) {
-      return;
-    }
-
-    if (visitorData.context) {
-      state.visitor.clearContext();
-      state.visitor.updateContext(visitorData.context);
-    }
-
-    if (typeof visitorData.hasConsented === 'boolean') {
-      state.visitor.setConsent(visitorData.hasConsented);
-    }
-
-    if (state.visitor.anonymousId && !visitorData.isAuthenticated) {
-      state.visitor.unauthenticate();
-    } else if (!state.visitor.anonymousId && visitorData.isAuthenticated) {
-      state.visitor.authenticate(visitorData.id || uuidV4());
-    }
-
-    if (visitorData.id) {
-      state.visitor.visitorId = visitorData.id;
-    }
-
-    state.visitor.fetchFlags();
-  };
-
   function initializeState(param) {
     const newStatus = {
       isSdkReady: param.isSdkReady,
@@ -132,7 +105,7 @@ export const FlagshipProvider = ({
 
   const onVisitorReady = (fsVisitor, error) => {
     if (error) {
-      logError(Flagship.getConfig(), error.message || error, 'onReady');
+      logError(Flagship.getConfig(), error.message || error, "onReady");
       return;
     }
 
@@ -151,6 +124,37 @@ export const FlagshipProvider = ({
     }
   };
 
+  const createVisitor = (fetchFlags = false) => {
+    if (!visitorData) {
+      return;
+    }
+
+    const fsVisitor = Flagship.newVisitor({
+      visitorId: visitorData.id,
+      context: visitorData.context,
+      isAuthenticated: visitorData.isAuthenticated,
+      hasConsented: visitorData.hasConsented,
+      initialCampaigns,
+      initialModifications,
+      initialFlagsData
+    });
+    fsVisitor === null || fsVisitor === void 0 ? void 0 : fsVisitor.on("ready", error => {
+      onVisitorReady(fsVisitor, error);
+    });
+
+    if (!fetchNow && fsVisitor && !fetchFlags) {
+      initializeState({
+        fsVisitor,
+        isSdkReady: true,
+        isLoading: false
+      });
+    }
+
+    if (fetchFlags && !fetchNow) {
+      fsVisitor === null || fsVisitor === void 0 ? void 0 : fsVisitor.fetchFlags();
+    }
+  };
+
   const statusChanged = status => {
     if (statusChangedCallback) {
       statusChangedCallback(status);
@@ -158,39 +162,15 @@ export const FlagshipProvider = ({
 
     if (status === FlagshipStatus.STARTING && onInitStart) {
       onInitStart();
-    } else if (status === FlagshipStatus.READY_PANIC_ON || status === FlagshipStatus.READY) {
-      var _stateRef$current;
+      return;
+    }
 
+    if (status === FlagshipStatus.READY_PANIC_ON || status === FlagshipStatus.READY) {
       if (onInitDone) {
         onInitDone();
       }
 
-      if ((_stateRef$current = stateRef.current) !== null && _stateRef$current !== void 0 && _stateRef$current.visitor) {
-        var _stateRef$current2;
-
-        (_stateRef$current2 = stateRef.current) === null || _stateRef$current2 === void 0 ? void 0 : _stateRef$current2.visitor.fetchFlags();
-      } else {
-        const fsVisitor = Flagship.newVisitor({
-          visitorId: visitorData.id,
-          context: visitorData.context,
-          isAuthenticated: visitorData.isAuthenticated,
-          hasConsented: visitorData.hasConsented,
-          initialCampaigns,
-          initialModifications,
-          initialFlagsData
-        });
-        fsVisitor === null || fsVisitor === void 0 ? void 0 : fsVisitor.on('ready', error => {
-          onVisitorReady(fsVisitor, error);
-        });
-
-        if (!fetchNow && fsVisitor) {
-          initializeState({
-            fsVisitor,
-            isSdkReady: true,
-            isLoading: false
-          });
-        }
-      }
+      createVisitor();
     }
   };
 
@@ -221,7 +201,8 @@ export const FlagshipProvider = ({
       hitDeduplicationTime,
       visitorCacheImplementation,
       hitCacheImplementation,
-      disableCache
+      disableCache,
+      language: 1
     });
   };
 

package/dist/es/FlagshipHooks.js

@@ -141,19 +141,6 @@ export const useFsModificationInfo = key => {
   });
 };
 
-const fsSynchronizeModifications = async (functionName, visitor, config) => {
-  try {
-    if (!visitor) {
-      reportNoVisitor(config, functionName);
-      return;
-    }
-
-    await visitor.synchronizeModifications(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } catch (error) {
-    logError(config, error.message || error, functionName);
-  }
-};
-
 const fsActivate = async (params, functionName, visitor, config) => {
   try {
     if (!visitor) {
@@ -303,8 +290,12 @@ export const useFlagship = () => {
   };
 
   const synchronizeModifications = async () => {
-    const functionName = 'synchronizeModifications';
-    await fsSynchronizeModifications(functionName, visitor, config);
+    if (!visitor) {
+      logWarn(config, noVisitorMessage, 'synchronizeModifications');
+      return;
+    }
+
+    await visitor.synchronizeModifications();
   };
 
   const getModifications = (params, activateAll) => {
@@ -341,7 +332,7 @@ export const useFlagship = () => {
       return Promise.resolve();
     }
 
-    return visitor === null || visitor === void 0 ? void 0 : visitor.fetchFlags();
+    return visitor.fetchFlags();
   }
 
   function setConsent(hasConsented) {
@@ -378,8 +369,4 @@ export const useFlagship = () => {
     getFlag,
     fetchFlags
   };
-};
-
-const reportNoVisitor = (config, tag) => {
-  logError(config, noVisitorMessage, tag);
 };

package/dist/es/constants.js

@@ -1,2 +1,2 @@
-export const noVisitorMessage = 'sdk not correctly initialized... Make sure fsVisitor is ready.';
+export const noVisitorMessage = 'flagship Visitor not initialized.';
 export const noVisitorDefault = 'fsVisitor not initialized, returns default value';

package/dist/es/utils.js

@@ -1,4 +1,5 @@
 import { LogLevel } from '@flagship.io/js-sdk';
+import { useEffect, useRef } from 'react';
 export function logError(config, message, tag) {
   if (!config || !config.logManager || typeof config.logManager.error !== 'function' || !config.logLevel || config.logLevel < LogLevel.ERROR) {
     return;
@@ -60,4 +61,17 @@ export function uuidV4() {
     const value = char === 'x' ? rand : rand & 0x3 | 0x8;
     return value.toString(16);
   });
+}
+export function useNonInitialEffect(effect, deps) {
+  const initialRender = useRef(true);
+  useEffect(() => {
+    if (initialRender.current) {
+      initialRender.current = false;
+      return;
+    }
+
+    if (typeof effect === 'function') {
+      return effect();
+    }
+  }, deps);
 }

package/dist/esm/Flag.js

@@ -15,32 +15,32 @@ export var Flag = /*#__PURE__*/function () {
 
     _defineProperty(this, "_defaultValue", void 0);
 
-    log(LogLevel.ERROR, noVisitorMessage, 'GetFlag');
+    log(LogLevel.WARNING, noVisitorMessage, 'GetFlag');
     this._defaultValue = defaultValue;
   }
 
   _createClass(Flag, [{
     key: "getValue",
     value: function getValue() {
-      log(LogLevel.ERROR, noVisitorMessage, 'exists');
+      log(LogLevel.WARNING, noVisitorMessage, 'getValue');
       return this._defaultValue;
     }
   }, {
     key: "exists",
     value: function exists() {
-      log(LogLevel.ERROR, noVisitorMessage, 'exists');
+      log(LogLevel.WARNING, noVisitorMessage, 'exists');
       return false;
     }
   }, {
     key: "userExposed",
     value: function userExposed() {
-      log(LogLevel.ERROR, noVisitorMessage, 'userExposed');
+      log(LogLevel.WARNING, noVisitorMessage, 'userExposed');
       return Promise.resolve();
     }
   }, {
     key: "metadata",
     get: function get() {
-      log(LogLevel.ERROR, noVisitorMessage, 'metadata');
+      log(LogLevel.WARNING, noVisitorMessage, 'metadata');
       return new FlagMetadata({
         campaignId: '',
         campaignType: '',

package/dist/esm/FlagshipContext.js

@@ -17,9 +17,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 // eslint-disable-next-line no-use-before-define
-import React, { useState, useEffect, createContext, useRef } from 'react';
-import { Flagship, FlagshipStatus } from '@flagship.io/js-sdk';
-import { getModificationsFromCampaigns, logError, uuidV4 } from './utils';
+import React, { useState, useEffect, createContext, useRef } from "react";
+import { Flagship, FlagshipStatus } from "@flagship.io/js-sdk";
+import { getModificationsFromCampaigns, logError, useNonInitialEffect } from "./utils";
 var initStat = {
   status: {
     isLoading: true,
@@ -88,47 +88,20 @@ export var FlagshipProvider = function FlagshipProvider(_ref) {
 
   var stateRef = useRef();
   stateRef.current = state;
-  useEffect(function () {
+  useNonInitialEffect(function () {
     if (synchronizeOnBucketingUpdated) {
       var _state$visitor;
 
       (_state$visitor = state.visitor) === null || _state$visitor === void 0 ? void 0 : _state$visitor.fetchFlags();
     }
   }, [lastModified]);
-  useEffect(function () {
-    updateVisitor();
+  useNonInitialEffect(function () {
+    createVisitor(true);
   }, [JSON.stringify(visitorData)]);
   useEffect(function () {
     initSdk();
   }, [envId, apiKey, decisionMode]);
 
-  var updateVisitor = function updateVisitor() {
-    if (!state.visitor) {
-      return;
-    }
-
-    if (visitorData.context) {
-      state.visitor.clearContext();
-      state.visitor.updateContext(visitorData.context);
-    }
-
-    if (typeof visitorData.hasConsented === 'boolean') {
-      state.visitor.setConsent(visitorData.hasConsented);
-    }
-
-    if (state.visitor.anonymousId && !visitorData.isAuthenticated) {
-      state.visitor.unauthenticate();
-    } else if (!state.visitor.anonymousId && visitorData.isAuthenticated) {
-      state.visitor.authenticate(visitorData.id || uuidV4());
-    }
-
-    if (visitorData.id) {
-      state.visitor.visitorId = visitorData.id;
-    }
-
-    state.visitor.fetchFlags();
-  };
-
   function initializeState(param) {
     var newStatus = {
       isSdkReady: param.isSdkReady,
@@ -154,7 +127,7 @@ export var FlagshipProvider = function FlagshipProvider(_ref) {
 
   var onVisitorReady = function onVisitorReady(fsVisitor, error) {
     if (error) {
-      logError(Flagship.getConfig(), error.message || error, 'onReady');
+      logError(Flagship.getConfig(), error.message || error, "onReady");
       return;
     }
 
@@ -173,6 +146,39 @@ export var FlagshipProvider = function FlagshipProvider(_ref) {
     }
   };
 
+  var createVisitor = function createVisitor() {
+    var fetchFlags = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
+    if (!visitorData) {
+      return;
+    }
+
+    var fsVisitor = Flagship.newVisitor({
+      visitorId: visitorData.id,
+      context: visitorData.context,
+      isAuthenticated: visitorData.isAuthenticated,
+      hasConsented: visitorData.hasConsented,
+      initialCampaigns: initialCampaigns,
+      initialModifications: initialModifications,
+      initialFlagsData: initialFlagsData
+    });
+    fsVisitor === null || fsVisitor === void 0 ? void 0 : fsVisitor.on("ready", function (error) {
+      onVisitorReady(fsVisitor, error);
+    });
+
+    if (!fetchNow && fsVisitor && !fetchFlags) {
+      initializeState({
+        fsVisitor: fsVisitor,
+        isSdkReady: true,
+        isLoading: false
+      });
+    }
+
+    if (fetchFlags && !fetchNow) {
+      fsVisitor === null || fsVisitor === void 0 ? void 0 : fsVisitor.fetchFlags();
+    }
+  };
+
   var statusChanged = function statusChanged(status) {
     if (statusChangedCallback) {
       statusChangedCallback(status);
@@ -180,39 +186,15 @@ export var FlagshipProvider = function FlagshipProvider(_ref) {
 
     if (status === FlagshipStatus.STARTING && onInitStart) {
       onInitStart();
-    } else if (status === FlagshipStatus.READY_PANIC_ON || status === FlagshipStatus.READY) {
-      var _stateRef$current;
+      return;
+    }
 
+    if (status === FlagshipStatus.READY_PANIC_ON || status === FlagshipStatus.READY) {
       if (onInitDone) {
         onInitDone();
       }
 
-      if ((_stateRef$current = stateRef.current) !== null && _stateRef$current !== void 0 && _stateRef$current.visitor) {
-        var _stateRef$current2;
-
-        (_stateRef$current2 = stateRef.current) === null || _stateRef$current2 === void 0 ? void 0 : _stateRef$current2.visitor.fetchFlags();
-      } else {
-        var fsVisitor = Flagship.newVisitor({
-          visitorId: visitorData.id,
-          context: visitorData.context,
-          isAuthenticated: visitorData.isAuthenticated,
-          hasConsented: visitorData.hasConsented,
-          initialCampaigns: initialCampaigns,
-          initialModifications: initialModifications,
-          initialFlagsData: initialFlagsData
-        });
-        fsVisitor === null || fsVisitor === void 0 ? void 0 : fsVisitor.on('ready', function (error) {
-          onVisitorReady(fsVisitor, error);
-        });
-
-        if (!fetchNow && fsVisitor) {
-          initializeState({
-            fsVisitor: fsVisitor,
-            isSdkReady: true,
-            isLoading: false
-          });
-        }
-      }
+      createVisitor();
     }
   };
 
@@ -243,7 +225,8 @@ export var FlagshipProvider = function FlagshipProvider(_ref) {
       hitDeduplicationTime: hitDeduplicationTime,
       visitorCacheImplementation: visitorCacheImplementation,
       hitCacheImplementation: hitCacheImplementation,
-      disableCache: disableCache
+      disableCache: disableCache,
+      language: 1
     });
   };