fix: default value

Signed-off-by: smarcet@gmail.com <smarcet@gmail.com>
Change-Id: Iec390d25757b72e76bb23a808611607fce8e8f2e

Author: smarcet

app/Mail/MonitoredSecurityGroupNotificationEmail.php

@@ -69,6 +69,13 @@ final class MonitoredSecurityGroupNotificationEmail extends Mailable
      */
     public $email;
 
+    /**
+     * The subject of the message.
+     *
+     * @var string
+     */
+    public $subject;
+
     /**
      * @param string $email
      * @param string $action
@@ -121,7 +128,7 @@ public function build()
     {
         $this->subject = sprintf
         (
-            "[%s] User %s (%s) was %s from group %s (%s)"
+            "[%s] Monitored Security Groups - User %s (%s) has been %s - Group %s (%s)"
             ,Config::get('app.app_name')
             ,$this->user_name
             ,$this->user_email

app/Services/OpenId/UserService.php

@@ -486,7 +486,7 @@ public function notifyMonitoredSecurityGroupActivity(string $action, int $user_i
         $notified_users = [];
         foreach ($watcher_groups as $watcher_group_slug) {
             Log::debug(sprintf("UserService::notifyMonitoredSecurityGroupActivity processing %s", $watcher_group_slug));
-            $group = $this->group_repository->getById($watcher_group_slug);
+            $group = $this->group_repository->getOneBySlug($watcher_group_slug);
             if(!$group instanceof Group) {
                 Log::warning(sprintf("UserService::notifyMonitoredSecurityGroupActivity group %s not found", $watcher_group_slug));
                 continue;

app/libs/Auth/Models/Group.php

@@ -83,10 +83,8 @@ public function getSlug(): string
         return $this->slug;
     }
 
-    /**
-     * @return ArrayCollection
-     */
-    public function getUsers(): ArrayCollection
+
+    public function getUsers()
     {
         return $this->users;
     }

app/libs/Auth/Models/User.php

@@ -778,9 +778,10 @@ public function addToGroup(Group $group)
 
         // slugs
         $monitored_security_groups = Config::get("audit.monitored_security_groups_set");
+        Log::debug(sprintf("User::addToGroup monitored security groups %s", implode(',', $monitored_security_groups)));
         if(in_array($group->getSlug(), $monitored_security_groups)) {
             // trigger job
-            // trigger job
+            Log::debug(sprintf("User::addToGroup dispatching NotifyMonitoredSecurityGroupActivity for user %s group %s", $this->id, $group->getSlug()));
             NotifyMonitoredSecurityGroupActivity::dispatch(
                 NotifyMonitoredSecurityGroupActivity::ACTION_ADD_2_GROUP,
                 $this->id,
@@ -833,14 +834,27 @@ public function removeFromGroup(Group $group)
                     "Only Super Admins can remove users from groups",
                 );
             }
+
+            $action = sprintf
+            (
+                "REMOVE FROM GROUP (%s) BY USER %s (%s)",
+
+                $group->getName(),
+                $current_user->getEmail(),
+                $current_user->getId()
+            );
+
+            AddUserAction::dispatch($this->id, IPHelper::getUserIp(), $action);
         }
 
         if (!$this->groups->contains($group)) return;
         $this->groups->removeElement($group);
         // slugs
         $monitored_security_groups = Config::get("audit.monitored_security_groups_set");
+        Log::debug(sprintf("User::removeFromGroup monitored security groups %s", implode(',', $monitored_security_groups)));
         if(in_array($group->getSlug(), $monitored_security_groups)) {
             // trigger job
+            Log::debug(sprintf("User::removeFromGroup dispatching NotifyMonitoredSecurityGroupActivity for user %s group %s", $this->id, $group->getSlug()));
             NotifyMonitoredSecurityGroupActivity::dispatch(
                 NotifyMonitoredSecurityGroupActivity::REMOVE_FROM_GROUP,
                 $this->id,

config/audit.php

@@ -12,6 +12,6 @@
  * limitations under the License.
  **/
 return [
-    'monitored_security_groups_set' => explode(',', env('MONITORED_SECURITY_GROUPS', 'administrators,summit-front-end-administrators,	super-admins')),
+    'monitored_security_groups_set' => explode(',', env('MONITORED_SECURITY_GROUPS', 'administrators,summit-front-end-administrators,super-admins')),
     'monitored_security_groups_set_activity_watchers' => explode(',', env('‘‘MONITORED_SECURITY_GROUPS_SET_ACTIVITY_WATCHERS', 'super-admins,administrators')),
 ];

config/doctrine.php

@@ -84,7 +84,7 @@
              * https://www.doctrine-project.org/projects/doctrine-dbal/en/current/reference/architecture.html#middlewares
              */
             'middlewares' => array_filter([
-                env('DOCTRINE_LOGGING', false) ? Doctrine\DBAL\Logging\Middleware::class : null,
+                boolval(env('DOCTRINE_LOGGING', false)) ? Doctrine\DBAL\Logging\Middleware::class : null,
             ]),
         ]
     ],

resources/views/emails/audit/monitored_security_group_notification.blade.php

@@ -7,15 +7,15 @@
             <td align="center"
                 style="font-size:0px;padding:10px 25px;padding-right:25px;padding-left:25px;word-break:break-word;">
                 <div style="font-family:open Sans Helvetica, Arial, sans-serif;font-size:16px;line-height:1;text-align:center;color:#000000;">
-                    Monitored Security Group {!! $group_name !!} has been modified:
+                    Monitored Security Group <b>{!! $group_name !!}</b> has been modified:
                 </div>
             </td>
         </tr>
         <tr>
             <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                 <div style="font-family:open Sans Helvetica, Arial, sans-serif;font-size:16px;line-height:1;text-align:center;color:#000000;">
                     <p>
-                        User {!! $user_name !!} (Email: {!! $user_email !!}) has been * {!! $action !!} *
+                        User {!! $user_name !!} (Email: {!! $user_email !!}) has been  <b>{!! $action !!}</b>
                     </p>
                 </div>
             </td>