@ianua/ianus-dataverse-react-fluentui8 1.0.11 → 1.0.13

package/dist/index.js

@@ -516,7 +516,7 @@ var fetchOrganizationIdFromWebApi = (webApi) => __async(null, null, function* ()
     return null;
   }
   const organization = results.entities[0];
-  return organization.organizationid;
+  return organization.organizationid.replace("{", "").replace("}", "").toLowerCase();
 });
 var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environmentIdentifier, dataProvider, offlineDataProvider, usagePermission, onLicenseValidated, children }) => {
   var _a, _b, _c, _d, _e;
@@ -532,10 +532,24 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
     }
   }, [publicKeys]);
   const resolvedEnvironmentIdentifierRef = React4.useRef(null);
+  const preventAutomaticReevaluation = React4.useRef(false);
+  const handleValidationResult = React4.useCallback((result) => {
+    var _a2;
+    preventAutomaticReevaluation.current = (_a2 = result == null ? void 0 : result.isValid) != null ? _a2 : false;
+    if (onLicenseValidatedRef.current) {
+      try {
+        onLicenseValidatedRef.current(result);
+      } catch (e) {
+        if (e && e instanceof Error) {
+          console.error(`Error while calling onLicenseValidated: '${e.message}'`);
+        }
+      }
+    }
+  }, []);
   const runValidation = React4.useCallback(() => __async(null, null, function* () {
     try {
       if (resolvedEnvironmentIdentifierRef.current === null) {
-        resolvedEnvironmentIdentifierRef.current = isWebApi(environmentIdentifier) ? yield fetchOrganizationIdFromWebApi(environmentIdentifier) : environmentIdentifier;
+        resolvedEnvironmentIdentifierRef.current = isWebApi(environmentIdentifier) ? yield fetchOrganizationIdFromWebApi(environmentIdentifier) : environmentIdentifier == null ? void 0 : environmentIdentifier.replace("{", "").replace("}", "").toLowerCase();
       }
       if (!resolvedEnvironmentIdentifierRef.current) {
         return {
@@ -592,17 +606,9 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
   const initLicenseValidation = React4.useCallback(() => __async(null, null, function* () {
     const result = yield runValidation();
     licenseDispatch({ type: "setLicense", payload: result });
-    if (onLicenseValidatedRef.current) {
-      try {
-        onLicenseValidatedRef.current(result);
-      } catch (e) {
-        if (e && e instanceof Error) {
-          console.error(`Error while calling onLicenseValidated: '${e.message}'`);
-        }
-      }
-    }
-  }), [licenseDispatch, runValidation]);
-  const onSettingsFinally = React4.useCallback(() => {
+    handleValidationResult(result);
+  }), [licenseDispatch, runValidation, handleValidationResult]);
+  const onLicenseDialogFinally = React4.useCallback(() => {
     licenseDispatch({ type: "setLicenseDialogVisible", payload: false });
     initLicenseValidation();
   }, [initLicenseValidation, licenseDispatch]);
@@ -641,7 +647,19 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
     }
     return "";
   }, [offlineDataProvider]);
+  const canResetAutomaticReevaluation = React4.useMemo(() => {
+    return isDataset(dataProvider) || offlineDataProvider != null;
+  }, [dataProvider, offlineDataProvider]);
+  React4.useEffect(() => {
+    if (canResetAutomaticReevaluation) {
+      preventAutomaticReevaluation.current = false;
+    }
+  }, [canResetAutomaticReevaluation, dataProviderSignature, offlineDataProviderSignature]);
   React4.useEffect(() => {
+    if (preventAutomaticReevaluation.current) {
+      console.log(`Skipping license evaluation as checks have already passed at ${(/* @__PURE__ */ new Date()).toISOString()}`);
+      return;
+    }
     console.log(`Starting license evaluation at ${(/* @__PURE__ */ new Date()).toISOString()}`);
     console.log(`DataProvider state: ${dataProviderState}`);
     console.log(`DataProvider signature: ${dataProviderSignature}`);
@@ -654,15 +672,7 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         reason: "Your user is not enabled for using this product"
       };
       licenseDispatch({ type: "setLicense", payload: result });
-      if (onLicenseValidatedRef.current) {
-        try {
-          onLicenseValidatedRef.current(result);
-        } catch (e) {
-          if (e && e instanceof Error) {
-            console.error(`Error while calling onLicenseValidated: '${e.message}'`);
-          }
-        }
-      }
+      handleValidationResult(result);
     } else if (!isDataset(dataProvider) || !dataProvider.error && !dataProvider.loading && dataProvider.paging.totalResultCount >= 0 || offlineDataProvider != null && !offlineDataProvider.error && !offlineDataProvider.loading && offlineDataProvider.paging.totalResultCount >= 0) {
       initLicenseValidation();
     } else if (dataProvider.error) {
@@ -672,18 +682,10 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         reason: `Dataset error: ${dataProvider.errorMessage}`
       };
       licenseDispatch({ type: "setLicense", payload: result });
-      if (onLicenseValidatedRef.current) {
-        try {
-          onLicenseValidatedRef.current(result);
-        } catch (e) {
-          if (e && e instanceof Error) {
-            console.error(`Error while calling onLicenseValidated: '${e.message}'`);
-          }
-        }
-      }
+      handleValidationResult(result);
     }
-  }, [dataProvider, dataProviderState, dataProviderSignature, initLicenseValidation, licenseDispatch, usagePermission, offlineDataProvider, offlineDataProviderState, offlineDataProviderSignature]);
-  return ((_a = licenseState.license) == null ? void 0 : _a.isValid) ? /* @__PURE__ */ React4.createElement(React4.Fragment, null, licenseState.licenseDialogVisible && /* @__PURE__ */ React4.createElement(LicenseDialog, { publisherId, productId, dataProvider, offlineDataProvider, onSubmit: onSettingsFinally, onCancel: onSettingsFinally }), children) : /* @__PURE__ */ React4.createElement("div", { style: { display: "flex", width: "100%", height: "100%", flex: "1" } }, licenseState.licenseDialogVisible && /* @__PURE__ */ React4.createElement(LicenseDialog, { publisherId, productId, dataProvider, offlineDataProvider, onSubmit: onSettingsFinally, onCancel: onSettingsFinally }), licenseState.debugDialogVisible && /* @__PURE__ */ React4.createElement(DebugDialog, { publisherId, productId, environmentType, environmentIdentifier: resolvedEnvironmentIdentifierRef.current || "", dataProvider, offlineDataProvider, onDismiss: onDebugFinally }), /* @__PURE__ */ React4.createElement("div", { style: { display: "flex", flexDirection: "column", alignItems: "center", justifyContent: "center", flex: 1 } }, ((_b = licenseState.license) == null ? void 0 : _b.isValid) === false && /* @__PURE__ */ React4.createElement(
+  }, [dataProvider, dataProviderState, dataProviderSignature, initLicenseValidation, licenseDispatch, usagePermission, offlineDataProvider, offlineDataProviderState, offlineDataProviderSignature, handleValidationResult]);
+  return ((_a = licenseState.license) == null ? void 0 : _a.isValid) ? /* @__PURE__ */ React4.createElement(React4.Fragment, null, licenseState.licenseDialogVisible && /* @__PURE__ */ React4.createElement(LicenseDialog, { publisherId, productId, dataProvider, offlineDataProvider, onSubmit: onLicenseDialogFinally, onCancel: onLicenseDialogFinally }), children) : /* @__PURE__ */ React4.createElement("div", { style: { display: "flex", width: "100%", height: "100%", flex: "1" } }, licenseState.licenseDialogVisible && /* @__PURE__ */ React4.createElement(LicenseDialog, { publisherId, productId, dataProvider, offlineDataProvider, onSubmit: onLicenseDialogFinally, onCancel: onLicenseDialogFinally }), licenseState.debugDialogVisible && /* @__PURE__ */ React4.createElement(DebugDialog, { publisherId, productId, environmentType, environmentIdentifier: resolvedEnvironmentIdentifierRef.current || "", dataProvider, offlineDataProvider, onDismiss: onDebugFinally }), /* @__PURE__ */ React4.createElement("div", { style: { display: "flex", flexDirection: "column", alignItems: "center", justifyContent: "center", flex: 1 } }, ((_b = licenseState.license) == null ? void 0 : _b.isValid) === false && /* @__PURE__ */ React4.createElement(
     import_MessageBar.MessageBar,
     {
       messageBarType: import_MessageBar.MessageBarType.error,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ianua/ianus-dataverse-react-fluentui8",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Client-side validation for Ianus Guard licenses in Dataverse using react and FluentUi v8",
   "scripts": {
     "build": "tsup"