diff --git a/app/Http/Controllers/API/Settings/ExtensionController.php b/app/Http/Controllers/API/Settings/ExtensionController.php index ac3715a4..2a264844 100644 --- a/app/Http/Controllers/API/Settings/ExtensionController.php +++ b/app/Http/Controllers/API/Settings/ExtensionController.php @@ -98,7 +98,7 @@ public function upload() (string) request()->file('extension')->path() ); } - [$error, $new] = $this->setupNewExtension($zipFile, $verify); + [$error, $new, $old] = $this->setupNewExtension($zipFile, $verify); if ($error) { return $error; @@ -115,7 +115,11 @@ public function upload() 'extension_id' => $new->id, 'extension_name' => $new->display_name ?? $new->name, ], - "EXTENSION_UPLOAD" + 'EXTENSION_UPLOAD', + [ + 'old' => $old, + 'new' => $new, + ] ); return response()->json([ @@ -340,6 +344,7 @@ private function setupNewExtension($zipFile, $verify = false) // Check If Extension Already Exists. $extension = Extension::where('name', $json['name'])->first(); + $old = $extension->toArray(); if ($extension) { if ($extension->version == $json['version']) { @@ -393,6 +398,6 @@ private function setupNewExtension($zipFile, $verify = false) ]); $system->fixExtensionPermissions($new->id, $new->name); - return [null, $new]; + return [null, $new, $old]; } } diff --git a/app/Models/AuditLog.php b/app/Models/AuditLog.php index c56ce7f0..30666539 100644 --- a/app/Models/AuditLog.php +++ b/app/Models/AuditLog.php @@ -36,7 +36,8 @@ public static function write( string $type, string $action, array $details, - string $message = "" + string $message = "", + array $extra = [] ) { $request = request()->all(); unset($request['password']); @@ -54,6 +55,8 @@ public static function write( } } + $request = array_merge($request, $extra); + return self::create([ 'user_id' => auth('api')->user()->id, 'ip_address' => request()->ip(),