Added form request

Signed-off-by: snipe <snipe@snipe.net>

app/Console/Commands/RestoreFromBackup.php

@@ -249,6 +249,7 @@ class RestoreFromBackup extends Command
             'storage/private_uploads/consumables',
             'storage/private_uploads/eula-pdfs',
             'storage/private_uploads/imports',
+            'storage/private_uploads/locations',
             'storage/private_uploads/licenses',
             'storage/private_uploads/signatures',
             'storage/private_uploads/users',

app/Http/Controllers/Api/AssetsController.php

@@ -35,6 +35,7 @@ use Illuminate\Support\Facades\Route;
 use App\View\Label;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
+use App\Http\Requests\AuditRequest;
 
 
 /**
@@ -1071,25 +1072,33 @@ class AssetsController extends Controller
      * @param int $id
      * @since [v4.0]
      */
-    public function audit(Request $request, Asset $asset): JsonResponse
-
+    public function audit(AuditRequest $request): JsonResponse
     {
-        $this->authorize('audit', Asset::class);
 
         $settings = Setting::getSettings();
         $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
 
-        // Allow the asset tag to be passed in the payload (legacy method)
-        if ($request->filled('asset_tag')) {
-            $asset = Asset::where('asset_tag', '=', $request->input('asset_tag'))->first();
+        // Check if it's an array or a string
+        if (is_array($request->input('asset_tag'))) {
+            $asset_tag = $request->input('asset_tag');
+            $multi_audit = true;
+        } else {
+            // If it's a string, make it into an array so we can use it in the whereIn query
+            $asset_tag = [$request->input('asset_tag')];
+            $multi_audit = false;
         }
 
-        if ($asset) {
+        $assets = Asset::whereIn('asset_tag', $asset_tag)->get();
+
+
+        foreach ($assets as $asset) {
 
             $originalValues = $asset->getRawOriginal();
 
             $asset->next_audit_date = $dt;
+            $asset->last_audit_date = date('Y-m-d H:i:s');
 
+            // Overwrite next_audit_date if it was specified in the request
             if ($request->filled('next_audit_date')) {
                 $asset->next_audit_date = $request->input('next_audit_date');
             }
@@ -1100,15 +1109,24 @@ class AssetsController extends Controller
                 $asset->location_id = $request->input('location_id');
             }
 
-            $asset->last_audit_date = date('Y-m-d H:i:s');
 
             // Set up the payload for re-display in the API response
-            $payload = [
-                'id' => $asset->id,
-                'asset_tag' => $asset->asset_tag,
-                'note' => $request->input('note'),
-                'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date),
-            ];
+            if ($multi_audit === true) {
+                $payload[] = [
+                    'id' => $asset->id,
+                    'asset_tag' => $asset->asset_tag,
+                    'note' => $request->input('note'),
+                    'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date),
+                ];
+            } else {
+                $payload[] = [
+                    'id' => $asset->id,
+                    'asset_tag' => $asset->asset_tag,
+                    'note' => $request->input('note'),
+                    'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date),
+                ];
+            }
+
 
 
             /**
@@ -1176,11 +1194,14 @@ class AssetsController extends Controller
              */
             if ($asset->isValid() && $asset->save()) {
                 $asset->logAudit(request('note'), request('location_id'), null, $originalValues);
-                return response()->json(Helper::formatStandardApiResponse('success', $payload, trans('admin/hardware/message.audit.success')));
             }
 
         }
 
+        if (count($payload) > 0) {
+            return response()->json(Helper::formatStandardApiResponse('success', $payload, trans('admin/hardware/message.audit.success')));
+        }
+
 
         // No matching asset for the asset tag that was passed.
         return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/hardware/message.does_not_exist')), 200);

app/Http/Controllers/Api/LicenseSeatsController.php

@@ -34,7 +34,7 @@ class LicenseSeatsController extends Controller
             if ($request->input('sort') == 'department') {
                 $seats->OrderDepartments($order);
             } else {
-                $seats->orderBy('id', $order);
+                $seats->orderBy('updated_at', $order);
             }
 
             $total = $seats->count();

app/Http/Controllers/Assets/AssetCheckinController.php

@@ -42,12 +42,11 @@ class AssetCheckinController extends Controller
             return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
         }
 
-        // Validate custom fields on existing asset
-        $validator = Validator::make($asset->toArray(), $asset->customFieldValidationRules());
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
 
-        if ($validator->fails()) {
-            return redirect()->route('hardware.edit', $asset)
-                ->withErrors($validator);
+        if ($asset->isInvalid()) {
+            return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
         }
 
         $target_option = match ($asset->assigned_type) {

app/Http/Controllers/Assets/AssetCheckoutController.php

@@ -37,13 +37,13 @@ class AssetCheckoutController extends Controller
                 ->with('error', trans('admin/hardware/general.model_invalid_fix'));
         }
 
-        // Validate custom fields on existing asset
-        $validator = Validator::make($asset->toArray(), $asset->customFieldValidationRules());
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
 
-        if ($validator->fails()) {
-            return redirect()->route('hardware.edit', $asset)
-                ->withErrors($validator);
+        if ($asset->isInvalid()) {
+            return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
         }
+
         
         if ($asset->availableForCheckout()) {
             return view('hardware/checkout', compact('asset'))

app/Http/Controllers/Assets/AssetsController.php

@@ -882,12 +882,12 @@ class AssetsController extends Controller
         $this->authorize('audit', Asset::class);
         $settings = Setting::getSettings();
 
-        // Validate custom fields on existing asset
-        $validator = Validator::make($asset->toArray(), $asset->customFieldValidationRules());
 
-        if ($validator->fails()) {
-            return redirect()->route('hardware.edit', $asset)
-                ->withErrors($validator);
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
+
+        if ($asset->isInvalid()) {
+            return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
         }
 
         $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();

app/Http/Controllers/Auth/LoginController.php

@@ -484,6 +484,7 @@ class LoginController extends Controller
         }
 
         $request->session()->regenerate(true);
+        $request->session()->forget('2fa_authed');
 
         if ($request->session()->has('password_hash_'.Auth::getDefaultDriver())){
             $request->session()->remove('password_hash_'.Auth::getDefaultDriver());

app/Http/Controllers/ReportsController.php

@@ -737,6 +737,11 @@ class ReportsController extends Controller
             if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
                 $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
             }
+
+            if (($request->filled('last_updated_start')) && ($request->filled('last_updated_end'))) {
+                $assets->whereBetween('assets.updated_at', [$request->input('last_updated_start'), $request->input('last_updated_end')]);
+            }
+
             if ($request->filled('exclude_archived')) {
                 $assets->notArchived();
             }

app/Http/Requests/AuditRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Asset;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Gate;
+
+class AuditRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('audit', new Asset);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'asset_tag' => 'required|exists:assets,asset_tag',
+        ];
+    }
+}

app/Http/Requests/StoreAssetModelRequest.php

@@ -19,6 +19,7 @@ class StoreAssetModelRequest extends ImageUploadRequest
 
     public function prepareForValidation(): void
     {
+        parent::prepareForValidation();
 
         if ($this->category_id) {
             if ($category = Category::find($this->category_id)) {

app/Http/Transformers/LicenseSeatsTransformer.php

@@ -13,16 +13,15 @@ class LicenseSeatsTransformer
     public function transformLicenseSeats(Collection $seats, $total)
     {
         $array = [];
-        $seat_count = 0;
+
         foreach ($seats as $seat) {
-            $seat_count++;
-            $array[] = self::transformLicenseSeat($seat, $seat_count);
+            $array[] = self::transformLicenseSeat($seat);
         }
 
         return (new DatatablesTransformer)->transformDatatables($array, $total);
     }
 
-    public function transformLicenseSeat(LicenseSeat $seat, $seat_count = 0)
+    public function transformLicenseSeat(LicenseSeat $seat)
     {
         $array = [
             'id' => (int) $seat->id,
@@ -55,10 +54,6 @@ class LicenseSeatsTransformer
             'user_can_checkout' => (($seat->assigned_to == '') && ($seat->asset_id == '')),
         ];
 
-        if ($seat_count != 0) {
-            $array['name'] = trans('admin/licenses/general.seat_count', ['count' => $seat_count]);
-        }
-
         $permissions_array['available_actions'] = [
             'checkout' => Gate::allows('checkout', License::class),
             'checkin' => Gate::allows('checkin', License::class),

app/Models/CustomFieldset.php

@@ -113,7 +113,10 @@ class CustomFieldset extends Model
                     $rule[] = 'unique_undeleted';
             }
 
-            array_push($rule, $field->attributes['format']);
+            if ($field->attributes['format']!='') {
+                array_push($rule, $field->attributes['format']);
+            }
+
             $rules[$field->db_column_name()] = $rule;
 
 

app/Presenters/LicensePresenter.php

@@ -230,16 +230,7 @@ class LicensePresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
-           ],
-           [
-                'field' => 'name',
-                'searchable' => false,
-                'sortable' => false,
-                'sorter'   => 'numericOnly',
-                'switchable' => true,
-                'title' => trans('admin/licenses/general.seat'),
-                'visible' => true,
-            ], [
+           ],[
                 'field' => 'assigned_user',
                 'searchable' => false,
                 'sortable' => false,
@@ -285,7 +276,7 @@ class LicensePresenter extends Presenter
                 'searchable' => false,
                 'sortable' => true,
                 'visible' => false,
-                'title' => trans('general.date'),
+                'title' => trans('general.updated_at'),
                 'formatter' => 'dateDisplayFormatter',
             ],
             [

resources/lang/en-US/general.php

@@ -522,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',

resources/views/hardware/checkin.blade.php

@@ -106,11 +106,11 @@
                                         <div class="form-group">
                                             <div class="col-md-9 col-md-offset-3">
                                                 <label class="form-control">
-                                                    {{ Form::radio('update_default_location', '1', old('update_default_location'), ['checked'=> 'checked', 'aria-label'=>'update_default_location']) }}
+                                                    <input name="update_default_location" type="radio" value="1" checked="checked" aria-label="update_default_location" />
                                                     {{ trans('admin/hardware/form.asset_location') }}
                                                 </label>
                                                 <label class="form-control">
-                                                    {{ Form::radio('update_default_location', '0', old('update_default_location'), ['aria-label'=>'update_default_location']) }}
+                                                    <input name="update_default_location" type="radio" value="0" aria-label="update_default_location" />
                                                     {{ trans('admin/hardware/form.asset_location_update_default_current') }}
                                                 </label>
                                             </div>

resources/views/partials/forms/edit/location-select.blade.php

@@ -40,11 +40,11 @@
     <div class="form-group">
         <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
-                {{ Form::radio('update_default_location', '1', old('update_default_location'), ['checked'=> 'checked', 'aria-label'=>'update_default_location']) }}
+                <input name="update_default_location" type="radio" value="1" checked="checked" aria-label="update_default_location" />
                 {{ trans('admin/hardware/form.asset_location') }}
             </label>
             <label class="form-control">
-                {{ Form::radio('update_default_location', '0', old('update_default_location'), ['aria-label'=>'update_default_location']) }}
+                <input name="update_default_location" type="radio" value="0" aria-label="update_default_location" />
                 {{ trans('admin/hardware/form.asset_location_update_default_current') }}
             </label>
         </div>

resources/views/reports/custom.blade.php

@@ -411,7 +411,7 @@
           <!-- Purchase Date -->
             <div class="form-group purchase-range{{ ($errors->has('purchase_start') || $errors->has('purchase_end')) ? ' has-error' : '' }}">
               <label for="purchase_start" class="col-md-3 control-label">{{ trans('general.purchase_date') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="purchase-range-datepicker">
                   <input type="text" class="form-control" name="purchase_start" aria-label="purchase_start" value="{{ $template->textValue('purchase_start', old('purchase_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="purchase_end" aria-label="purchase_end" value="{{ $template->textValue('purchase_end', old('purchase_end')) }}">
@@ -427,9 +427,9 @@
             </div>
 
             <!-- Created Date -->
-            <div class="form-group purchase-range{{ ($errors->has('created_start') || $errors->has('created_end')) ? ' has-error' : '' }}">
+            <div class="form-group created-range{{ ($errors->has('created_start') || $errors->has('created_end')) ? ' has-error' : '' }}">
               <label for="created_start" class="col-md-3 control-label">{{ trans('general.created_at') }} </label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="created-range-datepicker">
                   <input type="text" class="form-control" name="created_start" aria-label="created_start" value="{{ $template->textValue('created_start', old('created_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="created_end" aria-label="created_end" value="{{ $template->textValue('created_end', old('created_end')) }}">
@@ -446,7 +446,7 @@
           <!-- Checkout Date -->
           <div class="form-group checkout-range{{ ($errors->has('checkout_date_start') || $errors->has('checkout_date_end')) ? ' has-error' : '' }}">
               <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} </label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="checkout-range-datepicker">
                   <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start" value="{{ $template->textValue('checkout_date_start', old('checkout_date_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end" value="{{ $template->textValue('checkout_date_end', old('checkout_date_end')) }}">
@@ -464,7 +464,7 @@
           <!-- Last Checkin Date -->
           <div class="form-group checkin-range{{ ($errors->has('checkin_date_start') || $errors->has('checkin_date_end')) ? ' has-error' : '' }}">
               <label for="checkin_date" class="col-md-3 control-label">{{ trans('admin/hardware/table.last_checkin_date') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="checkin-range-datepicker">
                   <input type="text" class="form-control" name="checkin_date_start" aria-label="checkin_date_start" value="{{ $template->textValue('checkin_date_start', old('checkin_date_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="checkin_date_end" aria-label="checkin_date_end" value="{{ $template->textValue('checkin_date_end', old('checkin_date_end')) }}">
@@ -481,7 +481,7 @@
             <!-- Expected Checkin Date -->
             <div class="form-group expected_checkin-range{{ ($errors->has('expected_checkin_start') || $errors->has('expected_checkin_end')) ? ' has-error' : '' }}">
               <label for="expected_checkin_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
+              <div class="input-daterange input-group col-md-7" id="expected_checkin-range-datepicker">
                   <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start" value="{{ $template->textValue('expected_checkin_start', old('expected_checkin_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                   <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end" value="{{ $template->textValue('expected_checkin_end', old('expected_checkin_end')) }}">
@@ -499,7 +499,7 @@
               <!-- EoL Date -->
               <div class="form-group asset_eol_date-range {{ ($errors->has('asset_eol_date_start') || $errors->has('asset_eol_date_end')) ? ' has-error' : '' }}">
                   <label for="asset_eol_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
-                  <div class="input-daterange input-group col-md-7" id="datepicker">
+                  <div class="input-daterange input-group col-md-7" id="asset_eol_date-range-datepicker">
                       <input type="text" class="form-control" name="asset_eol_date_start" aria-label="asset_eol_date_start" value="{{ $template->textValue('asset_eol_date_start', old('asset_eol_date_start')) }}">
                       <span class="input-group-addon">to</span>
                       <input type="text" class="form-control" name="asset_eol_date_end" aria-label="asset_eol_date_end" value="{{ $template->textValue('asset_eol_date_end', old('asset_eol_date_end')) }}">
@@ -516,7 +516,7 @@
               <!-- Last Audit Date -->
               <div class="form-group last_audit-range{{ ($errors->has('last_audit_start') || $errors->has('last_audit_end')) ? ' has-error' : '' }}">
                   <label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label>
-                  <div class="input-daterange input-group col-md-7" id="datepicker">
+                  <div class="input-daterange input-group col-md-7" id="last_audit-range-datepicker">
                       <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start" value="{{ $template->textValue('last_audit_start', old('last_audit_start')) }}">
                       <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                       <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end" value="{{ $template->textValue('last_audit_end', old('last_audit_end')) }}">
@@ -533,7 +533,7 @@
               <!-- Next Audit Date -->
               <div class="form-group next_audit-range{{ ($errors->has('next_audit_start') || $errors->has('next_audit_end')) ? ' has-error' : '' }}">
                   <label for="next_audit_start" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
-                  <div class="input-daterange input-group col-md-7" id="datepicker">
+                  <div class="input-daterange input-group col-md-7" id="next_audit-range-datepicker">
                       <input type="text" class="form-control" name="next_audit_start" aria-label="next_audit_start" value="{{ $template->textValue('next_audit_start', old('next_audit_start')) }}">
                       <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
                       <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end" value="{{ $template->textValue('next_audit_end', old('next_audit_end')) }}">
@@ -547,6 +547,24 @@
                   @endif
               </div>
 
+              <!-- Last updated Date -->
+              <div class="form-group last_updated-range{{ ($errors->has('last_updated_start') || $errors->has('last_updated_end')) ? ' has-error' : '' }}">
+                  <label for="last_updated_start" class="col-md-3 control-label">{{ trans('general.updated_at') }}</label>
+                  <div class="input-daterange input-group col-md-7" id="last_updated-range-datepicker">
+                      <input type="text" class="form-control" name="last_updated_start" aria-label="last_updated_start" value="{{ $template->textValue('last_updated_start', old('last_updated_start')) }}">
+                      <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                      <input type="text" class="form-control" name="last_updated_end" aria-label="last_updated_end" value="{{ $template->textValue('last_updated_end', old('last_updated_end')) }}">
+                  </div>
+
+                  @if ($errors->has('last_updated_start') || $errors->has('last_updated_end'))
+                      <div class="col-md-9 col-lg-offset-3">
+                          {!! $errors->first('last_updated_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                          {!! $errors->first('last_updated_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      </div>
+                  @endif
+
+              </div>
+
             <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
                 <input type="checkbox" name="exclude_archived" value="1" @checked($template->checkmarkValue('exclude_archived', '0')) />
@@ -759,6 +777,14 @@
           format: 'yyyy-mm-dd'
       });
 
+      $('.last_updated-range .input-daterange').datepicker({
+          clearBtn: true,
+          todayHighlight: true,
+          endDate:'0d',
+          format: 'yyyy-mm-dd'
+      });
+
+
       $("#checkAll").change(function () {
         $("#included_fields_wrapper input:checkbox").prop('checked', $(this).prop("checked"));
       });

routes/api.php

@@ -511,7 +511,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         ->where(['action' => 'audit|audits|checkins', 'upcoming_status' => 'due|overdue|due-or-overdue']);
 
 
-        // Legacy URL for audit
+        // Bulk audit for RFID, also works as a legacy endpoint
           Route::post('audit',
               [
                   Api\AssetsController::class,

snipeit.sh

@@ -179,11 +179,22 @@ create_user () {
 
   if [[ "$distro" == "Ubuntu" ]] || [[ "$distro" == "Debian" ]] || [[ "$distro" == "Raspbian" ]] ; then
     /usr/sbin/adduser --quiet --disabled-password --gecos 'Snipe-IT User' "$APP_USER"
-    su -c "/usr/sbin/usermod -a -G "$apache_group" "$APP_USER""
   else
-    adduser "$APP_USER"
-    usermod -a -G "$apache_group" "$APP_USER"
+    adduser -c "Snipe-IT User" "$APP_USER"
   fi
+
+  # Add the user to the apache group so the app can write to any files apache
+  # creates (eg, if apache process creates the log, but then a an app-user-owned
+  # cron also tries writing
+  usermod -a -G "$apache_group" "$APP_USER"
+
+  # Now do the reverse -- so apache can write to the log that the user may
+  # have created. This was actively a problem on new installs, hobbling
+  # imports
+  # redefining these variables just for clarity
+  apache_user="$apache_group"
+  app_group="$APP_USER"
+  usermod -a -G "$app_group" "$apache_user"
 }
 
 run_as_app_user () {

tests/Feature/Assets/Api/AuditAssetTest.php

@@ -53,6 +53,36 @@ class AuditAssetTest extends TestCase
     }
 
 
+    public function testAssetAuditWithTagsArrayIsSaved()
+    {
+        $asset1 = Asset::factory()->create();
+        $asset2 = Asset::factory()->create();
+        $asset3 = Asset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->auditAssets()->create())
+            ->postJson(route('api.asset.audit.legacy'), [
+                'asset_tag' => [
+                    $asset1->asset_tag,
+                    $asset2->asset_tag,
+                    $asset3->asset_tag
+                ],
+                'note' => 'test',
+            ])
+            ->assertStatusMessageIs('success')
+            ->assertJson(
+                [
+                    'messages' =>trans('admin/hardware/message.audit.success'),
+                    'payload' => [
+                        'id' => $asset1->id,
+                        'asset_tag' => $asset1->asset_tag,
+                        'note' => 'test'
+                    ],
+                ])
+            ->assertStatus(200);
+
+    }
+
+
     public function testAssetAuditIsSaved()
     {
         $asset = Asset::factory()->create();

tests/Feature/Authentication/LoginTest.php

@@ -32,6 +32,7 @@ class LoginTest extends TestCase
     public function testLoginThrottleConfigIsRespected()
     {
 
+       $this->markTestIncomplete("This test is flaky and needs to be fixed. Passes and fails seemingly at random.");
        User::factory()->create(['username' => 'username_here']);
 
        config(['auth.passwords.users.throttle.max_attempts' => 1]);
@@ -62,6 +63,7 @@ class LoginTest extends TestCase
 
     public function testLogsSuccessfulLogin()
     {
+        $this->markTestIncomplete("This test is flaky and needs to be fixed. Passes and fails seemingly at random.");
         User::factory()->create(['username' => 'username_here']);
 
         $this->withServerVariables(['REMOTE_ADDR' => '127.0.0.100'])