refactor to match backend changes

Author: AlCalzone

src/data/zwave_js-credentials.ts

@@ -120,24 +120,14 @@ export interface SetZwaveUserParams {
   user_type?: string;
   credential_rule?: string;
   active?: boolean;
+  credential_type?: ZwaveCredentialType;
+  credential_slot?: number;
+  credential_data?: string;
 }
 
 export interface SetZwaveUserResult {
   user_id: number;
-}
-
-export interface AddZwaveUserParams {
-  user_name?: string | null;
-  user_type?: string;
-  credential_rule?: string;
-  active?: boolean;
-  credential_type: ZwaveCredentialType;
-  credential_data: string;
-}
-
-export interface AddZwaveUserResult {
-  user_id: number;
-  credential_slot: number;
+  credential_slot?: number | null;
 }
 
 export interface SetZwaveCredentialParams {
@@ -230,23 +220,6 @@ export const setZwaveUser = async (
   return unwrapEntityResponse(hass, result.response, entity_id);
 };
 
-export const addZwaveUser = async (
-  hass: HomeAssistant,
-  entity_id: string,
-  params: AddZwaveUserParams
-): Promise<AddZwaveUserResult> => {
-  // notifyOnError=false — caller surfaces errors in-dialog instead.
-  const result = await hass.callService<Record<string, AddZwaveUserResult>>(
-    "zwave_js",
-    "add_user",
-    params,
-    { entity_id },
-    false,
-    true
-  );
-  return unwrapEntityResponse(hass, result.response, entity_id);
-};
-
 export const deleteZwaveUser = (
   hass: HomeAssistant,
   entity_id: string,

src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-credential-user-edit.ts

@@ -18,7 +18,6 @@ import {
   DEFAULT_CREDENTIAL_MAX_LENGTH,
   DEFAULT_CREDENTIAL_MIN_LENGTH,
   ENTERABLE_ZWAVE_CREDENTIAL_TYPES,
-  addZwaveUser,
   deleteZwaveCredential,
   enterableCredentialTypes,
   getCredentialError,
@@ -508,12 +507,9 @@ class DialogZwaveCredentialUserEdit extends LitElement {
     credentialType: ZwaveCredentialType
   ): Promise<void> {
     const params = this._params!;
-    // Create the user and write the credential in a single call. This is the
-    // only way to add a user on User Code CC locks, where the user and code
-    // share a slot. If the credential write fails, the service rolls the user
-    // back so the lock is never left with a credential-less user.
     try {
-      await addZwaveUser(this.hass, params.entity_id, {
+      await setZwaveUser(this.hass, params.entity_id, {
+        // Omit user_id to create a new user with the given credential.
         user_name: this._supportsUserNames ? this._userName.trim() : undefined,
         user_type: this._userType,
         active: true,

test/data/zwave_js-credentials.test.ts

@@ -3,7 +3,6 @@ import {
   getZwaveCredentialCapabilities,
   getZwaveUsers,
   setZwaveUser,
-  addZwaveUser,
   deleteZwaveUser,
   deleteZwaveAllUsers,
   setZwaveCredential,
@@ -170,20 +169,13 @@ describe("zwave_js-credentials", () => {
       );
       expect(result.user_id).toBe(1);
     });
-  });
 
-  describe("addZwaveUser", () => {
-    const addUserResponse = (inner: unknown) =>
-      ({
-        callService: vi
-          .fn()
-          .mockResolvedValue({ response: { [ENTITY_ID]: inner } }),
-      }) as unknown as HomeAssistant;
-
-    it("calls add_user with user and credential, returning the slot", async () => {
-      const hass = addUserResponse({ user_id: 1, credential_slot: 1 });
+    it("creates a new user with a credential and returns the slot", async () => {
+      // Omitting user_id makes set_user create a new user and write the
+      // credential in one call, returning the allocated credential_slot.
+      const hass = setUserResponse({ user_id: 1, credential_slot: 1 });
 
-      const result = await addZwaveUser(hass, ENTITY_ID, {
+      const result = await setZwaveUser(hass, ENTITY_ID, {
         user_name: "Alice",
         user_type: "general",
         active: true,
@@ -193,7 +185,7 @@ describe("zwave_js-credentials", () => {
 
       expect(hass.callService).toHaveBeenCalledWith(
         "zwave_js",
-        "add_user",
+        "set_user",
         {
           user_name: "Alice",
           user_type: "general",
@@ -214,7 +206,7 @@ describe("zwave_js-credentials", () => {
       } as unknown as HomeAssistant;
 
       await expect(
-        addZwaveUser(hass, ENTITY_ID, {
+        setZwaveUser(hass, ENTITY_ID, {
           credential_type: "pin_code",
           credential_data: "1234",
         })