From eabc90ec497e46aeb92a4a9bd4e4190aa29eb15b Mon Sep 17 00:00:00 2001 From: shimon Date: Sun, 4 Sep 2022 17:53:37 +0300 Subject: [PATCH] decouple audits log from events --- app/controllers/shared/api.php | 2 -- tests/e2e/Services/Account/AccountBase.php | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 7d9b3fe4d9..e07f405140 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -342,8 +342,6 @@ App::shutdown() $audits->setPayload($responsePayload); } - var_dump($audits); - foreach ($events->getParams() as $key => $value) { $audits->setParam($key, $value); } diff --git a/tests/e2e/Services/Account/AccountBase.php b/tests/e2e/Services/Account/AccountBase.php index 90254a1489..37c4277e85 100644 --- a/tests/e2e/Services/Account/AccountBase.php +++ b/tests/e2e/Services/Account/AccountBase.php @@ -341,7 +341,7 @@ trait AccountBase $this->assertNotEmpty($response['body']['logs']); $this->assertCount(3, $response['body']['logs']); $this->assertIsNumeric($response['body']['total']); - $this->assertContains($response['body']['logs'][1]['event'], ["users.{$userId}.create", "users.{$userId}.sessions.{$sessionId}.create"]); + $this->assertContains($response['body']['logs'][1]['event'], ["account.session.email.create"]); $this->assertEquals($response['body']['logs'][1]['ip'], filter_var($response['body']['logs'][1]['ip'], FILTER_VALIDATE_IP)); $this->assertEquals(true, DateTime::isValid($response['body']['logs'][1]['time'])); @@ -363,7 +363,7 @@ trait AccountBase $this->assertEquals('--', $response['body']['logs'][1]['countryCode']); $this->assertEquals('Unknown', $response['body']['logs'][1]['countryName']); - $this->assertContains($response['body']['logs'][2]['event'], ["users.{$userId}.create", "users.{$userId}.sessions.{$sessionId}.create"]); + $this->assertContains($response['body']['logs'][2]['event'], ["account.create"]); $this->assertEquals($response['body']['logs'][2]['ip'], filter_var($response['body']['logs'][2]['ip'], FILTER_VALIDATE_IP)); $this->assertEquals(true, DateTime::isValid($response['body']['logs'][2]['time']));