Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dashboard-frontend
5 changes: 5 additions & 0 deletions documentation/docs/authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**"
}
]
```
Expand Down
5 changes: 5 additions & 0 deletions log-filter.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,10 @@
"pattern": "\"token\":\\s*\"([^\"\n]+)\"",
"flags": "i",
"replacer": "**TOKEN**"
},
{
"pattern": "\"jwtSecretToken\":\\s*\"([^\"\n]+)\"",
"flags": "i",
"replacer": "**TOKEN**"
}
]
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions src/data-service/device-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ export async function addNewDevice(devices: IDevice[], host?: string): Promise<I
d.id = d.id ?? generateDeviceId(d);
return d;
})
.filter((device) => !savedDevices.some((savedDevice) => savedDevice.id === device.id))
.filter(
(device) =>
!device.cloud && !savedDevices.some((savedDevice) => savedDevice.id === device.id),
)
.map(
(device) =>
({
Expand Down Expand Up @@ -187,10 +190,13 @@ export async function setSimulatorState(devices: Array<IDevice>) {
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()
Expand Down
2 changes: 1 addition & 1 deletion src/modules
Loading