From 18b6de69d08e0f0c4799333cf8df932423686435 Mon Sep 17 00:00:00 2001 From: Sudharsan Selvaraj Date: Tue, 13 May 2025 20:09:25 +0530 Subject: [PATCH] fix: add support for ssh into servers and minor bug fixes for cloud devices --- dashboard-frontend | 2 +- documentation/docs/authentication.md | 5 +++++ log-filter.json | 5 +++++ package-lock.json | 4 ++-- src/data-service/device-service.ts | 14 ++++++++++---- src/modules | 2 +- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dashboard-frontend b/dashboard-frontend index 5d56802d2..c8ae6f08b 160000 --- a/dashboard-frontend +++ b/dashboard-frontend @@ -1 +1 @@ -Subproject commit 5d56802d21d13196fcf98e95f27c53ee3bc7ce14 +Subproject commit c8ae6f08b42e4dfd41b74b8c5d5aaa9a78798359 diff --git a/documentation/docs/authentication.md b/documentation/docs/authentication.md index ccd2c826b..ec5041a0a 100644 --- a/documentation/docs/authentication.md +++ b/documentation/docs/authentication.md @@ -235,6 +235,11 @@ To prevent sensitive information from being logged, you can use Appium's log fil "pattern": "\"token\":\\s*\"([^\"\n]+)\"", "flags": "i", "replacer": "**TOKEN**" + }, + { + "pattern": "\"jwtSecretToken\":\\s*\"([^\"\n]+)\"", + "flags": "i", + "replacer": "**TOKEN**" } ] ``` diff --git a/log-filter.json b/log-filter.json index 3b61fc201..3498fa1e6 100644 --- a/log-filter.json +++ b/log-filter.json @@ -33,5 +33,10 @@ "pattern": "\"token\":\\s*\"([^\"\n]+)\"", "flags": "i", "replacer": "**TOKEN**" + }, + { + "pattern": "\"jwtSecretToken\":\\s*\"([^\"\n]+)\"", + "flags": "i", + "replacer": "**TOKEN**" } ] diff --git a/package-lock.json b/package-lock.json index 4c6a86606..a8ec919b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "appium-device-farm", - "version": "10.0.2", + "version": "10.0.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "appium-device-farm", - "version": "10.0.2", + "version": "10.0.3", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/src/data-service/device-service.ts b/src/data-service/device-service.ts index 81f702cfa..a9fb81357 100644 --- a/src/data-service/device-service.ts +++ b/src/data-service/device-service.ts @@ -83,7 +83,10 @@ export async function addNewDevice(devices: IDevice[], host?: string): Promise !savedDevices.some((savedDevice) => savedDevice.id === device.id)) + .filter( + (device) => + !device.cloud && !savedDevices.some((savedDevice) => savedDevice.id === device.id), + ) .map( (device) => ({ @@ -187,10 +190,13 @@ export async function setSimulatorState(devices: Array) { for await (const device of devices) { const allDevices = (await ATDRepository.DeviceModel).chain().find().data(); if (allDevices.length != 0 && device.deviceType === 'simulator') { - const { state } = allDevices.find((d: IDevice) => d.udid === device.udid); - if (state !== device.state) { + const currentDevice = allDevices.find((d: IDevice) => d.udid === device.udid); + if (!currentDevice) { + break; + } + if (currentDevice.state !== device.state) { log.info( - `Updating Simulator status from ${state} to ${device.state} for device ${device.udid}`, + `Updating Simulator status from ${currentDevice.state} to ${device.state} for device ${device.udid}`, ); (await ATDRepository.DeviceModel) .chain() diff --git a/src/modules b/src/modules index 573588483..07c943eb5 160000 --- a/src/modules +++ b/src/modules @@ -1 +1 @@ -Subproject commit 573588483841cf1bc0f876026daf6b53f2d93bd5 +Subproject commit 07c943eb5a0f1f081a0fe27f17c0dbc5ed083305