Lots of changes and fixes

Author: stevebauman

app/Http/Controllers/Api/DomainObjectAttributesController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\LdapDomain;
+use App\Ldap\Transformers\AttributeTransformer;
+
+class DomainObjectAttributesController
+{
+    /**
+     * Returns an HTML partial of the objects attributes.
+     *
+     * @param LdapDomain $domain
+     * @param string     $objectId
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index(LdapDomain $domain, $objectId)
+    {
+        $object = $domain->objects()->withTrashed()->findOrFail($objectId);
+
+        $attributes = (new AttributeTransformer($object->values))->transform();
+
+        return view('domains.objects.attributes.table', compact('domain', 'object', 'attributes'));
+    }
+}

app/Http/Controllers/Api/NotificationMarkController.php

@@ -38,4 +38,14 @@ public function index(Request $request)
             'Cache-Control' => 'no-cache',
         ]);
     }
+
+    public function markRead()
+    {
+
+    }
+
+    public function markUnread()
+    {
+
+    }
 }

app/Http/Controllers/Api/NotificationsController.php

@@ -47,15 +47,15 @@ public function create(LdapDomain $domain, LdapNotifier $notifier)
      * @param LdapNotifierRequest $request
      * @param LdapDomain          $domain
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\Response
      */
     public function store(LdapNotifierRequest $request, LdapDomain $domain)
     {
-        $request->persist(new LdapNotifier(), $domain);
+        $notifier = $domain->notifiers()->make();
 
-        flash()->success('Added domain notifier');
+        $request->persist($notifier);
 
-        return redirect()->route('domains.notifiers.index', $domain);
+        return response()->turbolinks(route('domains.notifiers.index', [$domain, $notifier]));
     }
 
     /**

app/Http/Controllers/DomainNotifiersController.php

@@ -15,7 +15,7 @@ class DomainScansController extends Controller
      */
     public function index(LdapDomain $domain)
     {
-        $scans = $domain->scans()->latest()->paginate(25);
+        $scans = $domain->scans()->latest()->paginate(10);
 
         return view('domains.scans.index', compact('domain', 'scans'));
     }

app/Http/Controllers/DomainScansController.php

@@ -3,24 +3,22 @@
 namespace App\Http\Controllers;
 
 use App\LdapDomain;
+use App\LdapNotifier;
 use App\LdapNotifierCondition;
 use App\Http\Requests\LdapNotifierConditionRequest;
 
-class DomainNotifierConditionsController extends Controller
+class NotifierConditionsController extends Controller
 {
     /**
      * Create a new notifier condition.
      *
      * @param LdapNotifierConditionRequest $request
-     * @param LdapDomain                   $domain
-     * @param string                       $notifierId
+     * @param LdapNotifier                 $notifier
      *
      * @return mixed
      */
-    public function store(LdapNotifierConditionRequest $request, LdapDomain $domain, $notifierId)
+    public function store(LdapNotifierConditionRequest $request, LdapNotifier $notifier)
     {
-        $notifier = $domain->notifiers()->findOrFail($notifierId);
-
         $request->persist($notifier, new LdapNotifierCondition());
 
         return redirect()->turbolinks(route('domain.notifiers.edit', [$domain, $notifier]));

app/Http/Controllers/DomainNotifierConditionsController.php app/Http/Controllers/NotifierConditionsController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\LdapDomain;
 use App\LdapNotifier;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -25,15 +24,13 @@ public function rules()
     /**
      * Save an LDAP notifier.
      *
-     * @param LdapDomain   $domain
      * @param LdapNotifier $notifier
      *
      * @return LdapNotifier
      */
-    public function persist(LdapDomain $domain, LdapNotifier $notifier)
+    public function persist(LdapNotifier $notifier)
     {
         if (!$notifier->exists) {
-            $notifier->notifiable()->associate($domain);
             $notifier->creator()->associate($this->user());
         }
 

app/Http/Requests/LdapNotifierRequest.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class Notifications extends JsonResource
+class LdapDomain extends JsonResource
 {
     /**
      * Transform the resource into an array.
@@ -17,6 +17,10 @@ public function toArray($request)
     {
         return [
             'id' => $this->id,
+            'name' => $this->name,
+            'slug' => $this->slug,
+            'base_dn' => $this->base_dn,
+            'type' => $this->type,
         ];
     }
 }

app/Http/Resources/Notifications.php app/Http/Resources/LdapDomain.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class LdapNotifier extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'notifiable_name' => $this->notifiable_name,
+            'notifiable_id' => $this->notifiable_id,
+            'notifiable_type' => $this->notifiable_type,
+            'all_users' => $this->all_users,
+        ];
+    }
+}

app/Http/Resources/LdapNotifier.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class LdapObject extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'domain_id' => $this->domain_id,
+            'parent_id' => $this->parent_id,
+            'guid' => $this->guid,
+            'name' => $this->name,
+            'type' => $this->type,
+            'icon' => $this->icon,
+            'values' => $this->values,
+            'domain' => LdapDomain::make($this->domain),
+        ];
+    }
+}

app/Http/Resources/LdapObject.php

@@ -27,15 +27,6 @@ public function compose(View $view)
             })->count()
         ]];
 
-        if ($objectId = request()->object) {
-            $object = $domain->objects()->withTrashed()->findOrFail($objectId);
-
-            $data['counts']['object'] = [
-                'attributes' => count($object->values),
-                'changes' => $object->changes()->count(),
-            ];
-        }
-
         $view->with($data);
     }
 }

app/Http/View/Composers/DomainLayoutComposer.php

@@ -5,7 +5,7 @@
 use App\LdapNotifierCondition;
 use Illuminate\Contracts\View\View;
 
-class NotifierFormComposer
+class NotifierConditionFormComposer
 {
     /**
      * Bind data to the view.

app/Http/View/Composers/NotifierFormComposer.php app/Http/View/Composers/NotifierConditionFormComposer.php

@@ -37,6 +37,17 @@ class LdapDomain extends Model
         'follow_referrals' => 'bool',
     ];
 
+    /**
+     * The attributes that should be hidden for serialization.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'username',
+        'password',
+        'token',
+    ];
+
     /**
      * The attributes that should be mutated to dates.
      *

app/LdapDomain.php

@@ -40,6 +40,7 @@ public static function boot()
 
         static::deleting(function (LdapNotifier $notifier) {
             $notifier->conditions()->delete();
+            $notifier->logs()->delete();
         });
     }
 
@@ -73,6 +74,16 @@ public function logs()
         return $this->hasMany(LdapNotifierLog::class, 'notifier_id');
     }
 
+    /**
+     * The belongsTo many users relationship.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
+    public function users()
+    {
+        return $this->belongsToMany(User::class, 'ldap_notifier_users');
+    }
+
     /**
      * The owning notifiable models relationship.
      *

app/LdapNotifier.php

@@ -3,12 +3,11 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class LdapObject extends Model
 {
-    use Notifiable, SoftDeletes;
+    use SoftDeletes;
 
     /**
      * The attributes that are mass assignable.
@@ -29,6 +28,13 @@ class LdapObject extends Model
      */
     protected $casts = ['values' => 'array'];
 
+    /**
+     * The accessors to append to the model's array form.
+     *
+     * @var array
+     */
+    protected $appends = ['icon'];
+
     /**
      * The "booting" method of the model.
      *
@@ -45,7 +51,6 @@ public static function boot()
             if ($object->isForceDeleting()) {
                 $object->changes()->delete();
                 $object->notifiers()->delete();
-                $object->notifications()->delete();
             }
         });
     }

app/LdapObject.php

@@ -3,7 +3,6 @@
 namespace App;
 
 use Illuminate\Notifications\DatabaseNotification;
-use App\Http\Resources\Notifications as NotificationResource;
 
 class Notifications
 {
@@ -33,14 +32,4 @@ public function get()
             ->limit(10)
             ->get();
     }
-
-    /**
-     * Get the users notifications as a resource.
-     *
-     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
-     */
-    public function resource()
-    {
-        return NotificationResource::collection($this->get());
-    }
 }