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

package/dist/index.js

@@ -460,7 +460,7 @@ var DebugDialog = ({ publisherId, productId, environmentType, environmentIdentif
       dialogContentProps: dialogContentProps2,
       modalProps: modalProps2
     },
-    /* @__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(
+    /* @__PURE__ */ React3.createElement("p", { style: { display: "flex", flexDirection: "column" } }, /* @__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),
@@ -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;
@@ -534,6 +534,16 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
   const resolvedEnvironmentIdentifierRef = React4.useRef(null);
   const runValidation = React4.useCallback(() => __async(null, null, function* () {
     try {
+      if (resolvedEnvironmentIdentifierRef.current === null) {
+        resolvedEnvironmentIdentifierRef.current = isWebApi(environmentIdentifier) ? yield fetchOrganizationIdFromWebApi(environmentIdentifier) : environmentIdentifier == null ? void 0 : environmentIdentifier.replace("{", "").replace("}", "").toLowerCase();
+      }
+      if (!resolvedEnvironmentIdentifierRef.current) {
+        return {
+          isValid: false,
+          isTerminalError: true,
+          reason: `Failed to determine current environment identifier!`
+        };
+      }
       if (!productId) {
         return {
           isValid: false,
@@ -566,16 +576,6 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         };
       }
       const licenseRecord = licenses[0];
-      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,
@@ -641,12 +641,44 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
     }
     return "";
   }, [offlineDataProvider]);
+  const prevDeps = React4.useRef({
+    dataProvider,
+    dataProviderState,
+    dataProviderSignature,
+    initLicenseValidation,
+    licenseDispatch,
+    usagePermission,
+    offlineDataProvider,
+    offlineDataProviderState,
+    offlineDataProviderSignature
+  });
   React4.useEffect(() => {
     console.log(`Starting license evaluation at ${(/* @__PURE__ */ new Date()).toISOString()}`);
     console.log(`DataProvider state: ${dataProviderState}`);
     console.log(`DataProvider signature: ${dataProviderSignature}`);
     console.log(`Offline DataProvider state: ${offlineDataProviderState}`);
     console.log(`Offline DataProvider signature: ${offlineDataProviderSignature}`);
+    const prev = prevDeps.current;
+    if (prev.dataProvider !== dataProvider) console.log("dataProvider changed");
+    if (prev.dataProviderState !== dataProviderState) console.log("dataProviderState changed");
+    if (prev.dataProviderSignature !== dataProviderSignature) console.log("dataProviderSignature changed");
+    if (prev.initLicenseValidation !== initLicenseValidation) console.log("initLicenseValidation changed");
+    if (prev.licenseDispatch !== licenseDispatch) console.log("licenseDispatch changed");
+    if (prev.usagePermission !== usagePermission) console.log("usagePermission changed");
+    if (prev.offlineDataProvider !== offlineDataProvider) console.log("offlineDataProvider changed");
+    if (prev.offlineDataProviderState !== offlineDataProviderState) console.log("offlineDataProviderState changed");
+    if (prev.offlineDataProviderSignature !== offlineDataProviderSignature) console.log("offlineDataProviderSignature changed");
+    prevDeps.current = {
+      dataProvider,
+      dataProviderState,
+      dataProviderSignature,
+      initLicenseValidation,
+      licenseDispatch,
+      usagePermission,
+      offlineDataProvider,
+      offlineDataProviderState,
+      offlineDataProviderSignature
+    };
     if (usagePermission != null && !usagePermission) {
       const result = {
         isValid: false,

package/package.json

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