@zwave-js/cc 15.23.3 → 15.24.0

package/build/cjs/cc/UserCredentialCC.js

@@ -1571,7 +1571,16 @@ let UserCredentialCCUserGet = (() => {
   return UserCredentialCCUserGet2 = _classThis;
 })();
 function testResponseForUserCredentialCredentialSet(sent, received) {
-  return received.reportType !== import_Types.UserCredentialCredentialReportType.ResponseToGet && received.credentialType === sent.credentialType && received.credentialSlot === sent.credentialSlot;
+  if (received.reportType === import_Types.UserCredentialCredentialReportType.ResponseToGet) {
+    return false;
+  }
+  if (received.credentialType !== sent.credentialType) {
+    return false;
+  }
+  if (received.reportType === import_Types.UserCredentialCredentialReportType.DuplicateCredential || received.reportType === import_Types.UserCredentialCredentialReportType.DuplicateAdminPINCode) {
+    return true;
+  }
+  return received.credentialSlot === sent.credentialSlot;
 }
 __name(testResponseForUserCredentialCredentialSet, "testResponseForUserCredentialCredentialSet");
 let UserCredentialCCCredentialSet = (() => {
@@ -1785,14 +1794,33 @@ let UserCredentialCCCredentialReport = (() => {
     persistValues(ctx) {
       if (!super.persistValues(ctx))
         return false;
-      if (this.credentialType === import_Types.UserCredentialType.None || this.credentialSlot === 0) {
+      if (this.reportType === import_Types.UserCredentialCredentialReportType.CredentialDeleted || this.reportType === import_Types.UserCredentialCredentialReportType.CredentialModifyRejectedLocationEmpty) {
+        if (this.credentialType !== import_Types.UserCredentialType.None && this.credentialSlot !== 0) {
+          this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credential(this.credentialType, this.credentialSlot));
+          this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialOwner(this.credentialType, this.credentialSlot));
+          this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierType(this.credentialType, this.credentialSlot));
+          this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierNodeId(this.credentialType, this.credentialSlot));
+        } else {
+          const valueDB = this.getValueDB(ctx);
+          const credentialOwners = valueDB.findValues((vid) => import_CCValues_generated.UserCredentialCCValues.credentialOwner.is(vid) && vid.endpoint === this.endpointIndex);
+          for (const { endpoint, propertyKey, value } of credentialOwners) {
+            if (this.userId !== 0 && value !== this.userId)
+              continue;
+            const key = propertyKey;
+            const cType = key >>> 16;
+            const cSlot = key & 65535;
+            if (this.credentialType !== import_Types.UserCredentialType.None && cType !== this.credentialType) {
+              continue;
+            }
+            valueDB.removeValue(import_CCValues_generated.UserCredentialCCValues.credential(cType, cSlot).endpoint(endpoint));
+            valueDB.removeValue(import_CCValues_generated.UserCredentialCCValues.credentialOwner(cType, cSlot).endpoint(endpoint));
+            valueDB.removeValue(import_CCValues_generated.UserCredentialCCValues.credentialModifierType(cType, cSlot).endpoint(endpoint));
+            valueDB.removeValue(import_CCValues_generated.UserCredentialCCValues.credentialModifierNodeId(cType, cSlot).endpoint(endpoint));
+          }
+        }
         return true;
       }
-      if (this.reportType === import_Types.UserCredentialCredentialReportType.CredentialDeleted || this.reportType === import_Types.UserCredentialCredentialReportType.CredentialModifyRejectedLocationEmpty) {
-        this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credential(this.credentialType, this.credentialSlot));
-        this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialOwner(this.credentialType, this.credentialSlot));
-        this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierType(this.credentialType, this.credentialSlot));
-        this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierNodeId(this.credentialType, this.credentialSlot));
+      if (this.credentialType === import_Types.UserCredentialType.None || this.credentialSlot === 0) {
         return true;
       }
       const isRejectionWithReadback = this.reportType === import_Types.UserCredentialCredentialReportType.CredentialAddRejectedLocationOccupied && this.credentialReadBack;