@ianua/ianus-dataverse-react-fluentui8 1.0.9 → 1.0.10

package/dist/index.js

@@ -432,7 +432,7 @@ var dialogContentProps2 = {
   type: import_react2.DialogType.largeHeader,
   title: "Debug"
 };
-var DebugDialog = ({ publisherId, productId, dataProvider, offlineDataProvider, onDismiss }) => {
+var DebugDialog = ({ publisherId, productId, environmentType, environmentIdentifier, dataProvider, offlineDataProvider, onDismiss }) => {
   const [licenseState, licenseDispatch] = useLicenseContext();
   const licenseColumns = [
     { key: "id", name: "Id", fieldName: "ian_licenseid", minWidth: 100, maxWidth: 200, isResizable: true },
@@ -460,7 +460,7 @@ var DebugDialog = ({ publisherId, productId, dataProvider, offlineDataProvider,
       dialogContentProps: dialogContentProps2,
       modalProps: modalProps2
     },
-    /* @__PURE__ */ React3.createElement("p", null, /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Target license identifier:"), " ", publisherId, "_", productId), /* @__PURE__ */ React3.createElement("br", null), /* @__PURE__ */ React3.createElement("br", null), isDataset(dataProvider) && /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Licenses in data provider:"), " ", dataProvider.sortedRecordIds.length), /* @__PURE__ */ React3.createElement("br", null), /* @__PURE__ */ React3.createElement(
+    /* @__PURE__ */ React3.createElement("p", null, /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Current environment type:"), " ", environmentType), /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Current environment identifier:"), " ", environmentIdentifier), /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Target license identifier:"), " ", publisherId, "_", productId), /* @__PURE__ */ React3.createElement("br", null), /* @__PURE__ */ React3.createElement("br", null), isDataset(dataProvider) && /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Licenses in data provider:"), " ", dataProvider.sortedRecordIds.length), /* @__PURE__ */ React3.createElement("br", null), /* @__PURE__ */ React3.createElement(
       import_react2.DetailsList,
       {
         items: mapRecordsToItems(dataProvider),
@@ -510,17 +510,6 @@ var acquireLicenses = (publisherId, productId, dataProvider) => __async(null, nu
     throw new Error(`The 'dataProvider' prop must be either of type ComponentFramework.WebApi or ComponentFramework.PropertyTypes.Dataset. You passed '${typeof dataProvider}'.`);
   }
 });
-var updateResultIfDefined = (result, onLicenseValidated) => {
-  if (onLicenseValidated) {
-    try {
-      onLicenseValidated(result);
-    } catch (e) {
-      if (e && e instanceof Error) {
-        console.error(`Error while calling onLicenseValidated: '${e.message}'`);
-      }
-    }
-  }
-};
 var fetchOrganizationIdFromWebApi = (webApi) => __async(null, null, function* () {
   const results = yield webApi.retrieveMultipleRecords("organization", "?$top=1&$select=organizationid");
   if (!results.entities.length) {
@@ -532,6 +521,17 @@ var fetchOrganizationIdFromWebApi = (webApi) => __async(null, null, function* ()
 var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environmentIdentifier, dataProvider, offlineDataProvider, usagePermission, onLicenseValidated, children }) => {
   var _a, _b, _c, _d, _e;
   const [licenseState, licenseDispatch] = useLicenseContext();
+  const onLicenseValidatedRef = React4.useRef(onLicenseValidated);
+  React4.useEffect(() => {
+    onLicenseValidatedRef.current = onLicenseValidated;
+  }, [onLicenseValidated]);
+  const publicKeysRef = React4.useRef(publicKeys);
+  React4.useEffect(() => {
+    if (JSON.stringify(publicKeys) !== JSON.stringify(publicKeysRef.current)) {
+      publicKeysRef.current = publicKeys;
+    }
+  }, [publicKeys]);
+  const resolvedEnvironmentIdentifierRef = React4.useRef(null);
   const runValidation = React4.useCallback(() => __async(null, null, function* () {
     try {
       if (!productId) {
@@ -541,7 +541,7 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
           reason: "No productId found, pass a productId as prop!"
         };
       }
-      if (!publicKeys || !publicKeys.length) {
+      if (!publicKeysRef.current || !publicKeysRef.current.length) {
         return {
           isValid: false,
           isTerminalError: true,
@@ -566,8 +566,17 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         };
       }
       const licenseRecord = licenses[0];
-      const resolvedEnvironmentIdentifier = isWebApi(environmentIdentifier) ? yield fetchOrganizationIdFromWebApi(environmentIdentifier) : environmentIdentifier;
-      const validationResult = yield validateLicense(publisherId, productId, environmentType, resolvedEnvironmentIdentifier, publicKeys, licenseRecord.ian_key);
+      if (resolvedEnvironmentIdentifierRef.current === null) {
+        resolvedEnvironmentIdentifierRef.current = isWebApi(environmentIdentifier) ? yield fetchOrganizationIdFromWebApi(environmentIdentifier) : environmentIdentifier;
+      }
+      if (!resolvedEnvironmentIdentifierRef.current) {
+        return {
+          isValid: false,
+          isTerminalError: true,
+          reason: `Failed to determine current environment identifier!`
+        };
+      }
+      const validationResult = yield validateLicense(publisherId, productId, environmentType, resolvedEnvironmentIdentifierRef.current, publicKeysRef.current, licenseRecord.ian_key);
       return __spreadProps(__spreadValues({}, validationResult), {
         licenseId: licenseRecord.ian_licenseid,
         licenseKey: licenseRecord.ian_key
@@ -579,12 +588,20 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         reason: e == null ? void 0 : e.message
       };
     }
-  }), [dataProvider, environmentIdentifier, environmentType, offlineDataProvider, productId, publicKeys, publisherId]);
+  }), [dataProvider, environmentIdentifier, environmentType, offlineDataProvider, productId, publisherId]);
   const initLicenseValidation = React4.useCallback(() => __async(null, null, function* () {
     const result = yield runValidation();
     licenseDispatch({ type: "setLicense", payload: result });
-    updateResultIfDefined(result, onLicenseValidated);
-  }), [licenseDispatch, onLicenseValidated, runValidation]);
+    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(() => {
     licenseDispatch({ type: "setLicenseDialogVisible", payload: false });
     initLicenseValidation();
@@ -637,7 +654,15 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         reason: "Your user is not enabled for using this product"
       };
       licenseDispatch({ type: "setLicense", payload: result });
-      updateResultIfDefined(result, onLicenseValidated);
+      if (onLicenseValidatedRef.current) {
+        try {
+          onLicenseValidatedRef.current(result);
+        } catch (e) {
+          if (e && e instanceof Error) {
+            console.error(`Error while calling onLicenseValidated: '${e.message}'`);
+          }
+        }
+      }
     } 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) {
@@ -647,10 +672,18 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         reason: `Dataset error: ${dataProvider.errorMessage}`
       };
       licenseDispatch({ type: "setLicense", payload: result });
-      updateResultIfDefined(result, onLicenseValidated);
+      if (onLicenseValidatedRef.current) {
+        try {
+          onLicenseValidatedRef.current(result);
+        } catch (e) {
+          if (e && e instanceof Error) {
+            console.error(`Error while calling onLicenseValidated: '${e.message}'`);
+          }
+        }
+      }
     }
-  }, [dataProvider, dataProviderState, dataProviderSignature, initLicenseValidation, licenseDispatch, usagePermission, onLicenseValidated, 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, 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]);
+  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(
     import_MessageBar.MessageBar,
     {
       messageBarType: import_MessageBar.MessageBarType.error,

package/package.json

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