fixes some tests for auth, fixes the recursive property lookup, fixes…

… the replacement of alert variables

api/tacticalrmm/accounts/tests.py

@@ -23,7 +23,7 @@ def test_check_creds(self):
  r = self.client.post(url, data, format="json")
  self.assertEqual(r.status_code, 200)
  self.assertIn("totp", r.data.keys())
- self.assertEqual(r.data["totp"], "totp not set")
+ self.assertEqual(r.data["totp"], False)
 
  data = {"username": "bob", "password": "a3asdsa2314"}
  r = self.client.post(url, data, format="json")
@@ -40,7 +40,7 @@ def test_check_creds(self):
  data = {"username": "bob", "password": "hunter2"}
  r = self.client.post(url, data, format="json")
  self.assertEqual(r.status_code, 200)
- self.assertEqual(r.data, "ok")
+ self.assertEqual(r.data["totp"], True)
 
  # test user set to block dashboard logins
  self.bob.block_dashboard_login = True
@@ -404,7 +404,7 @@ def test_post_totp_set(self):
 
  r = self.client.post(url)
  self.assertEqual(r.status_code, 200)
- self.assertEqual(r.data, "totp token already set")
+ self.assertEqual(r.data, False)
 
 
 class TestAPIAuthentication(TacticalTestCase):

api/tacticalrmm/alerts/models.py

@@ -99,6 +99,15 @@ def site(self) -> "Site":
  def client(self) -> "Client":
  return self.agent.client
 
+ @property 
+ def get_result(self):
+ if self.alert_type == AlertType.CHECK:
+ return self.assigned_check.checkresults.get(agent=self.agent)
+ elif self.alert_type == AlertType.TASK:
+ return self.assigned_task.taskresults.get(agent=self.agent) 
+ else:
+ return None
+
  def resolve(self) -> None:
  self.resolved = True
  self.resolved_on = djangotime.now()
@@ -709,13 +718,12 @@ def parse_script_args(self, args: List[str]) -> List[str]:
  temp_args = []
 
  for arg in args:
- temp_arg = ""
+ temp_arg = arg
  for string, model, prop in re.findall(RE_DB_VALUE, arg):
  value = get_db_value(string=f"{model}.{prop}", instance=self)
 
- temp_arg = temp_arg.replace(string, str(value))
- else:
- temp_arg = arg
+ if value != None:
+ temp_arg = temp_arg.replace(string, str(value))
 
  temp_args.append(temp_arg)
 

api/tacticalrmm/tacticalrmm/utils.py

@@ -297,7 +297,7 @@ def get_latest_trmm_ver() -> str:
 # will return 3 groups of matches in a tuple when uses with re.findall
 # i.e. - {{client.name}}, client, name
 RE_DB_VALUE = re.compile(
- r"(\{\{\s*(client|site|agent|global|alert)\.([\w\-\s]+)\s*\}\})"
+ r"(\{\{\s*(client|site|agent|global|alert)(?:\.([\w\-\s\.]+))+\s*\}\})"
 )