util,console: Fix claiming issues

TheThingsNetwork · Jun 22, 2023 · ee161bf · ee161bf
1 parent 40f1d10
commit ee161bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ For details about compatibility between different releases, see the **Commitment
 ### Fixed
 
 - Fix payload formatter page launching malformed requests in the Console.
+- Fix end device claiming issues in the Console and improve error messaging.
 
 ### Security
 

diff --git a/pkg/webui/console/containers/device-onboarding-form/index.js b/pkg/webui/console/containers/device-onboarding-form/index.js
@@ -113,6 +113,14 @@ const DeviceOnboardingForm = () => {
           delete mac_state.current_parameters
         }
 
+        if (values.authenticated_identifiers) {
+          cleanedValues.ids = {
+            ...cleanedValues.ids,
+            ...values.authenticated_identifiers,
+            device_id: values.target_device_id,
+          }
+        }
+
         const endDevice = await dispatch(attachPromise(createDevice(appId, cleanedValues)))
         switch (_registration) {
           case REGISTRATION_TYPES.MULTIPLE:

diff --git a/sdk/js/src/service/devices/index.js b/sdk/js/src/service/devices/index.js
@@ -493,7 +493,7 @@ class Devices {
 
     // Initiate claiming, if the device is claimable.
     const hasAuthenticatedIdentifiers = Boolean(authenticated_identifiers)
-    const claimInfoResponse = await this._api.EndDeviceClaimingServer.GetInfoByJoinEUI({
+    const claimInfoResponse = await this._api.EndDeviceClaimingServer.GetInfoByJoinEUI(undefined, {
       join_eui: ids.join_eui,
     })
     const claim = Marshaler.payloadSingleResponse(claimInfoResponse)
@@ -521,12 +521,8 @@ class Devices {
               application_id: applicationId,
             },
           }
-      try {
-        const claimResponse = await this._api.EndDeviceClaimingServer.Claim(undefined, claimPayload)
-        claimDeviceIds = Marshaler.payloadSingleResponse(claimResponse)
-      } catch (error) {
-        throw new Error('Unable to claim end device', { cause: error })
-      }
+      const claimResponse = await this._api.EndDeviceClaimingServer.Claim(undefined, claimPayload)
+      claimDeviceIds = Marshaler.payloadSingleResponse(claimResponse)
     }
 
     let newFieldmasks = mask