Skip to content

Commit ac1f31f

Browse files
committed
fix: default value
Signed-off-by: smarcet@gmail.com <smarcet@gmail.com> Change-Id: Iec390d25757b72e76bb23a808611607fce8e8f2e
1 parent 419e3de commit ac1f31f

6 files changed

Lines changed: 16 additions & 8 deletions

File tree

app/Mail/MonitoredSecurityGroupNotificationEmail.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@ final class MonitoredSecurityGroupNotificationEmail extends Mailable
6969
*/
7070
public $email;
7171

72+
/**
73+
* The subject of the message.
74+
*
75+
* @var string
76+
*/
77+
public $subject;
78+
7279
/**
7380
* @param string $email
7481
* @param string $action

app/Services/OpenId/UserService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ public function notifyMonitoredSecurityGroupActivity(string $action, int $user_i
486486
$notified_users = [];
487487
foreach ($watcher_groups as $watcher_group_slug) {
488488
Log::debug(sprintf("UserService::notifyMonitoredSecurityGroupActivity processing %s", $watcher_group_slug));
489-
$group = $this->group_repository->getById($watcher_group_slug);
489+
$group = $this->group_repository->getOneBySlug($watcher_group_slug);
490490
if(!$group instanceof Group) {
491491
Log::warning(sprintf("UserService::notifyMonitoredSecurityGroupActivity group %s not found", $watcher_group_slug));
492492
continue;

app/libs/Auth/Models/Group.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ public function getSlug(): string
8383
return $this->slug;
8484
}
8585

86-
/**
87-
* @return ArrayCollection
88-
*/
89-
public function getUsers(): ArrayCollection
86+
87+
public function getUsers()
9088
{
9189
return $this->users;
9290
}

app/libs/Auth/Models/User.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,9 +778,10 @@ public function addToGroup(Group $group)
778778

779779
// slugs
780780
$monitored_security_groups = Config::get("audit.monitored_security_groups_set");
781+
Log::debug(sprintf("User::addToGroup monitored security groups %s", implode(',', $monitored_security_groups)));
781782
if(in_array($group->getSlug(), $monitored_security_groups)) {
782783
// trigger job
783-
// trigger job
784+
Log::debug(sprintf("User::addToGroup dispatching NotifyMonitoredSecurityGroupActivity for user %s group %s", $this->id, $group->getSlug()));
784785
NotifyMonitoredSecurityGroupActivity::dispatch(
785786
NotifyMonitoredSecurityGroupActivity::ACTION_ADD_2_GROUP,
786787
$this->id,
@@ -839,8 +840,10 @@ public function removeFromGroup(Group $group)
839840
$this->groups->removeElement($group);
840841
// slugs
841842
$monitored_security_groups = Config::get("audit.monitored_security_groups_set");
843+
Log::debug(sprintf("User::removeFromGroup monitored security groups %s", implode(',', $monitored_security_groups)));
842844
if(in_array($group->getSlug(), $monitored_security_groups)) {
843845
// trigger job
846+
Log::debug(sprintf("User::removeFromGroup dispatching NotifyMonitoredSecurityGroupActivity for user %s group %s", $this->id, $group->getSlug()));
844847
NotifyMonitoredSecurityGroupActivity::dispatch(
845848
NotifyMonitoredSecurityGroupActivity::REMOVE_FROM_GROUP,
846849
$this->id,

config/audit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
* limitations under the License.
1313
**/
1414
return [
15-
'monitored_security_groups_set' => explode(',', env('MONITORED_SECURITY_GROUPS', 'administrators,summit-front-end-administrators, super-admins')),
15+
'monitored_security_groups_set' => explode(',', env('MONITORED_SECURITY_GROUPS', 'administrators,summit-front-end-administrators,super-admins')),
1616
'monitored_security_groups_set_activity_watchers' => explode(',', env('‘‘MONITORED_SECURITY_GROUPS_SET_ACTIVITY_WATCHERS', 'super-admins,administrators')),
1717
];

config/doctrine.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
* https://www.doctrine-project.org/projects/doctrine-dbal/en/current/reference/architecture.html#middlewares
8585
*/
8686
'middlewares' => array_filter([
87-
env('DOCTRINE_LOGGING', false) ? Doctrine\DBAL\Logging\Middleware::class : null,
87+
boolval(env('DOCTRINE_LOGGING', false)) ? Doctrine\DBAL\Logging\Middleware::class : null,
8888
]),
8989
]
9090
],

0 commit comments

Comments
 (0)