Skip to content

Commit

Permalink
Merge branch 'develop' into 'master'
Browse files Browse the repository at this point in the history
fix: fix action running behavior

See merge request prey/js/prey-node-client!1074
  • Loading branch information
beregcamlost committed Oct 15, 2024
2 parents b0e09a7 + af760ca commit be37305
Show file tree
Hide file tree
Showing 5 changed files with 120 additions and 104 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Change Log

## [v1.13.3](https://github.com/prey/prey-node-client/tree/v1.13.3) (2024-10-15)
[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.2..v1.13.3)

- Feat: PDC now informs if OS Query is running on the device or not. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))

- Fix: Fix to get location properly after getting location permission from Prey.app requested for MacOS. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))

- Fix: Fix for "device not connected" trigger. It was not working properly. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))

- Fix: Remove difference between some triggers' actions being stored in DB or not. Now everything is persisted. ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))

- Fix: Fix a bug when two actions runs too quickly one after another and being marked as running with the same id ([Beregcamlost](https://github.com/beregcamlost)) ([SoraKenji](https://github.com/SoraKenji))

## [v1.13.2](https://github.com/prey/prey-node-client/tree/v1.13.2) (2024-09-12)
[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.1..v1.13.2)

Expand Down
2 changes: 1 addition & 1 deletion lib/agent/actions/triggers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ exports.activate = (trigger) => {
const currentDate = new Date().getTime();

if (currentDate > opts) {
if ((trigger.persist === true || trigger.persist === 1) && !trigger.last_exec) {
if ((trigger.persist === true || trigger.persist === 1) && (!trigger.last_exec || trigger.last_exec.toLowerCase() === 'null')) {
runTriggerActions(trigger);
return 6;
}
Expand Down
Loading

0 comments on commit be37305

Please sign in to comment.