@zwave-js/cc 15.23.1 → 15.23.5

package/build/cjs/cc/UserCredentialCC.js

@@ -36,6 +36,8 @@ __export(UserCredentialCC_exports, {
   UserCredentialCCAdminPinCodeSet: () => UserCredentialCCAdminPinCodeSet,
   UserCredentialCCAllUsersChecksumGet: () => UserCredentialCCAllUsersChecksumGet,
   UserCredentialCCAllUsersChecksumReport: () => UserCredentialCCAllUsersChecksumReport,
+  UserCredentialCCAssociationReport: () => UserCredentialCCAssociationReport,
+  UserCredentialCCAssociationSet: () => UserCredentialCCAssociationSet,
   UserCredentialCCCredentialCapabilitiesGet: () => UserCredentialCCCredentialCapabilitiesGet,
   UserCredentialCCCredentialCapabilitiesReport: () => UserCredentialCCCredentialCapabilitiesReport,
   UserCredentialCCCredentialChecksumGet: () => UserCredentialCCCredentialChecksumGet,
@@ -55,12 +57,11 @@ __export(UserCredentialCC_exports, {
   UserCredentialCCUserCapabilitiesReport: () => UserCredentialCCUserCapabilitiesReport,
   UserCredentialCCUserChecksumGet: () => UserCredentialCCUserChecksumGet,
   UserCredentialCCUserChecksumReport: () => UserCredentialCCUserChecksumReport,
-  UserCredentialCCUserCredentialAssociationReport: () => UserCredentialCCUserCredentialAssociationReport,
-  UserCredentialCCUserCredentialAssociationSet: () => UserCredentialCCUserCredentialAssociationSet,
   UserCredentialCCUserGet: () => UserCredentialCCUserGet,
   UserCredentialCCUserReport: () => UserCredentialCCUserReport,
   UserCredentialCCUserSet: () => UserCredentialCCUserSet,
-  UserCredentialCCValues: () => import_CCValues_generated.UserCredentialCCValues
+  UserCredentialCCValues: () => import_CCValues_generated.UserCredentialCCValues,
+  normalizeCredentialData: () => normalizeCredentialData
 });
 module.exports = __toCommonJS(UserCredentialCC_exports);
 var import_tslib = require("tslib");
@@ -79,6 +80,13 @@ function credentialToLogString(credential) {
   return "*".repeat(credential.length);
 }
 __name(credentialToLogString, "credentialToLogString");
+function normalizeCredentialData(credentialType, credentialData) {
+  if (credentialType === import_Types.UserCredentialType.PINCode || credentialType === import_Types.UserCredentialType.Password) {
+    return credentialData.toString("utf8");
+  }
+  return credentialData;
+}
+__name(normalizeCredentialData, "normalizeCredentialData");
 let UserCredentialCCAPI = (() => {
   let _classDecorators = [(0, import_CommandClassDecorators.API)(import_core.CommandClasses["User Credential"])];
   let _classDescriptor;
@@ -264,6 +272,10 @@ let UserCredentialCCAPI = (() => {
       return response?.keyLockerCapabilities;
     }
     // User Management
+    /**
+     * Applications should not use this method directly. Prefer the
+     * `endpoint.accessControl` API for managing users.
+     */
     async setUser(options) {
       this.assertSupportsCommand(import_Types.UserCredentialCommand, import_Types.UserCredentialCommand.UserSet);
       const cc = new UserCredentialCCUserSet({
@@ -273,6 +285,10 @@ let UserCredentialCCAPI = (() => {
       });
       return this.host.sendCommand(cc, this.commandOptions);
     }
+    /**
+     * Applications should not use this method directly. Prefer the
+     * `endpoint.accessControl` API for querying users.
+     */
     async getUser(userId) {
       this.assertSupportsCommand(import_Types.UserCredentialCommand, import_Types.UserCredentialCommand.UserGet);
       const cc = new UserCredentialCCUserGet({
@@ -280,23 +296,13 @@ let UserCredentialCCAPI = (() => {
         endpointIndex: this.endpoint.index,
         userId
       });
-      const response = await this.host.sendCommand(cc, this.commandOptions);
-      if (response) {
-        return (0, import_shared.pick)(response, [
-          "nextUserId",
-          "modifierType",
-          "modifierNodeId",
-          "userId",
-          "userType",
-          "active",
-          "credentialRule",
-          "expiringTimeoutMinutes",
-          "nameEncoding",
-          "userName"
-        ]);
-      }
+      return this.host.sendCommand(cc, this.commandOptions);
     }
     // Credential Management
+    /**
+     * Applications should not use this method directly. Prefer the
+     * `endpoint.accessControl` API for managing credentials.
+     */
     async setCredential(options) {
       this.assertSupportsCommand(import_Types.UserCredentialCommand, import_Types.UserCredentialCommand.CredentialSet);
       const cc = new UserCredentialCCCredentialSet({
@@ -306,6 +312,10 @@ let UserCredentialCCAPI = (() => {
       });
       return this.host.sendCommand(cc, this.commandOptions);
     }
+    /**
+     * Applications should not use this method directly. Prefer the
+     * `endpoint.accessControl` API for querying credentials.
+     */
     async getCredential(userId, credentialType, credentialSlot) {
       this.assertSupportsCommand(import_Types.UserCredentialCommand, import_Types.UserCredentialCommand.CredentialGet);
       const cc = new UserCredentialCCCredentialGet({
@@ -315,24 +325,7 @@ let UserCredentialCCAPI = (() => {
         credentialType,
         credentialSlot
       });
-      const response = await this.host.sendCommand(cc, this.commandOptions);
-      if (response) {
-        return (0, import_shared.pick)(response, [
-          // UserId, credential type and slot can be zero in the
-          // request to return the first credential, so we cannot
-          // simply omit them here
-          "userId",
-          "credentialType",
-          "credentialSlot",
-          "credentialReadBack",
-          "credentialLength",
-          "credentialData",
-          "modifierType",
-          "modifierNodeId",
-          "nextCredentialType",
-          "nextCredentialSlot"
-        ]);
-      }
+      return this.host.sendCommand(cc, this.commandOptions);
     }
     async startCredentialLearn(options) {
       this.assertSupportsCommand(import_Types.UserCredentialCommand, import_Types.UserCredentialCommand.CredentialLearnStart);
@@ -355,9 +348,13 @@ let UserCredentialCCAPI = (() => {
       });
       return this.host.sendCommand(cc, this.commandOptions);
     }
+    /**
+     * Applications should not use this method directly. Prefer the
+     * `endpoint.accessControl` API for reassigning credentials between users.
+     */
     async setUserCredentialAssociation(options) {
       this.assertSupportsCommand(import_Types.UserCredentialCommand, import_Types.UserCredentialCommand.UserCredentialAssociationSet);
-      const cc = new UserCredentialCCUserCredentialAssociationSet({
+      const cc = new UserCredentialCCAssociationSet({
         nodeId: this.endpoint.nodeId,
         endpointIndex: this.endpoint.index,
         ...options
@@ -501,7 +498,7 @@ let UserCredentialCCAPI = (() => {
     }
     async sendUserCredentialAssociationReport(options) {
       this.assertSupportsCommand(import_Types.UserCredentialCommand, import_Types.UserCredentialCommand.UserCredentialAssociationReport);
-      const cc = new UserCredentialCCUserCredentialAssociationReport({
+      const cc = new UserCredentialCCAssociationReport({
         nodeId: this.endpoint.nodeId,
         endpointIndex: this.endpoint.index,
         ...options
@@ -686,7 +683,7 @@ let UserCredentialCC = (() => {
             }
           }
           previousUserId = currentUserId;
-          nextUserId = user.nextUserId;
+          nextUserId = user.nextUserId ?? 0;
         } while (nextUserId > 0);
       }
       if (allUsersChecksum != void 0) {
@@ -726,14 +723,17 @@ let UserCredentialCC = (() => {
       this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.userModifierNodeId(userId));
       this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.userChecksum(userId));
       const valueDB = this.getValueDB(ctx);
-      const credentialValues = valueDB.findValues((vid) => (import_CCValues_generated.UserCredentialCCValues.credential.is(vid) || import_CCValues_generated.UserCredentialCCValues.credentialModifierType.is(vid) || import_CCValues_generated.UserCredentialCCValues.credentialModifierNodeId.is(vid)) && vid.propertyKey >> 24 === userId);
-      for (const { commandClass: commandClass2, endpoint, property, propertyKey } of credentialValues) {
-        valueDB.removeValue({
-          commandClass: commandClass2,
-          endpoint,
-          property,
-          propertyKey
-        });
+      const credentialOwners = valueDB.findValues((vid) => import_CCValues_generated.UserCredentialCCValues.credentialOwner.is(vid) && vid.endpoint === this.endpointIndex);
+      for (const { endpoint, propertyKey, value } of credentialOwners) {
+        if (value !== userId)
+          continue;
+        const key = propertyKey;
+        const credentialType = key >>> 16;
+        const credentialSlot = key & 65535;
+        valueDB.removeValue(import_CCValues_generated.UserCredentialCCValues.credential(credentialType, credentialSlot).endpoint(endpoint));
+        valueDB.removeValue(import_CCValues_generated.UserCredentialCCValues.credentialOwner(credentialType, credentialSlot).endpoint(endpoint));
+        valueDB.removeValue(import_CCValues_generated.UserCredentialCCValues.credentialModifierType(credentialType, credentialSlot).endpoint(endpoint));
+        valueDB.removeValue(import_CCValues_generated.UserCredentialCCValues.credentialModifierNodeId(credentialType, credentialSlot).endpoint(endpoint));
       }
     }
     async queryCredentialsForUser(ctx, api, nodeId, userId) {
@@ -748,8 +748,8 @@ let UserCredentialCC = (() => {
         const cred = await api.getCredential(userId, nextCredType, nextCredSlot);
         if (!cred?.credentialSlot)
           break;
-        nextCredType = cred.nextCredentialType;
-        nextCredSlot = cred.nextCredentialSlot;
+        nextCredType = cred.nextCredentialType ?? import_Types.UserCredentialType.None;
+        nextCredSlot = cred.nextCredentialSlot ?? 0;
       } while (nextCredType !== import_Types.UserCredentialType.None || nextCredSlot !== 0);
     }
     static getSupportedUsersCached(ctx, endpoint) {
@@ -1180,8 +1180,12 @@ let UserCredentialCCKeyLockerCapabilitiesGet = (() => {
   };
   return UserCredentialCCKeyLockerCapabilitiesGet2 = _classThis;
 })();
+function testResponseForUserCredentialUserSet(sent, received) {
+  return received.reportType !== import_Types.UserCredentialUserReportType.ResponseToGet && received.userId === sent.userId;
+}
+__name(testResponseForUserCredentialUserSet, "testResponseForUserCredentialUserSet");
 let UserCredentialCCUserSet = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.UserCredentialCommand.UserSet), (0, import_CommandClassDecorators.useSupervision)()];
+  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.UserCredentialCommand.UserSet), (0, import_CommandClassDecorators.expectedCCResponse)(() => UserCredentialCCUserReport, testResponseForUserCredentialUserSet)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -1372,7 +1376,9 @@ let UserCredentialCCUserReport = (() => {
     constructor(options) {
       super(options);
       this.reportType = options.reportType;
-      this.nextUserId = options.nextUserId;
+      if (options.reportType === import_Types.UserCredentialUserReportType.ResponseToGet) {
+        this.nextUserId = options.nextUserId;
+      }
       this.modifierType = options.modifierType;
       this.modifierNodeId = options.modifierNodeId;
       this.userId = options.userId;
@@ -1404,10 +1410,8 @@ let UserCredentialCCUserReport = (() => {
       } else {
         userName = raw.payload.subarray(15, 15 + nameLength).toString("ascii");
       }
-      return new this({
+      const common = {
         nodeId: ctx.sourceNodeId,
-        reportType,
-        nextUserId,
         modifierType,
         modifierNodeId,
         userId,
@@ -1417,7 +1421,11 @@ let UserCredentialCCUserReport = (() => {
         expiringTimeoutMinutes,
         nameEncoding,
         userName
-      });
+      };
+      if (reportType === import_Types.UserCredentialUserReportType.ResponseToGet) {
+        return new this({ ...common, reportType, nextUserId });
+      }
+      return new this({ ...common, reportType });
     }
     reportType;
     nextUserId;
@@ -1439,7 +1447,7 @@ let UserCredentialCCUserReport = (() => {
       }
       this.payload = import_shared.Bytes.alloc(15 + nameBuffer.length);
       this.payload[0] = this.reportType;
-      this.payload.writeUInt16BE(this.nextUserId, 1);
+      this.payload.writeUInt16BE(this.nextUserId ?? 0, 1);
       this.payload[3] = this.modifierType;
       this.payload.writeUInt16BE(this.modifierNodeId, 4);
       this.payload.writeUInt16BE(this.userId, 6);
@@ -1459,7 +1467,7 @@ let UserCredentialCCUserReport = (() => {
         return false;
       if (this.userId === 0)
         return true;
-      if (this.reportType === import_Types.UserCredentialUserReportType.UserDeleted) {
+      if (this.reportType === import_Types.UserCredentialUserReportType.UserDeleted || this.reportType === import_Types.UserCredentialUserReportType.UserModifyRejectedLocationEmpty) {
         const userId2 = this.userId;
         this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.userType(userId2));
         this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.userActive(userId2));
@@ -1470,7 +1478,7 @@ let UserCredentialCCUserReport = (() => {
         this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.userModifierNodeId(userId2));
         return true;
       }
-      if (this.reportType !== import_Types.UserCredentialUserReportType.ResponseToGet && this.reportType !== import_Types.UserCredentialUserReportType.UserAdded && this.reportType !== import_Types.UserCredentialUserReportType.UserModified) {
+      if (this.reportType !== import_Types.UserCredentialUserReportType.ResponseToGet && this.reportType !== import_Types.UserCredentialUserReportType.UserAdded && this.reportType !== import_Types.UserCredentialUserReportType.UserModified && this.reportType !== import_Types.UserCredentialUserReportType.UserAddRejectedLocationOccupied) {
         return true;
       }
       const userId = this.userId;
@@ -1489,22 +1497,22 @@ let UserCredentialCCUserReport = (() => {
       return true;
     }
     toLogEntry(ctx) {
-      return {
-        ...super.toLogEntry(ctx),
-        message: {
-          "report type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialUserReportType, this.reportType),
-          "next user ID": this.nextUserId,
-          "modifier type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialModifierType, this.modifierType),
-          "modifier node id": this.modifierNodeId,
-          "user ID": this.userId,
-          "user type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialUserType, this.userType),
-          active: this.active,
-          "credential rule": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialRule, this.credentialRule),
-          "expiring timeout (minutes)": this.expiringTimeoutMinutes,
-          "name encoding": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialNameEncoding, this.nameEncoding),
-          "user name": this.userName
-        }
+      const message = {
+        "report type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialUserReportType, this.reportType)
       };
+      if (this.nextUserId != void 0) {
+        message["next user ID"] = this.nextUserId;
+      }
+      message["modifier type"] = (0, import_shared.getEnumMemberName)(import_Types.UserCredentialModifierType, this.modifierType);
+      message["modifier node id"] = this.modifierNodeId;
+      message["user ID"] = this.userId;
+      message["user type"] = (0, import_shared.getEnumMemberName)(import_Types.UserCredentialUserType, this.userType);
+      message.active = this.active;
+      message["credential rule"] = (0, import_shared.getEnumMemberName)(import_Types.UserCredentialRule, this.credentialRule);
+      message["expiring timeout (minutes)"] = this.expiringTimeoutMinutes;
+      message["name encoding"] = (0, import_shared.getEnumMemberName)(import_Types.UserCredentialNameEncoding, this.nameEncoding);
+      message["user name"] = this.userName;
+      return { ...super.toLogEntry(ctx), message };
     }
   };
   return UserCredentialCCUserReport2 = _classThis;
@@ -1562,8 +1570,21 @@ let UserCredentialCCUserGet = (() => {
   };
   return UserCredentialCCUserGet2 = _classThis;
 })();
+function testResponseForUserCredentialCredentialSet(sent, received) {
+  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 = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.UserCredentialCommand.CredentialSet), (0, import_CommandClassDecorators.useSupervision)()];
+  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.UserCredentialCommand.CredentialSet), (0, import_CommandClassDecorators.expectedCCResponse)(() => UserCredentialCCCredentialReport, testResponseForUserCredentialCredentialSet)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -1692,12 +1713,15 @@ let UserCredentialCCCredentialReport = (() => {
       this.credentialType = options.credentialType;
       this.credentialSlot = options.credentialSlot;
       this.credentialReadBack = options.credentialReadBack;
-      this.credentialLength = options.credentialLength;
-      this.credentialData = options.credentialData;
+      if (options.credentialReadBack) {
+        this.credentialData = options.credentialData;
+      }
       this.modifierType = options.modifierType;
       this.modifierNodeId = options.modifierNodeId;
-      this.nextCredentialType = options.nextCredentialType;
-      this.nextCredentialSlot = options.nextCredentialSlot;
+      if (options.reportType === import_Types.UserCredentialCredentialReportType.ResponseToGet) {
+        this.nextCredentialType = options.nextCredentialType;
+        this.nextCredentialSlot = options.nextCredentialSlot;
+      }
     }
     static from(raw, ctx) {
       (0, import_core.validatePayload)(raw.payload.length >= 8);
@@ -1708,25 +1732,34 @@ let UserCredentialCCCredentialReport = (() => {
       const credentialReadBack = !!(raw.payload[6] & 128);
       const credentialLength = raw.payload[7];
       (0, import_core.validatePayload)(raw.payload.length >= 8 + credentialLength + 6);
-      const credentialData = import_shared.Bytes.from(raw.payload.subarray(8, 8 + credentialLength));
-      let offset = 8 + credentialLength;
+      const offset = 8 + credentialLength;
       const modifierType = raw.payload[offset];
       const modifierNodeId = raw.payload.readUInt16BE(offset + 1);
-      const nextCredentialType = raw.payload[offset + 3];
-      const nextCredentialSlot = raw.payload.readUInt16BE(offset + 4);
-      return new this({
+      const common = {
         nodeId: ctx.sourceNodeId,
-        reportType,
         userId,
         credentialType,
         credentialSlot,
-        credentialReadBack,
-        credentialLength,
-        credentialData,
         modifierType,
-        modifierNodeId,
-        nextCredentialType,
-        nextCredentialSlot
+        modifierNodeId
+      };
+      const dataOptions = credentialReadBack ? {
+        credentialReadBack: true,
+        credentialData: import_shared.Bytes.from(raw.payload.subarray(8, 8 + credentialLength))
+      } : { credentialReadBack: false };
+      if (reportType === import_Types.UserCredentialCredentialReportType.ResponseToGet) {
+        return new this({
+          ...common,
+          ...dataOptions,
+          reportType,
+          nextCredentialType: raw.payload[offset + 3],
+          nextCredentialSlot: raw.payload.readUInt16BE(offset + 4)
+        });
+      }
+      return new this({
+        ...common,
+        ...dataOptions,
+        reportType
       });
     }
     reportType;
@@ -1734,28 +1767,28 @@ let UserCredentialCCCredentialReport = (() => {
     credentialType;
     credentialSlot;
     credentialReadBack;
-    credentialLength;
     credentialData;
     modifierType;
     modifierNodeId;
     nextCredentialType;
     nextCredentialSlot;
     serialize(ctx) {
-      this.payload = import_shared.Bytes.alloc(14 + this.credentialData.length);
+      const credentialData = this.credentialData ?? new import_shared.Bytes();
+      this.payload = import_shared.Bytes.alloc(14 + credentialData.length);
       this.payload[0] = this.reportType;
       this.payload.writeUInt16BE(this.userId, 1);
       this.payload[3] = this.credentialType;
       this.payload.writeUInt16BE(this.credentialSlot, 4);
       this.payload[6] = this.credentialReadBack ? 128 : 0;
-      this.payload[7] = this.credentialData.length;
-      if (this.credentialData.length > 0) {
-        this.payload.set(this.credentialData, 8);
+      this.payload[7] = credentialData.length;
+      if (credentialData.length > 0) {
+        this.payload.set(credentialData, 8);
       }
-      let offset = 8 + this.credentialData.length;
+      const offset = 8 + credentialData.length;
       this.payload[offset] = this.modifierType;
       this.payload.writeUInt16BE(this.modifierNodeId, offset + 1);
-      this.payload[offset + 3] = this.nextCredentialType;
-      this.payload.writeUInt16BE(this.nextCredentialSlot, offset + 4);
+      this.payload[offset + 3] = this.nextCredentialType ?? import_Types.UserCredentialType.None;
+      this.payload.writeUInt16BE(this.nextCredentialSlot ?? 0, offset + 4);
       return super.serialize(ctx);
     }
     persistValues(ctx) {
@@ -1764,37 +1797,46 @@ let UserCredentialCCCredentialReport = (() => {
       if (this.credentialType === import_Types.UserCredentialType.None || this.credentialSlot === 0) {
         return true;
       }
-      if (this.reportType === import_Types.UserCredentialCredentialReportType.CredentialDeleted) {
-        this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credential(this.userId, this.credentialType, this.credentialSlot));
-        this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierType(this.userId, this.credentialType, this.credentialSlot));
-        this.removeValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierNodeId(this.userId, this.credentialType, this.credentialSlot));
+      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));
         return true;
       }
-      if (this.reportType !== import_Types.UserCredentialCredentialReportType.ResponseToGet && this.reportType !== import_Types.UserCredentialCredentialReportType.CredentialAdded && this.reportType !== import_Types.UserCredentialCredentialReportType.CredentialModified) {
+      const isRejectionWithReadback = this.reportType === import_Types.UserCredentialCredentialReportType.CredentialAddRejectedLocationOccupied && this.credentialReadBack;
+      if (this.reportType !== import_Types.UserCredentialCredentialReportType.ResponseToGet && this.reportType !== import_Types.UserCredentialCredentialReportType.CredentialAdded && this.reportType !== import_Types.UserCredentialCredentialReportType.CredentialModified && !isRejectionWithReadback) {
         return true;
       }
-      this.ensureMetadata(ctx, import_CCValues_generated.UserCredentialCCValues.credential(this.userId, this.credentialType, this.credentialSlot));
-      this.setValue(ctx, import_CCValues_generated.UserCredentialCCValues.credential(this.userId, this.credentialType, this.credentialSlot), this.credentialData);
-      this.setValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierType(this.userId, this.credentialType, this.credentialSlot), this.modifierType);
-      this.setValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierNodeId(this.userId, this.credentialType, this.credentialSlot), this.modifierNodeId);
+      if (this.credentialData != void 0) {
+        this.ensureMetadata(ctx, import_CCValues_generated.UserCredentialCCValues.credential(this.credentialType, this.credentialSlot));
+        this.setValue(ctx, import_CCValues_generated.UserCredentialCCValues.credential(this.credentialType, this.credentialSlot), normalizeCredentialData(this.credentialType, this.credentialData));
+      }
+      this.setValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialOwner(this.credentialType, this.credentialSlot), this.userId);
+      this.setValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierType(this.credentialType, this.credentialSlot), this.modifierType);
+      this.setValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialModifierNodeId(this.credentialType, this.credentialSlot), this.modifierNodeId);
       return true;
     }
     toLogEntry(ctx) {
-      return {
-        ...super.toLogEntry(ctx),
-        message: {
-          "report type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialCredentialReportType, this.reportType),
-          "user ID": this.userId,
-          "credential type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialType, this.credentialType),
-          "credential slot": this.credentialSlot,
-          "credential read-back": this.credentialReadBack,
-          "credential data": credentialToLogString(this.credentialData),
-          "modifier type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialModifierType, this.modifierType),
-          "modifier node id": this.modifierNodeId,
-          "next credential type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialType, this.nextCredentialType),
-          "next credential slot": this.nextCredentialSlot
-        }
+      const message = {
+        "report type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialCredentialReportType, this.reportType),
+        "user ID": this.userId,
+        "credential type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialType, this.credentialType),
+        "credential slot": this.credentialSlot,
+        "credential read-back": this.credentialReadBack
       };
+      if (this.credentialData != void 0) {
+        message["credential data"] = credentialToLogString(this.credentialData);
+      }
+      message["modifier type"] = (0, import_shared.getEnumMemberName)(import_Types.UserCredentialModifierType, this.modifierType);
+      message["modifier node id"] = this.modifierNodeId;
+      if (this.nextCredentialType != void 0) {
+        message["next credential type"] = (0, import_shared.getEnumMemberName)(import_Types.UserCredentialType, this.nextCredentialType);
+      }
+      if (this.nextCredentialSlot != void 0) {
+        message["next credential slot"] = this.nextCredentialSlot;
+      }
+      return { ...super.toLogEntry(ctx), message };
     }
   };
   return UserCredentialCCCredentialReport2 = _classThis;
@@ -2033,15 +2075,15 @@ let UserCredentialCCCredentialLearnReport = (() => {
   };
   return UserCredentialCCCredentialLearnReport2 = _classThis;
 })();
-let UserCredentialCCUserCredentialAssociationSet = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.UserCredentialCommand.UserCredentialAssociationSet), (0, import_CommandClassDecorators.useSupervision)()];
+let UserCredentialCCAssociationReport = (() => {
+  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.UserCredentialCommand.UserCredentialAssociationReport)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
   let _classSuper = UserCredentialCC;
-  var UserCredentialCCUserCredentialAssociationSet2 = class extends _classSuper {
+  var UserCredentialCCAssociationReport2 = class extends _classSuper {
     static {
-      __name(this, "UserCredentialCCUserCredentialAssociationSet");
+      __name(this, "UserCredentialCCAssociationReport");
     }
     static {
       _classThis = this;
@@ -2049,7 +2091,7 @@ let UserCredentialCCUserCredentialAssociationSet = (() => {
     static {
       const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
       (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-      UserCredentialCCUserCredentialAssociationSet2 = _classThis = _classDescriptor.value;
+      UserCredentialCCAssociationReport2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
       (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
@@ -2058,51 +2100,70 @@ let UserCredentialCCUserCredentialAssociationSet = (() => {
       this.credentialType = options.credentialType;
       this.credentialSlot = options.credentialSlot;
       this.destinationUserId = options.destinationUserId;
+      this.status = options.status;
     }
-    credentialType;
-    credentialSlot;
-    destinationUserId;
     static from(raw, ctx) {
-      (0, import_core.validatePayload)(raw.payload.length >= 5);
+      (0, import_core.validatePayload)(raw.payload.length >= 6);
       const credentialType = raw.payload[0];
       const credentialSlot = raw.payload.readUInt16BE(1);
       const destinationUserId = raw.payload.readUInt16BE(3);
+      const status = raw.payload[5];
       return new this({
         nodeId: ctx.sourceNodeId,
         credentialType,
         credentialSlot,
-        destinationUserId
+        destinationUserId,
+        status
       });
     }
+    credentialType;
+    credentialSlot;
+    destinationUserId;
+    status;
     serialize(ctx) {
-      this.payload = import_shared.Bytes.alloc(5);
+      this.payload = import_shared.Bytes.alloc(6);
       this.payload[0] = this.credentialType;
       this.payload.writeUInt16BE(this.credentialSlot, 1);
       this.payload.writeUInt16BE(this.destinationUserId, 3);
+      this.payload[5] = this.status;
       return super.serialize(ctx);
     }
+    persistValues(ctx) {
+      if (!super.persistValues(ctx))
+        return false;
+      if (this.status !== 0 || this.credentialType === import_Types.UserCredentialType.None || this.credentialSlot === 0) {
+        return true;
+      }
+      this.setValue(ctx, import_CCValues_generated.UserCredentialCCValues.credentialOwner(this.credentialType, this.credentialSlot), this.destinationUserId);
+      return true;
+    }
     toLogEntry(ctx) {
       return {
         ...super.toLogEntry(ctx),
         message: {
           "credential type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialType, this.credentialType),
           "credential slot": this.credentialSlot,
-          "destination user ID": this.destinationUserId
+          "destination user ID": this.destinationUserId,
+          status: this.status
         }
       };
     }
   };
-  return UserCredentialCCUserCredentialAssociationSet2 = _classThis;
+  return UserCredentialCCAssociationReport2 = _classThis;
 })();
-let UserCredentialCCUserCredentialAssociationReport = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.UserCredentialCommand.UserCredentialAssociationReport)];
+function testResponseForUserCredentialAssociationSet(sent, received) {
+  return sent.credentialType === received.credentialType && sent.credentialSlot === received.credentialSlot;
+}
+__name(testResponseForUserCredentialAssociationSet, "testResponseForUserCredentialAssociationSet");
+let UserCredentialCCAssociationSet = (() => {
+  let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.UserCredentialCommand.UserCredentialAssociationSet), (0, import_CommandClassDecorators.expectedCCResponse)(UserCredentialCCAssociationReport, testResponseForUserCredentialAssociationSet)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
   let _classSuper = UserCredentialCC;
-  var UserCredentialCCUserCredentialAssociationReport2 = class extends _classSuper {
+  var UserCredentialCCAssociationSet2 = class extends _classSuper {
     static {
-      __name(this, "UserCredentialCCUserCredentialAssociationReport");
+      __name(this, "UserCredentialCCAssociationSet");
     }
     static {
       _classThis = this;
@@ -2110,7 +2171,7 @@ let UserCredentialCCUserCredentialAssociationReport = (() => {
     static {
       const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
       (0, import_tslib.__esDecorate)(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-      UserCredentialCCUserCredentialAssociationReport2 = _classThis = _classDescriptor.value;
+      UserCredentialCCAssociationSet2 = _classThis = _classDescriptor.value;
       if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
       (0, import_tslib.__runInitializers)(_classThis, _classExtraInitializers);
     }
@@ -2119,32 +2180,27 @@ let UserCredentialCCUserCredentialAssociationReport = (() => {
       this.credentialType = options.credentialType;
       this.credentialSlot = options.credentialSlot;
       this.destinationUserId = options.destinationUserId;
-      this.status = options.status;
     }
+    credentialType;
+    credentialSlot;
+    destinationUserId;
     static from(raw, ctx) {
-      (0, import_core.validatePayload)(raw.payload.length >= 6);
+      (0, import_core.validatePayload)(raw.payload.length >= 5);
       const credentialType = raw.payload[0];
       const credentialSlot = raw.payload.readUInt16BE(1);
       const destinationUserId = raw.payload.readUInt16BE(3);
-      const status = raw.payload[5];
       return new this({
         nodeId: ctx.sourceNodeId,
         credentialType,
         credentialSlot,
-        destinationUserId,
-        status
+        destinationUserId
       });
     }
-    credentialType;
-    credentialSlot;
-    destinationUserId;
-    status;
     serialize(ctx) {
-      this.payload = import_shared.Bytes.alloc(6);
+      this.payload = import_shared.Bytes.alloc(5);
       this.payload[0] = this.credentialType;
       this.payload.writeUInt16BE(this.credentialSlot, 1);
       this.payload.writeUInt16BE(this.destinationUserId, 3);
-      this.payload[5] = this.status;
       return super.serialize(ctx);
     }
     toLogEntry(ctx) {
@@ -2153,13 +2209,12 @@ let UserCredentialCCUserCredentialAssociationReport = (() => {
         message: {
           "credential type": (0, import_shared.getEnumMemberName)(import_Types.UserCredentialType, this.credentialType),
           "credential slot": this.credentialSlot,
-          "destination user ID": this.destinationUserId,
-          status: this.status
+          "destination user ID": this.destinationUserId
         }
       };
     }
   };
-  return UserCredentialCCUserCredentialAssociationReport2 = _classThis;
+  return UserCredentialCCAssociationSet2 = _classThis;
 })();
 let UserCredentialCCAllUsersChecksumReport = (() => {
   let _classDecorators = [(0, import_CommandClassDecorators.CCCommand)(import_Types.UserCredentialCommand.AllUsersChecksumReport)];
@@ -2826,6 +2881,8 @@ let UserCredentialCCKeyLockerEntryGet = (() => {
   UserCredentialCCAdminPinCodeSet,
   UserCredentialCCAllUsersChecksumGet,
   UserCredentialCCAllUsersChecksumReport,
+  UserCredentialCCAssociationReport,
+  UserCredentialCCAssociationSet,
   UserCredentialCCCredentialCapabilitiesGet,
   UserCredentialCCCredentialCapabilitiesReport,
   UserCredentialCCCredentialChecksumGet,
@@ -2845,11 +2902,10 @@ let UserCredentialCCKeyLockerEntryGet = (() => {
   UserCredentialCCUserCapabilitiesReport,
   UserCredentialCCUserChecksumGet,
   UserCredentialCCUserChecksumReport,
-  UserCredentialCCUserCredentialAssociationReport,
-  UserCredentialCCUserCredentialAssociationSet,
   UserCredentialCCUserGet,
   UserCredentialCCUserReport,
   UserCredentialCCUserSet,
-  UserCredentialCCValues
+  UserCredentialCCValues,
+  normalizeCredentialData
 });
 //# sourceMappingURL=UserCredentialCC.js.map