Merge branch 'develop'

* Various installer fixes.

* CentOS 6 related fixes.

.env.example

@@ -63,7 +63,13 @@ ENCRYPT=false
 COOKIE_NAME=snipeit_session
 COOKIE_DOMAIN=null
 SECURE_COOKIES=false
+
+
+# --------------------------------------------
+# OPTIONAL: SECURITY HEADER SETTINGS
+# --------------------------------------------
 REFERRER_POLICY=strict-origin
+ENABLE_CSP=false
 
 
 # --------------------------------------------

.github/ISSUE_TEMPLATE.md

@@ -12,20 +12,27 @@
 
 #### Please confirm you have done the following before posting your bug report:
 
-- [ ] I have enabled debug mode
+- [ ] I have enabled debug mode 
 - [ ] I have read [checked the Common Issues page](https://snipe-it.readme.io/docs/common-issues)
 
 -----
-#### Please provide answers to these questions before posting your bug report:
+#### Provide answers to these questions:
 
+- Is this a fresh install or an upgrade? 
 - Version of Snipe-IT you're running
+- Version of PHP you're running
+- Version of MySQL/MariaDB you're running
 - What OS and web server you're running Snipe-IT on
 - What method you used to install Snipe-IT (install.sh, manual installation, docker, etc)
 - WITH DEBUG TURNED ON, if you're getting an error in your browser, include that error
 - What specific Snipe-IT page you're on, and what specific element you're interacting with to trigger the error
 - If a stacktrace is provided in the error, include that too.
 - Any errors that appear in your browser's error console.
-- Confirm whether the error is [reproduceable on the demo](https://snipeitapp.com/demo).
+- Confirm whether the error is reproduceable on the demo: https://snipeitapp.com/demo.
 - Include any additional information you can find in `app/storage/logs` and your webserver's logs.
 - Include what you've done so far in the installation, and if you got any error messages along the way.
 - Indicate whether or not you've manually edited any data directly in the database
+
+Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.
+
+https://snipe-it.readme.io/docs/getting-help

.travis.yml

@@ -43,7 +43,7 @@ before_script:
 # use the $DB env variable to determine the phpunit.xml to use
 # script: ./vendor/bin/codecept run --env testing-ci
 script:
-  - ./vendor/bin/codecept run unit --env testing-ci
+  - ./vendor/bin/codecept run unit
 #  - ./vendor/bin/codecept run acceptance --env=testing-ci
   - ./vendor/bin/codecept run functional --env=functional-travis
 #script: ./vendor/bin/codecept run

app/Console/Commands/ObjectImportCommand.php

@@ -78,12 +78,7 @@ class ObjectImportCommand extends Command
 
         $logFile = $this->option('logfile');
         \Log::useFiles($logFile);
-        if ($this->option('testrun')) {
-            $this->comment('====== TEST ONLY Item Import for '.$filename.' ====');
-            $this->comment('============== NO DATA WILL BE WRITTEN ==============');
-        } else {
-            $this->comment('======= Importing Items from '.$filename.' =========');
-        }
+        $this->comment('======= Importing Items from '.$filename.' =========');
         $importer->import();
 
         $this->bar = null;

app/Http/Controllers/Api/LocationsController.php

@@ -23,7 +23,7 @@ class LocationsController extends Controller
         $allowed_columns = ['id','name','address','address2','city','state','country','zip','created_at',
         'updated_at','parent_id', 'manager_id'];
 
-        $locations = Location::select([
+        $locations = Location::with('parent', 'manager', 'childLocations')->select([
             'locations.id',
             'locations.name',
             'locations.address',
@@ -37,7 +37,10 @@ class LocationsController extends Controller
             'locations.created_at',
             'locations.updated_at',
             'locations.currency'
-        ])->withCount('assets')->withCount('users');
+        ])->withCount('locationAssets')
+        ->withCount('assignedAssets')
+        ->withCount('assets')
+        ->withCount('users');
 
         if ($request->has('search')) {
             $locations = $locations->TextSearch($request->input('search'));
@@ -52,7 +55,6 @@ class LocationsController extends Controller
         $total = $locations->count();
         $locations = $locations->skip($offset)->take($limit)->get();
         return (new LocationsTransformer)->transformLocations($locations, $total);
-
     }
 
 
@@ -74,7 +76,6 @@ class LocationsController extends Controller
             return response()->json(Helper::formatStandardApiResponse('success', (new LocationsTransformer)->transformLocation($location), trans('admin/locations/message.create.success')));
         }
         return response()->json(Helper::formatStandardApiResponse('error', null, $location->getErrors()));
-
     }
 
     /**
@@ -109,7 +110,13 @@ class LocationsController extends Controller
         $location->fill($request->all());
 
         if ($location->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success',  (new LocationsTransformer)->transformLocation($location), trans('admin/locations/message.update.success')));
+            return response()->json(
+                Helper::formatStandardApiResponse(
+                    'success',
+                    (new LocationsTransformer)->transformLocation($location),
+                    trans('admin/locations/message.update.success')
+                )
+            );
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', null, $location->getErrors()));
@@ -129,7 +136,6 @@ class LocationsController extends Controller
         $location = Location::findOrFail($id);
         $this->authorize('delete', $location);
         $location->delete();
-        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/locations/message.delete.success')));
-
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/locations/message.delete.success')));
     }
 }

app/Http/Controllers/AssetsController.php

@@ -75,7 +75,7 @@ class AssetsController extends Controller
         } else {
             $company = null;
         }
-        return view('hardware/index')->with('company',$company);
+        return view('hardware/index')->with('company', $company);
     }
 
     /**
@@ -94,7 +94,6 @@ class AssetsController extends Controller
         }
         $this->authorize('view', $asset);
         return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
-
     }
 
     /**
@@ -126,9 +125,7 @@ class AssetsController extends Controller
         if ($request->has('model_id')) {
             $selected_model = AssetModel::find($request->input('model_id'));
             $view->with('selected_model', $selected_model);
-        } else {
         }
-
         return $view;
     }
 
@@ -168,7 +165,6 @@ class AssetsController extends Controller
 
         // Create the image (if one was chosen.)
         if (Input::has('image')) {
-
             $image = Input::get('image');
 
             // After modification, the image is prefixed by mime info like the following:
@@ -201,7 +197,6 @@ class AssetsController extends Controller
                     ->put('default', $messageBag));
                 return response()->json(['image' => $e->getMessage()], 422);
             }
-
         }
 
 
@@ -211,31 +206,26 @@ class AssetsController extends Controller
         // Need to investigate and fix. Using static method for now.
         $model = AssetModel::find($request->get('model_id'));
 
-
-
         if ($model->fieldset) {
             foreach ($model->fieldset->fields as $field) {
-
                 if ($field->field_encrypted=='1') {
                     if (Gate::allows('admin')) {
                         $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug()));
                     }
-
                 } else {
                     $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug());
                 }
-
             }
         }
 
             // Was the asset created?
         if ($asset->save()) {
             $asset->logCreate();
-            if(request('assigned_user')) {
+            if (request('assigned_user')) {
                 $target = User::find(request('assigned_user'));
-            } elseif(request('assigned_asset')) {
+            } elseif (request('assigned_asset')) {
                 $target = Asset::find(request('assigned_asset'));
-            } elseif(request('assigned_location')) {
+            } elseif (request('assigned_location')) {
                 $target = Location::find(request('assigned_location'));
             }
             if (isset($target)) {
@@ -268,15 +258,15 @@ class AssetsController extends Controller
         $this->authorize($item);
 
         return view('hardware/edit', compact('item'))
-        ->with('model_list', Helper::modelList())
-        ->with('supplier_list', Helper::suppliersList())
-        ->with('company_list', Helper::companyList())
-        ->with('locations_list', Helper::locationsList())
-        ->with('statuslabel_list', Helper::statusLabelList())
-        ->with('assigned_to', Helper::usersList())
-        ->with('manufacturer', Helper::manufacturerList())
-        ->with('statuslabel_types', Helper::statusTypeList())
-        ->with('category', Helper::categoryList('asset'));
+            ->with('model_list', Helper::modelList())
+            ->with('supplier_list', Helper::suppliersList())
+            ->with('company_list', Helper::companyList())
+            ->with('locations_list', Helper::locationsList())
+            ->with('statuslabel_list', Helper::statusLabelList())
+            ->with('assigned_to', Helper::usersList())
+            ->with('manufacturer', Helper::manufacturerList())
+            ->with('statuslabel_types', Helper::statusTypeList())
+            ->with('category', Helper::categoryList('asset'));
     }
 
 
@@ -291,7 +281,6 @@ class AssetsController extends Controller
 
     public function update(AssetRequest $request, $assetId = null)
     {
-
         // Check if the asset exists
         if (!$asset = Asset::find($assetId)) {
             // Redirect to the asset management page with error
@@ -369,7 +358,6 @@ class AssetsController extends Controller
                     if (Gate::allows('admin')) {
                         $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e($request->input($field->convertUnicodeDbSlug())));
                     }
-
                 } else {
                     $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug());
                 }
@@ -385,7 +373,6 @@ class AssetsController extends Controller
         \Input::flash();
         \Session::flash('errors', $asset->getErrors());
         return response()->json(['errors' => $asset->getErrors()], 500);
-
     }
 
     /**
@@ -407,8 +394,8 @@ class AssetsController extends Controller
         $this->authorize('delete', $asset);
 
         DB::table('assets')
-        ->where('id', $asset->id)
-        ->update(array('assigned_to' => null));
+            ->where('id', $asset->id)
+            ->update(array('assigned_to' => null));
 
         $asset->delete();
 
@@ -447,7 +434,6 @@ class AssetsController extends Controller
             ->with('users_list', Helper::usersList())
             ->with('assets_list', Helper::assetsList())
             ->with('locations_list', Helper::locationsList());
-
     }
 
     /**
@@ -469,11 +455,11 @@ class AssetsController extends Controller
         }
         $this->authorize('checkout', $asset);
 
-        if(request('assigned_user')) {
+        if (request('assigned_user')) {
             $target = User::find(request('assigned_user'));
-        } elseif(request('assigned_asset')) {
+        } elseif (request('assigned_asset')) {
             $target = Asset::find(request('assigned_asset'));
-        } elseif(request('assigned_location')) {
+        } elseif (request('assigned_location')) {
             $target = Location::find(request('assigned_location'));
         }
         // $user = User::find(Input::get('assigned_to'));
@@ -519,7 +505,6 @@ class AssetsController extends Controller
 
         $this->authorize('checkin', $asset);
         return view('hardware/checkin', compact('asset'))->with('statusLabel_list', Helper::statusLabelList())->with('backto', $backto);
-
     }
 
 
@@ -544,7 +529,7 @@ class AssetsController extends Controller
         $this->authorize('checkin', $asset);
 
         $admin = Auth::user();
-        if($asset->assignedType() == Asset::USER) {
+        if ($asset->assignedType() == Asset::USER) {
             $user = $asset->assignedTo;
         }
         if (is_null($target = $asset->assignedTo)) {
@@ -583,7 +568,7 @@ class AssetsController extends Controller
             }
 
             if ($backto=='user') {
-                return redirect()->to("admin/users/".$user->id.'/view')->with('success', trans('admin/hardware/message.checkin.success'));
+                return redirect()->route("users.show", $user->id)->with('success', trans('admin/hardware/message.checkin.success'));
             }
             return redirect()->route("hardware.index")->with('success', trans('admin/hardware/message.checkin.success'));
         }
@@ -607,15 +592,16 @@ class AssetsController extends Controller
         $asset = Asset::withTrashed()->find($assetId);
         $this->authorize('view', $asset);
         $settings = Setting::getSettings();
-        $audit_log = Actionlog::where('action_type','=','audit')->where('item_id','=',$assetId)->where('item_type','=',Asset::class)->orderBy('created_at','DESC')->first();
+        $audit_log = Actionlog::where('action_type', '=', 'audit')
+            ->where('item_id', '=', $assetId)
+            ->where('item_type', '=', Asset::class)
+            ->orderBy('created_at', 'DESC')->first();
 
 
         if (isset($asset)) {
-
             if (!is_null($asset->assetloc)) {
                 $use_currency = $asset->assetloc->currency;
             } else {
-
                 if ($settings->default_currency!='') {
                     $use_currency = $settings->default_currency;
                 } else {
@@ -629,7 +615,7 @@ class AssetsController extends Controller
             );
 
             return view('hardware/view', compact('asset', 'qr_code', 'settings'))
-                ->with('use_currency', $use_currency)->with('audit_log',$audit_log);
+                ->with('use_currency', $use_currency)->with('audit_log', $audit_log);
         }
 
         return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist', compact('id')));
@@ -652,8 +638,7 @@ class AssetsController extends Controller
             $size = Helper::barcodeDimensions($settings->barcode_type);
             $qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png';
 
-            if (isset($asset->id,$asset->asset_tag)) {
-
+            if (isset($asset->id, $asset->asset_tag)) {
                 if (file_exists($qr_file)) {
                     $header = ['Content-type' => 'image/png'];
                     return response()->file($qr_file, $header);
@@ -665,7 +650,6 @@ class AssetsController extends Controller
                 }
             }
         }
-
     }
 
 
@@ -683,8 +667,7 @@ class AssetsController extends Controller
         $asset = Asset::find($assetId);
         $barcode_file = public_path().'/uploads/barcodes/'.str_slug($settings->alt_barcode).'-'.str_slug($asset->asset_tag).'.png';
 
-        if (isset($asset->id,$asset->asset_tag)) {
-
+        if (isset($asset->id, $asset->asset_tag)) {
             if (file_exists($barcode_file)) {
                 $header = ['Content-type' => 'image/png'];
                 return response()->file($barcode_file, $header);
@@ -695,7 +678,6 @@ class AssetsController extends Controller
                 return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
             }
         }
-
     }
 
     /**
@@ -762,7 +744,6 @@ class AssetsController extends Controller
      */
     public function postImportHistory(Request $request)
     {
-
         if (!ini_get("auto_detect_line_endings")) {
             ini_set("auto_detect_line_endings", '1');
         }
@@ -780,9 +761,7 @@ class AssetsController extends Controller
 
 
         foreach ($results as $row) {
-
             if (is_array($row)) {
-
                 $row = array_change_key_case($row, CASE_LOWER);
                 $asset_tag = Helper::array_smart_fetch($row, "asset tag");
                 if (!array_key_exists($asset_tag, $item)) {
@@ -797,7 +776,6 @@ class AssetsController extends Controller
                 $item[$asset_tag][$batch_counter]['email'] = Helper::array_smart_fetch($row, "email");
 
                 if ($asset = Asset::where('asset_tag', '=', $asset_tag)->first()) {
-
                     $item[$asset_tag][$batch_counter]['asset_id'] = $asset->id;
 
                     $base_username = User::generateFormattedNameFromFullName(Setting::getSettings()->username_format, $item[$asset_tag][$batch_counter]['name']);
@@ -854,12 +832,10 @@ class AssetsController extends Controller
                         } else {
                             $status['error'][]['asset'][$asset_tag]['msg'] = 'Asset and user was matched but could not be saved.';
                         }
-
                     } else {
                         $item[$asset_tag][$batch_counter]['checkedout_to'] = null;
                         $status['error'][]['user'][Helper::array_smart_fetch($row, "name")]['msg'] = 'User does not exist so no checkin log was created.';
                     }
-
                 } else {
                     $item[$asset_tag][$batch_counter]['asset_id'] = null;
                     $status['error'][]['asset'][$asset_tag]['msg'] = 'Asset does not exist so no match was attempted.';
@@ -875,7 +851,6 @@ class AssetsController extends Controller
 
                 // Only do this if a matching user was found
                 if ((array_key_exists('checkedout_to', $asset_batch[$x])) && ($asset_batch[$x]['checkedout_to']!='')) {
-
                     if (($total_in_batch > 1) && ($x < $total_in_batch) && (array_key_exists($next, $asset_batch))) {
                         $checkin_date = Carbon::parse($asset_batch[$next]['checkout_date'])->subDay(1)->format('Y-m-d H:i:s');
                         $asset_batch[$x]['real_checkin'] = $checkin_date;
@@ -982,7 +957,6 @@ class AssetsController extends Controller
             }
             $log->delete();
             return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
-
         }
         // Prepare the error message
         $error = trans('admin/hardware/message.does_not_exist', compact('id'));
@@ -1049,25 +1023,19 @@ class AssetsController extends Controller
 
 
         if ($request->has('bulk_actions')) {
-
             if ($request->input('bulk_actions')=='labels') {
-
                 $count = 0;
                 return view('hardware/labels')
                     ->with('assets', Asset::find($asset_ids))
                     ->with('settings', Setting::getSettings())
                     ->with('count', $count)
-                    ->with('settings',
-                    Setting::getSettings()
-                );
-
+                    ->with('settings', Setting::getSettings());
             } elseif ($request->input('bulk_actions')=='delete') {
                 $assets = Asset::with('assignedTo', 'assetloc')->find($asset_ids);
-                $assets->each(function($asset) {
-                    $this->authorize('delete',$asset);
+                $assets->each(function ($asset) {
+                    $this->authorize('delete', $asset);
                 });
                 return view('hardware/bulk-delete')->with('assets', $assets);
-
              // Bulk edit
             } elseif ($request->input('bulk_actions')=='edit') {
                 return view('hardware/bulk')
@@ -1148,9 +1116,8 @@ class AssetsController extends Controller
                     }
 
                     DB::table('assets')
-                    ->where('id', $key)
-                    ->update($update_array);
-
+                        ->where('id', $key)
+                        ->update($update_array);
                 } // endforeach
                 return redirect()->to("hardware")->with('success', trans('admin/hardware/message.update.success'));
             // no values given, nothing to update
@@ -1171,8 +1138,7 @@ class AssetsController extends Controller
     public function postBulkDelete()
     {
         $this->authorize('delete', Asset::class);
-        
-        
+
         if (Input::has('ids')) {
             $assets = Asset::find(Input::get('ids'));
             foreach ($assets as $asset) {
@@ -1180,9 +1146,8 @@ class AssetsController extends Controller
                 $update_array['assigned_to'] = null;
 
                 DB::table('assets')
-                ->where('id', $asset->id)
-                ->update($update_array);
-
+                    ->where('id', $asset->id)
+                    ->update($update_array);
             } // endforeach
             return redirect()->to("hardware")->with('success', trans('admin/hardware/message.delete.success'));
             // no values given, nothing to update
@@ -1230,7 +1195,7 @@ class AssetsController extends Controller
             foreach ($asset_ids as $asset_id) {
                 $asset = Asset::find($asset_id);
                 $this->authorize('checkout', $asset);
-                $error = $asset->checkOutToUser($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), null);
+                $error = $asset->checkOut($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), null);
 
                 if ($error) {
                     array_merge_recursive($errors, $asset->getErrors()->toArray());
@@ -1282,10 +1247,8 @@ class AssetsController extends Controller
         $asset->next_audit_date = $request->input('next_audit_date');
 
         if ($asset->save()) {
-            $asset->logAudit(request('note'),request('location_id'));
+            $asset->logAudit(request('note'), request('location_id'));
             return redirect()->to("hardware")->with('success', trans('admin/hardware/message.audit.success'));
         }
     }
-
-
 }

app/Http/Controllers/LicensesController.php

@@ -279,7 +279,7 @@ class LicensesController extends Controller
 
         // Declare the rules for the form validation
         $rules = [
-            'note'   => 'string',
+            'note'   => 'string|nullable',
             'asset_id'  => 'required_without:assigned_to',
         ];
 
@@ -334,15 +334,14 @@ class LicensesController extends Controller
         if ($licenseSeat->save()) {
             $licenseSeat->logCheckout($request->input('note'), $target);
 
-            $data['license_id'] =$licenseSeat->license_id;
+            $data['license_id'] = $licenseSeat->license_id;
             $data['note'] = $request->input('note');
 
             // Redirect to the new asset page
             return redirect()->route("licenses.index")->with('success', trans('admin/licenses/message.checkout.success'));
         }
-
-        // Redirect to the asset management page with error
-        return redirect()->to("admin/licenses/{$asset_id}/checkout")->with('error', trans('admin/licenses/message.create.error'))->with('license', new License);
+        
+        return redirect()->route("licenses.index")->with('error', trans('admin/licenses/message.checkout.error'));
     }
 
 
@@ -358,12 +357,12 @@ class LicensesController extends Controller
     public function getCheckin($seatId = null, $backTo = null)
     {
         // Check if the asset exists
-        if (is_null($licenseseat = LicenseSeat::find($seatId))) {
+        if (is_null($licenseSeat = LicenseSeat::find($seatId))) {
             // Redirect to the asset management page with error
             return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
         }
-        $this->authorize('checkin', $licenseseat);
-        return view('licenses/checkin', compact('licenseseat'))->with('backto', $backTo);
+        $this->authorize('checkin', $licenseSeat);
+        return view('licenses/checkin', compact('licenseSeat'))->with('backto', $backTo);
     }
 
 
@@ -491,7 +490,7 @@ class LicensesController extends Controller
     * @param int $licenseId
     * @return \Illuminate\Http\RedirectResponse
      */
-    public function postUpload($licenseId = null)
+    public function postUpload(Request $request, $licenseId = null)
     {
         $license = License::find($licenseId);
         // the license is valid
@@ -520,13 +519,16 @@ class LicensesController extends Controller
                     //Log the upload to the log
                     $license->logUpload($filename, e($request->input('notes')));
                 }
-
+                // This being called from a modal seems to confuse redirect()->back()
+                // It thinks we should go to the dashboard.  As this is only used
+                // from the modal at present, hardcode the redirect.  Longterm
+                // maybe we evaluate something else.
                 if ($upload_success) {
-                    return redirect()->back()->with('success', trans('admin/licenses/message.upload.success'));
+                    return redirect()->route('licenses.show', $license->id)->with('success', trans('admin/licenses/message.upload.success'));
                 }
-                return redirect()->back()->with('error', trans('admin/licenses/message.upload.error'));
+                return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.error'));
             }
-            return redirect()->back()->with('error', trans('admin/licenses/message.upload.nofiles'));
+            return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.nofiles'));
         }
         // Prepare the error message
         $error = trans('admin/licenses/message.does_not_exist', compact('id'));

app/Http/Controllers/SuppliersController.php

@@ -87,9 +87,8 @@ class SuppliersController extends Controller
                 $supplier->image = $file_name;
         }
 
-            // Was it created?
         if ($supplier->save()) {
-          // Redirect to the new supplier  page
+          // Redirect to the nw supplier  page
             return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.create.success'));
         }
         return redirect()->back()->withInput()->withErrors($supplier->getErrors());

app/Http/Kernel.php

@@ -20,6 +20,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\FrameGuard::class,
         \App\Http\Middleware\XssProtectHeader::class,
         \App\Http\Middleware\ReferrerPolicyHeader::class,
+        \App\Http\Middleware\ContentSecurityPolicyHeader::class,
         \App\Http\Middleware\NosniffGuard::class,
         \App\Http\Middleware\CheckForSetup::class,
         \Fideloper\Proxy\TrustProxies::class,

app/Http/Middleware/ContentSecurityPolicyHeader.php

@@ -0,0 +1,35 @@
+<?php
+namespace App\Http\Middleware;
+
+use Closure;
+
+class ContentSecurityPolicyHeader
+{
+    /**
+     * Handle the given request and get the response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return \Illuminate\Http\Response
+     */
+    public function handle($request, Closure $next)
+    {
+        if ((config('app.debug')=='true')  || (config('app.enable_csp')!='true')) {
+            $response = $next($request);
+            return $response;
+        }
+
+        $policy[] = "default-src 'self'";
+        $policy[] = "style-src 'self' 'unsafe-inline' oss.maxcdn.com";
+        $policy[] = "script-src 'self' 'unsafe-inline' oss.mafxcdn.com cdnjs.cloudflare.com 'nonce-".csrf_token()."'";
+        $policy[] = "connect-src 'self'";
+        $policy[] = "object-src 'none'";
+        $policy[] = "font-src 'self' data:";
+        $policy[] = "img-src 'self' data: gravatar.com";
+        $policy = join(';', $policy);
+
+        $response = $next($request);
+        $response->headers->set('Content-Security-Policy', $policy);
+        return $response;
+    }
+}

app/Http/Transformers/AssetsTransformer.php

@@ -33,8 +33,8 @@ class AssetsTransformer
             'model_number' => ($asset->model) ? e($asset->model->model_number) : null,
             'status_label' => ($asset->assetstatus) ? [
                 'id' => (int) $asset->assetstatus->id,
-                'name'=> e($asset->assetstatus->name),
-                'status_type' =>  e($asset->assetstatus->getStatuslabelType()),
+                'name'=> e($asset->present()->statusText),
+                'status_meta' =>  e($asset->present()->statusMeta),
             ] : null,
             'category' => ($asset->model->category) ? [
                 'id' => (int) $asset->model->category->id,

app/Http/Transformers/ImportsTransformer.php

@@ -29,7 +29,6 @@ class ImportsTransformer
             'header_row' => $import->header_row,
             'first_row'  => $import->first_row,
             'field_map'  => $import->field_map,
-
         ];
 
         return $array;

app/Http/Transformers/LocationsTransformer.php

@@ -38,8 +38,8 @@ class LocationsTransformer
                 'state' => e($location->state),
                 'country' => e($location->country),
                 'zip' => e($location->zip),
-                'assets_checkedout' => $location->assets()->count(),
-                'assets_default'    => $location->assignedassets()->count(),
+                'assets_checkedout' => $location->location_assets_count,
+                'assets_default'    => $location->assigned_assets_count,
 
                 'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
                 'updated_at' => Helper::getFormattedDateObject($location->updated_at, 'datetime'),

app/Models/Asset.php

@@ -179,13 +179,14 @@ class Asset extends Depreciable
 
     public function getDetailedNameAttribute()
     {
-        if ($this->assignedTo) {
-            $user_name = $this->assignedTo->present()->name();
+        if ($this->assignedto) {
+            $user_name = $this->assignedto->present()->name();
         } else {
             $user_name = "Unassigned";
         }
         return $this->asset_tag . ' - ' . $this->name . ' (' . $user_name . ') ' . $this->model->name;
     }
+
     public function validationRules($id = '0')
     {
         return $this->rules;
@@ -725,7 +726,8 @@ class Asset extends Depreciable
 
 
     /**
-    * Query builder scope to search on text for complex Bootstrap Tables API
+    * Query builder scope to search on text for complex Bootstrap Tables API.
+    * This is really horrible, but I can't think of a less-awful way to do it.
     *
     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
     * @param  text                              $search      Search term
@@ -736,7 +738,16 @@ class Asset extends Depreciable
     {
         $search = explode(' OR ', $search);
 
-        return $query->where(function ($query) use ($search) {
+        return $query->leftJoin('users',function ($leftJoin) {
+            $leftJoin->on("users.id", "=", "assets.assigned_to")
+                ->where("assets.assigned_type", "=", User::class);
+        })->leftJoin('locations',function ($leftJoin) {
+            $leftJoin->on("locations.id","=","assets.assigned_to")
+                ->where("assets.assigned_type","=",Location::class);
+        })->leftJoin('assets as assigned_assets',function ($leftJoin) {
+            $leftJoin->on('assigned_assets.id', '=', 'assets.assigned_to')
+                ->where('assets.assigned_type', '=', Asset::class);
+        })->where(function ($query) use ($search) {
             foreach ($search as $search) {
                 $query->whereHas('model', function ($query) use ($search) {
                     $query->whereHas('category', function ($query) use ($search) {
@@ -769,26 +780,15 @@ class Asset extends Depreciable
                     $query->whereHas('defaultLoc', function ($query) use ($search) {
                         $query->where('locations.name', 'LIKE', '%'.$search.'%');
                     });
-                    //FIXME: This needs attention to work with checkout to not-users.
-                // })->orWhere(function ($query) use ($search) {
-                    // $query->whereHas('assignedTo', function ($query) use ($search) {
-                    //     $query->where(function ($query) use ($search) {
-                    //         $query->where('assets.assigned_type', '=', User::class)
-                    //         ->join('users', 'users.id', '=', 'assets.assigned_to')
-                    //         ->where(function($query) use ($search) {
-                    //             $query->where('users.first_name', 'LIKE', '%'.$search.'%')
-                    //             ->orWhere('users.last_name', 'LIKE', '%'.$search.'%');
-                    //         });
-                    //     })->orWhere(function ($query) use ($search) {
-                    //         $query->where('assets.assigned_type', '=', Location::class)
-                    //         ->join('locations', 'locations.id', '=', 'assets.assigned_to')
-                    //         ->where('locations.name', 'LIKE', '%'.$search.'%');
-                    //     })->orWhere(function ($query) use ($search) {
-                    //         $query->where('assets.assigned_type', '=', Asset::class)
-                    //         ->join('assets as assigned_asset', 'assigned_assets.id', '=', 'assets.assigned_to')
-                    //         ->where('assigned_assets.name', 'LIKE', '%'.$search.'%');
-                    //     });
-                    // });
+                 })->orWhere(function ($query) use ($search) {
+
+                     $query->whereHas('assignedTo', function ($query) use ($search) {
+                         $query->where('users.first_name', 'LIKE', '%'.$search.'%')
+                         ->orWhere('users.last_name', 'LIKE', '%'.$search.'%')
+                         ->orWhere('users.username', 'LIKE', '%'.$search.'%')
+                         ->orWhere('locations.name', 'LIKE', '%'.$search.'%')
+                         ->orWhere('assigned_assets.name', 'LIKE', '%'.$search.'%');
+                     });
                 })->orWhere('assets.name', 'LIKE', '%'.$search.'%')
                     ->orWhere('assets.asset_tag', 'LIKE', '%'.$search.'%')
                     ->orWhere('assets.serial', 'LIKE', '%'.$search.'%')
@@ -796,9 +796,9 @@ class Asset extends Depreciable
                     ->orWhere('assets.notes', 'LIKE', '%'.$search.'%');
             }
             foreach (CustomField::all() as $field) {
-                $query->orWhere($field->db_column_name(), 'LIKE', "%$search%");
+                $query->orWhere('assets.'.$field->db_column_name(), 'LIKE', "%$search%");
             }
-        });
+        })->withTrashed()->whereNull("assets.deleted_at"); //workaround for laravel bug
     }
 
 

app/Models/CustomFieldset.php

@@ -47,9 +47,7 @@ class CustomFieldset extends Model
 
             if (($field->field_encrypted!='1') ||
                   (($field->field_encrypted =='1')  && (Gate::allows('admin')) )) {
-                if ($field->pivot->required) {
-                    $rule[]="required";
-                }
+                    $rule[] = ($field->pivot->required=='1') ? "required" : "nullable";
             }
 
             array_push($rule, $field->attributes['format']);

app/Models/Statuslabel.php

@@ -21,7 +21,7 @@ class Statuslabel extends SnipeModel
 
     protected $rules = array(
         'name'  => 'required|string|unique_undeleted',
-        'notes'   => 'string',
+        'notes'   => 'string|nullable',
         'deployable' => 'required',
         'pending' => 'required',
         'archived' => 'required',

app/Models/Supplier.php

@@ -15,18 +15,18 @@ class Supplier extends SnipeModel
 
     protected $rules = array(
         'name'              => 'required|min:3|max:255|unique_undeleted',
-        'address'           => 'min:3|max:50',
-        'address2'          => 'min:2|max:50',
-        'city'              => 'min:3|max:255',
-        'state'             => 'min:0|max:32',
-        'country'           => 'min:0|max:2',
-        'fax'               => 'min:7|max:35',
-        'phone'             => 'min:7|max:35',
-        'contact'           => 'min:0|max:100',
-        'notes'             => 'min:0|max:255',
-        'email'             => 'email|min:5|max:150',
-        'zip'               => 'min:0|max:10',
-        'url'               => 'min:3|max:250',
+        'address'           => 'max:50|nullable',
+        'address2'          => 'max:50|nullable',
+        'city'              => 'max:255|nullable',
+        'state'             => 'max:32|nullable',
+        'country'           => 'max:3|nullable',
+        'fax'               => 'min:7|max:35|nullable',
+        'phone'             => 'min:7|max:35|nullable',
+        'contact'           => 'max:100|nullable',
+        'notes'             => 'max:255|nullable',
+        'email'             => 'email|max:150|nullable',
+        'zip'               => 'max:10|nullable',
+        'url'               => 'sometimes|nullable|string|max:250',
     );
 
     /**

app/Notifications/CheckinNotification.php

@@ -41,10 +41,12 @@ class CheckinNotification extends Notification
             $notifyBy[] = 'slack';
         }
         $item = $this->params['item'];
-        if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance()=='1'))
-            || (method_exists($item, 'getEula') && ($item->getEula()))
-        ) {
-            $notifyBy[] = 'mail';
+        if (class_basename(get_class($this->params['item']))=='Asset') {
+            if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance() == '1'))
+                || (method_exists($item, 'getEula') && ($item->getEula()))
+            ) {
+                $notifyBy[] = 'mail';
+            }
         }
         return $notifyBy;
     }

app/Notifications/CheckoutNotification.php

@@ -44,7 +44,9 @@ class CheckoutNotification extends Notification
         }
         $item = $this->params['item'];
 
-        $notifyBy[]='mail';
+        if (class_basename(get_class($this->params['item']))=='Asset') {
+            $notifyBy[] = 'mail';
+        }
         // if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance()=='1'))
         //     || (method_exists($item, 'getEula') && ($item->getEula()))
         // ) {
@@ -81,30 +83,31 @@ class CheckoutNotification extends Notification
      */
     public function toMail($notifiable)
     {
-        //TODO: Expand for non assets.
-        $item = $this->params['item'];
-        $admin_user = $this->params['admin'];
-        $target = $this->params['target'];
-        $data = [
-            'eula' => method_exists($item, 'getEula') ? $item->getEula() : '',
-            'first_name' => $target->present()->fullName(),
-            'item_name' => $item->present()->name(),
-            'checkout_date' => $item->last_checkout,
-            'expected_checkin' => $item->expected_checkin,
-            'item_tag' => $item->asset_tag,
-            'note' => $this->params['note'],
-            'item_serial' => $item->serial,
-            'require_acceptance' => method_exists($item, 'requireAcceptance') ? $item->requireAcceptance() : '',
-            'log_id' => $this->params['log_id'],
-        ];
-        return (new MailMessage)
-                    ->view('emails.accept-asset', $data)
-                    ->subject(trans('mail.Confirm_asset_delivery'));
-            // \Mail::send('emails.accept-asset', $data, function ($m) use ($target) {
-            //     $m->to($target->email, $target->first_name . ' ' . $target->last_name);
-            //     $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
-            //     $m->subject(trans('mail.Confirm_asset_delivery'));
-            // });
+
+            //TODO: Expand for non assets.
+            $item = $this->params['item'];
+            $admin_user = $this->params['admin'];
+            $target = $this->params['target'];
+            $data = [
+                'eula' => method_exists($item, 'getEula') ? $item->getEula() : '',
+                'first_name' => $target->present()->fullName(),
+                'item_name' => $item->present()->name(),
+                'checkout_date' => $item->last_checkout,
+                'expected_checkin' => $item->expected_checkin,
+                'item_tag' => $item->asset_tag,
+                'note' => $this->params['note'],
+                'item_serial' => $item->serial,
+                'require_acceptance' => method_exists($item, 'requireAcceptance') ? $item->requireAcceptance() : '',
+                'log_id' => $this->params['log_id'],
+            ];
+
+            return (new MailMessage)
+                ->view('emails.accept-asset', $data)
+                ->subject(trans('mail.Confirm_asset_delivery'));
+
+
+
+
     }
 
     /**

app/Presenters/AssetPresenter.php

@@ -325,6 +325,24 @@ class AssetPresenter extends Presenter
         return $interval;
     }
 
+    /**
+     * @return string
+     * This handles the status label "meta" status of "deployed" if
+     * it's assigned. Should maybe deprecate.
+     */
+    public function statusMeta()
+    {
+        if ($this->model->assignedTo) {
+            return strtolower(trans('general.deployed'));
+        }
+        return $this->model->assetstatus->getStatuslabelType();
+    }
+
+    /**
+     * @return string
+     * This handles the status label "meta" status of "deployed" if
+     * it's assigned. Should maybe deprecate.
+     */
     public function statusText()
     {
         if ($this->model->assignedTo) {
@@ -332,6 +350,7 @@ class AssetPresenter extends Presenter
         }
         return $this->model->assetstatus->name;
     }
+
     /**
      * Date the warantee expires.
      * @return false|string

app/Presenters/LicensePresenter.php

@@ -152,7 +152,7 @@ class LicensePresenter extends Presenter
      */
     public function fullName()
     {
-        return 'poop';
+        return $this->name;
     }
 
 

composer.json

@@ -10,12 +10,14 @@
     "barryvdh/laravel-debugbar": "^2.4",
     "doctrine/cache": "^1.6",
     "doctrine/common": "^2.7",
-    "doctrine/dbal": "v2.4.2",
+    "doctrine/dbal": "v2.5.13",
+    "doctrine/inflector": "1.1.*",
+    "doctrine/instantiator": "1.0.*",
     "erusev/parsedown": "^1.6",
     "fideloper/proxy": "^3.1",
     "intervention/image": "^2.3",
     "javiereguiluz/easyslugger": "^1.0",
-    "laravel/framework": "5.4.20",
+    "laravel/framework": "5.4.*",
     "laravel/passport": "^1.0",
     "laravel/tinker": "^1.0",
     "laravelcollective/html": "^5.3",
@@ -27,17 +29,18 @@
     "schuppo/password-strength": "~1.5",
     "spatie/laravel-backup": "^3.0.0",
     "tecnickcom/tc-lib-barcode": "^1.15",
+    "tightenco/ziggy": "^0.4.1",
     "unicodeveloper/laravel-password": "^1.0",
     "watson/validating": "^3.0",
-    "doctrine/instantiator": "1.0.5",
-    "doctrine/inflector": "1.0.*"
+    "phpspec/prophecy": "1.6.2",
+    "phpdocumentor/reflection-docblock": "3.2.2"
   },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "phpunit/phpunit": "~5.7",
         "symfony/css-selector": "3.1.*",
         "symfony/dom-crawler": "3.1.*",
-        "codeception/codeception": "2.2.9",
+        "codeception/codeception": "2.3.6",
         "squizlabs/php_codesniffer": "*",
         "phpunit/php-token-stream": "1.4.11"
 

config/app.php

@@ -169,6 +169,24 @@ return [
 
     'referrer_policy' => env('REFERRER_POLICY', 'strict-origin'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | CSP
+    |--------------------------------------------------------------------------
+    |
+    | Disable the content security policy that restricts what scripts, images
+    | and styles can load. (This should be left as false if you don't know
+    | what this means.)
+    |
+    | Read more: https://www.w3.org/TR/CSP/
+    | Read more: https://content-security-policy.com
+    |
+    */
+
+    'enable_csp' => env('ENABLE_CSP', false),
+
+
+
 
     /*
     |--------------------------------------------------------------------------
@@ -237,7 +255,7 @@ return [
         Laravel\Tinker\TinkerServiceProvider::class,
         Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
         Schuppo\PasswordStrength\PasswordStrengthServiceProvider::class,
-
+        Tightenco\Ziggy\ZiggyServiceProvider::class, // Laravel routes in vue
 
         /*
         * Application Service Providers...

config/version.php

@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v4.0.5',
-  'build_version' => '40',
-  'hash_version' => 'g42c2a66',
-  'full_hash' => 'v4.0.5-40-g42c2a66',
+  'app_version' => 'v4.0.7',
+  'build_version' => '89',
+  'hash_version' => 'g7a27fda',
+  'full_hash' => 'v4.0.7-89-g7a27fda',
 );

database/factories/ActionLogFactory.php

@@ -19,12 +19,14 @@ $factory->defineAs(Actionlog::class, 'asset-checkout', function (Faker\Generator
     $company =  factory(App\Models\Company::class)->create();
     $user = factory(App\Models\User::class)->create(['company_id' => $company->id]);
     $target = factory(App\Models\User::class)->create(['company_id' => $company->id]);
-    // $item = factory(App\Models\Asset::class)->create(['company_id' => $company->id]);
+    do {
+        $item = factory(App\Models\Asset::class)->create(['company_id' => $company->id]);
+    } while (!$item->isValid());
 // dd($item);
     return [
         'user_id' => $user->id,
         'action_type' => 'checkout',
-        'item_id' => factory(App\Models\Asset::class)->create(['company_id' => $company->id])->id,
+        'item_id' => $item->id,
         'item_type'  => App\Models\Asset::class,
         'target_id' => $target->id,
         'target_type' => get_class($target),

public/.htaccess

@@ -5,13 +5,16 @@
 
     RewriteEngine On
 
-    # Uncomment these two lines to force SSL redirect
+    # Uncomment these two lines to force SSL redirect in Apache
     # RewriteCond %{HTTPS} off
     # RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 
+
+
     # Redirect Trailing Slashes If Not A Folder...
     RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteRule ^(.*)/$ /$1 [L,R=301]
+    RewriteCond %{REQUEST_URI} (.+)/$
+    RewriteRule ^ %1 [L,R=301]
 
     # Handle Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d
@@ -21,4 +24,11 @@
     # Handle Authorization Header
     RewriteCond %{HTTP:Authorization} .
     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+
+    # Security Headers
+    # Header set Strict-Transport-Security "max-age=2592000" env=HTTPS
+    # Header set X-XSS-Protection "1; mode=block"
+    # Header set X-Content-Type-Options nosniff
+    # Header set X-Permitted-Cross-Domain-Policies "master-only"
+
 </IfModule>

resources/assets/js/components/importer/importer-file.vue

@@ -67,7 +67,7 @@ tr {
 
 <script>
     export default {
-        props: ['file', 'customFieldUrl', 'importProcessUrl'],
+        props: ['file', 'customFields'],
         data() {
             return {
                 activeFile: this.file,
@@ -130,24 +130,17 @@ tr {
                         {id: 'jobtitle', text: 'Job Title' },
                         {id: 'phone_number', text: 'Phone Number' },
                     ],
-                    customFields: [],
+                    customFields: this.customFields,
                 },
                 columnMappings: this.file.field_map || {},
                 activeColumn: null,
             }
         },
         created() {
-            this.fetchCustomFields();
             window.eventHub.$on('showDetails', this.toggleExtendedDisplay)
             this.populateSelect2ActiveItems();
         },
         computed: {
-            processUrl() {
-                // Because we need to pass a parameter to the laravel route function
-                // We get a url 'http://localhost/api/v1/imports/process/DUMMYTEXT'
-                // But we want to customize that to /api/v1/imports/process/this_file
-                return this.importProcessUrl.replace('DUMMYTEXT', this.file.id)
-            },
             columns() {
                 switch(this.options.importType) {
                     case 'asset':
@@ -161,21 +154,9 @@ tr {
             }
         },
         methods: {
-            fetchCustomFields() {
-                this.$http.get(this.customFieldUrl)
-                .then( ({data}) => {
-                    data = data.rows;
-                    data.forEach((item) => {
-                        this.columnOptions.customFields.push({
-                            'id': item.db_column_name,
-                            'text': item.name,
-                        })
-                    })
-                });
-            },
             postSave() {
                 this.statusText = "Processing...";
-                this.$http.post(this.processUrl, {
+                this.$http.post(route('api.imports.importFile', this.file.id), {
                     'import-update': this.options.update,
                     'import-type': this.options.importType,
                     'column-mappings': this.columnMappings

resources/assets/js/components/importer/importer.vue

@@ -11,8 +11,6 @@ th {
 <script>
     require('blueimp-file-upload');
     export default {
-
-        props: ['importUrl'],
         /*
          * The component's data.
          */
@@ -32,16 +30,15 @@ th {
                     currentPercent: "0",
                     statusText: '',
                     visible: false
-                }
+                },
+                customFields: [],
             };
         },
 
-        /**
-         * Prepare the component (Vue 2.x).
-         */
         mounted() {
             window.eventHub.$on('importErrors', this.updateImportErrors);
             this.fetchFiles();
+            this.fetchCustomFields();
             let vm = this;
             $('#fileupload').fileupload({
                 dataType: 'json',
@@ -74,7 +71,7 @@ th {
 
         methods: {
             fetchFiles() {
-                this.$http.get(this.importUrl)
+                this.$http.get(route('api.imports.index'))
                 .then( ({data}) => this.files = data, // Success
                     //Fail
                 (response) => {
@@ -83,8 +80,20 @@ th {
                     this.alert.message="Something went wrong fetching files...";
                 });
             },
+            fetchCustomFields() {
+                this.$http.get(route('api.customfields.index'))
+                .then( ({data}) => {
+                    data = data.rows;
+                    data.forEach((item) => {
+                        this.customFields.push({
+                            'id': item.db_column_name,
+                            'text': item.name,
+                        })
+                    })
+                });
+            },
             deleteFile(file, key) {
-                this.$http.delete(this.importUrl+"/"+file.id)
+                this.$http.delete(route('api.imports.destroy', file.id))
                 .then((response) => this.files.splice(key, 1), // Success, remove file from array.
                     (response) => {// Fail
                         this.alert.type="danger";
@@ -101,7 +110,7 @@ th {
             },
             updateImportErrors(errors) {
                 this.importErrors = errors;
-            }
+            },
         },
 
         computed: {

resources/assets/js/components/passport/AuthorizedClients.vue

@@ -56,6 +56,7 @@
 
 <script>
     export default {
+        props: ['clientsUrl', 'tokensUrl'],
         /*
          * The component's data.
          */
@@ -91,7 +92,7 @@
              * Get all of the authorized tokens for the user.
              */
             getTokens() {
-                this.$http.get('/oauth/tokens')
+                this.$http.get(this.tokensUrl)
                         .then(response => {
                             this.tokens = response.data;
                         });
@@ -101,7 +102,7 @@
              * Revoke the given token.
              */
             revoke(token) {
-                this.$http.delete('/oauth/tokens/' + token.id)
+                this.$http.delete(this.tokensUrl +'/'+ token.id)
                         .then(response => {
                             this.getTokens();
                         });

resources/assets/js/components/passport/Clients.vue

@@ -219,6 +219,7 @@
         /*
          * The component's data.
          */
+        props: ['clientsUrl'],
         data() {
             return {
                 clients: [],
@@ -271,7 +272,7 @@
              * Get all of the OAuth clients for the user.
              */
             getClients() {
-                this.$http.get('/oauth/clients')
+                this.$http.get(this.clientsUrl)
                         .then(response => {
                             this.clients = response.data;
                         });
@@ -289,7 +290,7 @@
              */
             store() {
                 this.persistClient(
-                    'post', '/oauth/clients',
+                    'post', this.clientsUrl,
                     this.createForm, '#modal-create-client'
                 );
             },
@@ -310,7 +311,7 @@
              */
             update() {
                 this.persistClient(
-                    'put', '/oauth/clients/' + this.editForm.id,
+                    'put', this.clientsUrl + '/' + this.editForm.id,
                     this.editForm, '#modal-edit-client'
                 );
             },
@@ -319,8 +320,10 @@
              * Persist the client to storage using the given form.
              */
             persistClient(method, uri, form, modal) {
+                console.log('persisting');
                 form.errors = [];
 
+                console.log('method: ' + method);
                 this.$http[method](uri, form)
                     .then(response => {
                         this.getClients();
@@ -344,7 +347,7 @@
              * Destroy the given client.
              */
             destroy(client) {
-                this.$http.delete('/oauth/clients/' + client.id)
+                this.$http.delete(this.clientsUrl +'/' + client.id)
                         .then(response => {
                             this.getClients();
                         });

resources/assets/js/components/passport/PersonalAccessTokens.vue

@@ -160,6 +160,7 @@
 
 <script>
     export default {
+        props: ['tokenUrl', 'scopesUrl'],
         /*
          * The component's data.
          */
@@ -209,7 +210,7 @@
              * Get all of the personal access tokens for the user.
              */
             getTokens() {
-                this.$http.get('/oauth/personal-access-tokens')
+                this.$http.get(this.tokenUrl)
                         .then(response => {
                             this.tokens = response.data;
                         });
@@ -219,7 +220,7 @@
              * Get all of the available scopes.
              */
             getScopes() {
-                this.$http.get('/oauth/scopes')
+                this.$http.get(this.scopesUrl)
                         .then(response => {
                             this.scopes = response.data;
                         });
@@ -240,7 +241,7 @@
 
                 this.form.errors = [];
 
-                this.$http.post('/oauth/personal-access-tokens', this.form)
+                this.$http.post(this.tokenUrl, this.form)
                         .then(response => {
                             this.form.name = '';
                             this.form.scopes = [];
@@ -293,7 +294,7 @@
              * Revoke the given token.
              */
             revoke(token) {
-                this.$http.delete('/oauth/personal-access-tokens/' + token.id)
+                this.$http.delete(this.tokenUrl +'/'+ token.id)
                         .then(response => {
                             this.getTokens();
                         });

resources/lang/en/admin/statuslabels/message.php

@@ -20,6 +20,13 @@ return array(
         'confirm'   => 'Are you sure you wish to delete this Status Label?',
         'error'   => 'There was an issue deleting the Status Label. Please try again.',
         'success' => 'The Status Label was deleted successfully.'
-    )
+    ),
+
+    'help' => array(
+        'undeployable'   => 'These assets cannot be assigned to anyone.',
+        'deployable'   => 'These assets can be checked out. Once they are assigned, they will assume a meta status of <i class="fa fa-circle text-blue"></i> <strong>Deployed</strong>.',
+        'archived'   => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.',
+        'pending'   => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.',
+    ),
 
 );

resources/views/account/accept-asset.blade.php

@@ -94,7 +94,7 @@
 @section('moar_scripts')
 
     <script src="{{ asset('js/signature_pad.min.js') }}"></script>
-    <script>
+    <script nonce="{{ csrf_token() }}">
         var wrapper = document.getElementById("signature-pad"),
                 clearButton = wrapper.querySelector("[data-action=clear]"),
                 saveButton = wrapper.querySelector("[data-action=save]"),

resources/views/account/api.blade.php

@@ -9,16 +9,19 @@
 {{-- Page content --}}
 @section('content')
      @if (!config('app.lock_passwords'))
-         <passport-personal-access-tokens></passport-personal-access-tokens>
+        <passport-personal-access-tokens
+            token-url="{{ url('oauth/personal-access-tokens') }}"
+            scopes-url="{{ url('oauth/scopes') }}">
+        </passport-personal-access-tokens>
      @else
          <p class="help-block">{{ trans('general.feature_disabled') }}</p>
     @endif
 @stop
 
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
     new Vue({
         el: "#app",
     });
 </script>
-@endsection
+@endsection

resources/views/account/requestable-assets.blade.php

@@ -149,7 +149,7 @@
 
 
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
 
     $( "a[name='Request']").click(function(event) {
         // event.preventDefault();

resources/views/asset_maintenances/index.blade.php

@@ -58,7 +58,7 @@
 
 @section('moar_scripts')
 @include ('partials.bootstrap-table', ['exportFile' => 'maintenances-export', 'search' => true])
-<script>
+<script nonce="{{ csrf_token() }}">
     function maintenanceActions(value, row) {
         var actions = '<nobr>';
         if ((row) && (row.available_actions.update === true)) {

resources/views/custom_fields/fields/edit.blade.php

@@ -134,7 +134,7 @@
 @stop
 
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
     $(document).ready(function(){
 
         // Only display the custom format field if it's a custom format validation type

resources/views/custom_fields/fieldsets/view.blade.php

@@ -82,7 +82,7 @@
 @stop
 
 @section('moar_scripts')
-  <script>
+  <script nonce="{{ csrf_token() }}">
   var fixHelperModified = function(e, tr) {
       var $originals = tr.children();
       var $helper = tr.clone();

resources/views/dashboard.blade.php

@@ -253,7 +253,7 @@
 @endif
 
 
-<script>
+<script nonce="{{ csrf_token() }}">
 
 
 

resources/views/emails/asset-canceled.blade.php

@@ -4,7 +4,7 @@
 
 <p>{{ trans('mail.a_user_canceled') }} <a href="{{ url('/') }}"> {{ $snipeSettings->site_name }}</a>. </p>
 
-<p>{{ trans('mail.user') }} <a href="{{ url('/') }}/admin/users/{{ $user_id }}/view">{{ $requested_by }}</a><br>
+<p>{{ trans('mail.user') }} <a href="{{ route('users.show', $user_id) }}">{{ $requested_by }}</a><br>
    {{ trans('mail.item') }} <a href="{{ $item_url }}">{{ $item_name }}</a> ({{ $item_type }}) <br>
    {{ trans('mail.canceled') }} {{ $requested_date }}
 </p>

resources/views/emails/asset-requested.blade.php

@@ -4,7 +4,7 @@
 
 <p>{{ trans('mail.a_user_requested') }} <a href="{{ url('/') }}"> {{ $snipeSettings->site_name }}</a>. </p>
 
-<p>{{ trans('mail.user') }} <a href="{{ url('/') }}/admin/users/{{ $user_id }}/view">{{ $requested_by }}</a><br>
+<p>{{ trans('mail.user') }} <a href="{{ route('users.show', $user_id) }}">{{ $requested_by }}</a><br>
    {{ trans('mail.item') }} <a href="{{ $item_url }}">{{ $item_name }}</a> ({{ $item_type }}) <br>
    {{ trans('mail.requested') }} {{ $requested_date }}
 @if ($item_quantity > 1)

resources/views/emails/low-inventory.blade.php

@@ -15,7 +15,7 @@
         @for($i=0; $count > $i; $i++)
             <tr>
                 <td>
-                    <a href="{{ url('/') }}/admin/{{ $data[$i]['type'] }}/{{ $data[$i]['id'] }}/view">{{ $data[$i]['name'] }}</a>
+                    <a href="{{ route($data[$i]['type'].'.show', $data[$i]['id']) }}">{{ $data[$i]['name'] }}</a>
                 </td>
                 <td>{{ $data[$i]['type'] }}</td>
                 <td>{{ $data[$i]['remaining'] }}</td>

resources/views/hardware/bulk-checkout.blade.php

@@ -82,13 +82,14 @@
               {!! $errors->first('selected_asset', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
             </div>
           </div>
-        </form>
+
       </div> <!--./box-body-->
       <div class="box-footer">
         <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
         <button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkout') }}</button>
       </div>
     </div>
+      </form>
   </div> <!--/.col-md-7-->
 
   <!-- right column -->
@@ -107,7 +108,7 @@
 @stop
 
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
 $(function() {
   $('#assigned_to').on("change",function () {
     // console.warn("Model Id has changed!");

resources/views/hardware/checkout.blade.php

@@ -154,7 +154,7 @@
 @stop
 
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
 $(function() {
   $('#assigned_user').on("change",function () {
     var userid = $('#assigned_user option:selected').val();

resources/views/hardware/edit.blade.php

@@ -160,7 +160,7 @@
 @stop
 
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
 
 
 

resources/views/hardware/history.blade.php

@@ -190,7 +190,7 @@
             @endif
 
         </div></div></div>
-<script>
+<script nonce="{{ csrf_token() }}">
 $(document).ready(function(){
 
     $('#generate-password').pGenerator({

resources/views/hardware/quickscan.blade.php

@@ -125,7 +125,7 @@
 
 
 @section('moar_scripts')
-    <script>
+    <script nonce="{{ csrf_token() }}">
 
         $("#audit-form").submit(function (event) {
             $('#audited-div').show();

resources/views/hardware/view.blade.php

@@ -87,8 +87,8 @@
                             &nbsp; &nbsp;</span>
                         </span>
                         @endif
-                        <a href="{{ route('statuslabels.show', $asset->assetstatus->id) }}">{{ $asset->present()->statusText() }}</a>
-                          <label class="label label-default">{{ $asset->assetstatus->getStatuslabelType() }}</label>
+                        <a href="{{ route('statuslabels.show', $asset->assetstatus->id) }}">{{ $asset->assetstatus->name }}</a>
+                          <label class="label label-default">{{ $asset->present()->statusMeta }}</label>
                       </td>
                     </tr>
                     @endif
@@ -703,7 +703,7 @@
 @section('moar_scripts')
   @include ('partials.bootstrap-table', ['simple_view' => true])
 
-<script>
+<script nonce="{{ csrf_token() }}">
     $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
         event.preventDefault();
         $(this).ekkoLightbox();

resources/views/importer/import.blade.php

@@ -16,7 +16,7 @@
 {{-- Page content --}}
 @section('content')
 <div id="app">
-    <importer inline-template import-url="{{route('api.imports.index')}}" v-cloak>
+    <importer inline-template v-cloak>
         <div class="row">
         <alert v-show="alert.visible" :alert-type="alert.type" v-on:hide="alert.visible = false">@{{ alert.message }}</alert>
             <errors :errors="importErrors"></errors>
@@ -65,8 +65,7 @@
                                     			<import-file
                                                     :key="currentFile.id"
                                                     :file="currentFile"
-                                                    customFieldUrl="{{route('api.customfields.index')}}"
-                                                    importProcessUrl="{{route('api.imports.importFile','DUMMYTEXT')}}"
+                                                    :custom-fields="customFields"
                                                     @alert="updateAlert(alert)">
                                     			</import-file>
                                     	</template>
@@ -83,7 +82,7 @@
 @stop
 
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
     new Vue({
         el: '#app'
     });

resources/views/layouts/default.blade.php

@@ -27,13 +27,11 @@
 
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-      <script>
-          window.Laravel = { csrfToken: '{{ csrf_token() }}' };
-      </script>
+    <script nonce="{{ csrf_token() }}">
+      window.Laravel = { csrfToken: '{{ csrf_token() }}' };
+    </script>
 
-
-
-      <style>
+    <style nonce="{{ csrf_token() }}">
         @if ($snipeSettings)
             @if ($snipeSettings->header_color)
             .main-header .navbar, .main-header .logo {
@@ -68,16 +66,15 @@
     }
     </style>
 
-
-
-    <script>
+    <script nonce="{{ csrf_token() }}">
           window.snipeit = {
               settings: {
                   "per_page": {{ $snipeSettings->per_page }}
               }
           };
-      </script>
-
+    </script>
+    <!-- Add laravel route sinto javascript  Primarily useful for vue.-->
+    @routes
       <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
       <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
       <!--[if lt IE 9]>
@@ -87,8 +84,8 @@
             <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js" integrity="sha384-ZoaMbDF+4LeFxg6WdScQ9nnR1QC2MIRxA1O9KWEXQwns1G8UNyIEZIQidzb0T1fo" crossorigin="anonymous"></script>
 
        @else
-            <script src="{{ url(asset('js/html5shiv.js')) }}"></script>
-            <script src="{{ url(asset('js/respond.js')) }}"></script>
+            <script src="{{ url(asset('js/html5shiv.js')) }}" nonce="{{ csrf_token() }}"></script>
+            <script src="{{ url(asset('js/respond.js')) }}" nonce="{{ csrf_token() }}"></script>
        @endif
        <![endif]-->
   </head>
@@ -382,17 +379,17 @@
 
 
                   <li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
-                    <a href="{{ url('hardware?status=Deployed') }}"><i class="fa fa-circle-o text-blue"></i>@lang('general.deployed')
+                    <a href="{{ url('hardware?status=Deployed') }}"><i class="fa fa-circle-o text-blue"></i>All  @lang('general.deployed')
                     </a>
                   </li>
                   <li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
                     <a href="{{ url('hardware?status=RTD') }}">
                         <i class="fa fa-circle-o text-green"></i>
-                    @lang('general.ready_to_deploy')</a>
+                        All  @lang('general.ready_to_deploy')</a>
                   </li>
-                  <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}"><i class="fa fa-circle-o text-orange"></i>@lang('general.pending')</a></li>
-                  <li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a href="{{ url('hardware?status=Undeployable') }}"><i class="fa fa-times text-red"></i>@lang('general.undeployable')</a></li>
-                  <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Archived') }}"><i class="fa fa-times text-red"></i>@lang('admin/hardware/general.archived')</a></li>
+                  <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}"><i class="fa fa-circle-o text-orange"></i>All  @lang('general.pending')</a></li>
+                  <li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a href="{{ url('hardware?status=Undeployable') }}"><i class="fa fa-times text-red"></i>All @lang('general.undeployable')</a></li>
+                  <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Archived') }}"><i class="fa fa-times text-red"></i>All  @lang('admin/hardware/general.archived')</a></li>
                     <li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Requestable') }}"><i class="fa fa-check text-blue"></i> @lang('admin/hardware/general.requestable')</a></li>
 
                   <li class="divider">&nbsp;</li>
@@ -661,8 +658,8 @@
 
 
 
-    <script src="{{ url(mix('js/dist/all.js')) }}"></script>
-    <script>
+    <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
+    <script nonce="{{ csrf_token() }}">
         $(function () {
             var datepicker = $.fn.datepicker.noConflict(); // return $.fn.datepicker to previously assigned value
             $.fn.bootstrapDP = datepicker;
@@ -677,14 +674,18 @@
     @section('moar_scripts')
     @show
 
-    <script>
+    <script nonce="{{ csrf_token() }}">
         $(function () {
             $('[data-toggle="tooltip"]').tooltip();
         })
+        $(document).on('click', '[data-toggle="lightbox"]', function(event) {
+            event.preventDefault();
+            $(this).ekkoLightbox();
+        });
     </script>
 
     @if ((Session::get('topsearch')=='true') || (Request::is('/')))
-    <script>
+    <script nonce="{{ csrf_token() }}">
          $("#tagSearch").focus();
     </script>
     @endif

resources/views/layouts/setup.blade.php

@@ -13,7 +13,7 @@
 
 
 
-        <script>
+        <script nonce="{{ csrf_token() }}">
             window.snipeit = {
                 settings: {
                     "per_page": 20
@@ -118,9 +118,9 @@
                   </div>
               </div>
           </div>
-          <script src="{{ url(mix('js/dist/all.js')) }}"></script>
+          <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
 
-        <script>
+        <script nonce="{{ csrf_token() }}">
             $(function () {
                 $(".select2").select2();
             });

resources/views/licenses/checkin.blade.php

@@ -6,28 +6,31 @@
 @parent
 @stop
 
+
 @section('header_right')
-<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">{{ trans('general.back') }}</a>
+    <a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
+        {{ trans('general.back') }}</a>
 @stop
 
 {{-- Page content --}}
 @section('content')
-<div class="row form-wrapper">
-    <!-- left column -->
-    <div class="col-md-10 column">
+    <div class="row">
+        <!-- left column -->
+        <div class="col-md-7">
+            <form class="form-horizontal" method="post" action="{{ route('licenses.checkin.save', $licenseSeat->id) }}" autocomplete="off">
+                {{csrf_field()}}
 
-        @if ($backto=='user')
-        <form class="form-horizontal" method="post" action="{{ route('licenses.checkin', array('licenseeat_id'=> $licenseseat->id, 'backto'=>'user')) }}" autocomplete="off">
-        @else
-        <form class="form-horizontal" method="post" action="{{ route('licenses.checkin', $licenseseat->id) }}" autocomplete="off">
-        @endif
-        {{csrf_field()}}
+                <div class="box box-default">
+                    <div class="box-header with-border">
+                        <h3 class="box-title"> {{ $licenseSeat->license->name }}</h3>
+                    </div>
+                    <div class="box-body">
 
-            <!-- Asset name -->
+            <!-- license name -->
             <div class="form-group">
                 <label class="col-sm-2 control-label">{{ trans('admin/hardware/form.name') }}</label>
                 <div class="col-md-6">
-                    <p class="form-control-static">{{ $licenseseat->license->name }}</p>
+                    <p class="form-control-static">{{ $licenseSeat->license->name }}</p>
                 </div>
             </div>
 
@@ -35,7 +38,7 @@
             <div class="form-group">
                 <label class="col-sm-2 control-label">{{ trans('admin/hardware/form.serial') }}</label>
                 <div class="col-md-6">
-                    <p class="form-control-static">{{ $licenseseat->license->serial }}</p>
+                    <p class="form-control-static">{{ $licenseSeat->license->serial }}</p>
                 </div>
             </div>
 
@@ -43,20 +46,18 @@
             <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
                 <label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label>
                 <div class="col-md-7">
-                    <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $licenseseat->note) }}</textarea>
+                    <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $licenseSeat->note) }}</textarea>
                     {!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
                 </div>
             </div>
-            <!-- Form actions -->
-            <div class="form-group">
-                <label class="col-md-2 control-label"></label>
-                <div class="col-md-7">
-                    <a class="btn btn-link" href="{{ route('licenses.index') }}">{{ trans('button.cancel') }}</a>
-                    <button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.checkin') }}</button>
-                </div>
-            </div>
-        </form>
-    </div> <!-- .col-md-10-->
-</div>
+                        <div class="box-footer">
+                            <a class="btn btn-link" href="{{ route('licenses.index') }}">{{ trans('button.cancel') }}</a>
+                            <button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkin') }}</button>
+                        </div>
+                    </div> <!-- /.box-->
+            </form>
+        </div> <!-- /.col-md-7-->
+    </div>
+
 
 @stop

resources/views/locations/edit.blade.php

@@ -62,7 +62,7 @@
 
 @if (!$item->id)
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
 
     var $eventSelect = $(".parent");
     $eventSelect.on("change", function () { parent_details($eventSelect.val()); });

resources/views/modals/user.blade.php

@@ -1,7 +1,7 @@
 
 <script src="/js/pGenerator.jquery.js"></script>
 
-<script>
+<script nonce="{{ csrf_token() }}">
     $(document).ready(function () {
 
         $('#genPassword').pGenerator({

resources/views/partials/bootstrap-table.blade.php

@@ -13,7 +13,7 @@
 <script src="{{ asset('js/extensions/toolbar/bootstrap-table-toolbar.js') }}"></script>
 @endif
 
-<script>
+<script nonce="{{ csrf_token() }}">
 $('.snipe-table').bootstrapTable({
         classes: 'table table-responsive table-no-bordered',
         undefinedText: '',
@@ -139,8 +139,30 @@ $('.snipe-table').bootstrapTable({
     // Use this when we're introspecting into a column object and need to link
     function genericColumnObjLinkFormatter(destination) {
         return function (value,row) {
-            if (value.status_type) {
-                return '<a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a> ' + '<label class="label label-default">'+ value.status_type + '</label>';
+            if ((value) && (value.status_meta)) {
+
+                var text_color;
+                var icon_style;
+
+                switch (value.status_meta) {
+                    case 'deployed':
+                        text_color = 'blue';
+                        icon_style = 'fa-circle';
+                    break;
+                    case 'deployable':
+                        text_color = 'green';
+                        icon_style = 'fa-circle';
+                    break;
+                    case 'pending':
+                        text_color = 'orange';
+                        icon_style = 'fa-circle';
+                        break;
+                    default:
+                        text_color = 'red';
+                        icon_style = 'fa-times';
+                }
+
+                return '<a href="{{ url('/') }}/' + destination + '/' + value.id + '" data-tooltip="true" title="'+ value.status_meta + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + '</a> ';
             } else if ((value) && (value.name)) {
                 return '<a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a>';
             }
@@ -183,26 +205,34 @@ $('.snipe-table').bootstrapTable({
     function polymorphicItemFormatter(value) {
 
         var item_destination = '';
+        var item_icon;
 
         if ((value) && (value.type)) {
 
             if (value.type == 'asset') {
                 item_destination = 'hardware';
+                item_icon = 'fa-barcode';
             } else if (value.type == 'accessory') {
                 item_destination = 'accessories';
+                item_icon = 'fa-keyboard-o';
             } else if (value.type == 'component') {
                 item_destination = 'components';
+                item_icon = 'fa-hdd-o';
             } else if (value.type == 'consumable') {
                 item_destination = 'consumables';
+                item_icon = 'fa-tint';
             } else if (value.type == 'license') {
                 item_destination = 'licenses';
+                item_icon = 'fa-floppy-o';
             } else if (value.type == 'user') {
                 item_destination = 'users';
+                item_icon = 'fa-user';
             } else if (value.type == 'location') {
                 item_destination = 'locations'
+                item_icon = 'fa-map-marker';
             }
 
-            return '<a href="{{ url('/') }}/' + item_destination +'/' + value.id + '"> ' + value.name + '</a>';
+            return '<a href="{{ url('/') }}/' + item_destination +'/' + value.id + '" data-tooltip="true" title="' + value.type + '"><i class="fa ' + item_icon + ' text-blue"></i> ' + value.name + '</a>';
 
         } else {
             return '';

resources/views/settings/api.blade.php

@@ -14,8 +14,8 @@
 @section('content')
     @if (!config('app.lock_passwords'))
         <div id="app">
-            <passport-clients></passport-clients>
-            <passport-authorized-clients></passport-authorized-clients>
+            <passport-clients clients-url="{{ url('oauth/clients') }}"></passport-clients>
+            <passport-authorized-clients clients-url="{{ url('oauth/clients') }}" tokens-url="{{ url('oauth/tokens') }}"></passport-authorized-clients>
         </div>
     @else
         <p class="help-block">{{ trans('general.feature_disabled') }}</p>
@@ -24,7 +24,7 @@
 @stop
 
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
     new Vue({
         el: "#app",
     });

resources/views/settings/branding.blade.php

@@ -146,7 +146,7 @@
 
 @section('moar_scripts')
     <!-- bootstrap color picker -->
-    <script>
+    <script nonce="{{ csrf_token() }}">
         //color picker with addon
         $(".header-color").colorpicker();
         // toggle the disabled state of asset id prefix

resources/views/settings/general.blade.php

@@ -199,7 +199,7 @@
 
 @section('moar_scripts')
     <!-- bootstrap color picker -->
-    <script>
+    <script nonce="{{ csrf_token() }}">
         //color picker with addon
         $(".header-color").colorpicker();
         // toggle the disabled state of asset id prefix

resources/views/settings/labels.blade.php

@@ -32,7 +32,7 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h4 class="box-title">
-                        <i class="fa fa-lock"></i> Security
+                        <i class="fa fa-tags"></i> Labels
                     </h4>
                 </div>
                 <div class="box-body">

resources/views/settings/ldap.blade.php

@@ -372,7 +372,7 @@
 @stop
 
 @section('moar_scripts')
-    <script>
+    <script nonce="{{ csrf_token() }}">
         $("#ldaptest").click(function(){
             $("#ldaptestrow").removeClass('success');
             $("#ldaptestrow").removeClass('danger');

resources/views/statuslabels/edit.blade.php

@@ -57,7 +57,7 @@
 
 @section('moar_scripts')
     <!-- bootstrap color picker -->
-    <script>
+    <script nonce="{{ csrf_token() }}">
         //color picker with addon
         $(".color").colorpicker();
     </script>

resources/views/statuslabels/index.blade.php

@@ -46,6 +46,12 @@
   <div class="col-md-3">
     <h4>{{ trans('admin/statuslabels/table.about') }}</h4>
     <p>{{ trans('admin/statuslabels/table.info') }}</p>
+
+      <p><i class="fa fa-circle text-green"></i> <strong>{{ trans('admin/statuslabels/table.deployable') }}</strong>: {!!  trans('admin/statuslabels/message.help.deployable')  !!}</p>
+      <p><i class="fa fa-circle text-orange"></i> <strong>Pending</strong>: {{ trans('admin/statuslabels/message.help.pending') }}</p>
+      <p><i class="fa fa-times text-red"></i> <strong>Undeployable</strong>: {{ trans('admin/statuslabels/message.help.undeployable') }}</p>
+      <p><i class="fa fa-times text-red"></i> <strong>Archived</strong>: {{ trans('admin/statuslabels/message.help.archived') }}</p>
+
   </div>
 
 </div>
@@ -54,7 +60,7 @@
 @section('moar_scripts')
 @include ('partials.bootstrap-table', ['exportFile' => 'statuslabels-export', 'search' => true])
 
-  <script>
+  <script nonce="{{ csrf_token() }}">
       function colorSqFormatter(value, row) {
           if (value) {
               return '<span class="label" style="background-color: ' + value + ';">&nbsp;</span> ' + value;

resources/views/users/edit.blade.php

@@ -553,7 +553,7 @@
 @stop
 
 @section('moar_scripts')
-<script>
+<script nonce="{{ csrf_token() }}">
 $(document).ready(function() {
 
 	$('#email').on('keyup',function(){
@@ -570,7 +570,7 @@ $(document).ready(function() {
 });
 </script>
 
-<script>
+<script nonce="{{ csrf_token() }}">
 $('tr.header-row input:radio').click(function() {
   value = $(this).attr('value');
   $(this).parent().parent().siblings().each(function() {
@@ -585,7 +585,7 @@ $('.header-name').click(function() {
 
 <script src="{{ asset('js/pGenerator.jquery.js') }}"></script>
 
-<script>
+<script nonce="{{ csrf_token() }}">
 
 
 $(document).ready(function(){

resources/views/users/index.blade.php

@@ -86,7 +86,7 @@
     'columns' => \App\Presenters\UserPresenter::dataTableLayout()
 ])
 
-<script>
+<script nonce="{{ csrf_token() }}">
 
     function groupsFormatter(value) {
 

resources/views/users/view.blade.php

@@ -426,7 +426,7 @@
                       </td>
                       <td>
                         @can('update', $user)
-                        <a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('delete/userfile', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?"><i class="fa fa-trash icon-white"></i></a>
+                        <a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('userfile.destroy', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?"><i class="fa fa-trash icon-white"></i></a>
                         @endcan
                       </td>
                     </tr>
@@ -491,7 +491,7 @@
 
 @section('moar_scripts')
   @include ('partials.bootstrap-table', ['simple_view' => true])
-<script>
+<script nonce="{{ csrf_token() }}">
 $(function () {
     //binds to onchange event of your input field
     var uploadedFileSize = 0;

routes/web/licenses.php

@@ -25,7 +25,7 @@ Route::group([ 'prefix' => 'licenses', 'middleware' => ['auth'] ], function () {
     ]);
 
     Route::post('{licenseId}/checkin/{backto?}', [
-    'as' => 'licenses.checkin',
+    'as' => 'licenses.checkin.save',
     'uses' => 'LicensesController@postCheckin'
     ]);
 

routes/web/users.php

@@ -13,9 +13,9 @@ Route::group([ 'prefix' => 'users', 'middleware' => ['auth']], function () {
     Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'UsersController@getRestore' ]);
     Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend' ]);
     Route::post('{userId}/upload', [ 'as' => 'upload/user', 'uses' => 'UsersController@postUpload' ]);
-    Route::get(
+    Route::delete(
         '{userId}/deletefile/{fileId}',
-        [ 'as' => 'delete/userfile', 'uses' => 'UsersController@getDeleteFile' ]
+        [ 'as' => 'userfile.destroy', 'uses' => 'UsersController@getDeleteFile' ]
     );
     Route::get(
         '{userId}/showfile/{fileId}',

snipeit.sh

@@ -40,11 +40,11 @@ mkdir $tmp
 
 # Debian/Ubuntu friendly f(x)s
 progress () {
-	while kill -0 "$pid" > /dev/null 2>&1
+    while kill -0 "$pid" > /dev/null 2>&1
         do
-        	for i in "${spin[@]}"
+            for i in "${spin[@]}"
                 do
-                	if [ -e /proc/"$pid" ]; then
+                    if [ -e /proc/"$pid" ]; then
                         echo -ne "\b$i"
                         sleep .1
                         else
@@ -54,60 +54,61 @@ progress () {
         done
 }
 
+#Used for Debian and Ubuntu
 vhenvfile () {
-		find /etc/apache2/mods-enabled -maxdepth 1 -name 'rewrite.load' >/dev/null 2>&1
-		apachefile=/etc/apache2/sites-available/$name.conf
-		echo "* Create Virtual host for apache."
-		{
-			echo "<VirtualHost *:80>"
-			echo "ServerAdmin webmaster@localhost"
-			echo "<Directory $webdir/$name/public>"
-			echo "        Require all granted"
-			echo "        AllowOverride All"
-			echo "   </Directory>"
-			echo "    DocumentRoot $webdir/$name/public"
-			echo "    ServerName $fqdn"
-			echo "        ErrorLog /var/log/apache2/snipeIT.error.log"
-			echo "        CustomLog /var/log/apache2/access.log combined"
-			echo "</VirtualHost>"
-		} >> $apachefile
-		echo >> $hosts "127.0.0.1 $hostname $fqdn"
-		log "a2ensite $name.conf"
+    find /etc/apache2/mods-enabled -maxdepth 1 -name 'rewrite.load' >/dev/null 2>&1
+    apachefile=/etc/apache2/sites-available/$name.conf
+    echo "* Create Virtual host for apache."
+    {
+        echo "<VirtualHost *:80>"
+        echo "ServerAdmin webmaster@localhost"
+        echo "<Directory $webdir/$name/public>"
+        echo "        Require all granted"
+        echo "        AllowOverride All"
+        echo "   </Directory>"
+        echo "    DocumentRoot $webdir/$name/public"
+        echo "    ServerName $fqdn"
+        echo "        ErrorLog /var/log/apache2/snipeIT.error.log"
+        echo "        CustomLog /var/log/apache2/access.log combined"
+        echo "</VirtualHost>"
+    } >> $apachefile
+    echo >> $hosts "127.0.0.1 $hostname $fqdn"
+    log "a2ensite $name.conf"
 
-		cat > "$webdir/$name/.env" <<-EOF
-		#Created By Snipe-it Installer
-		APP_TIMEZONE=$(cat /etc/timezone)
-		DB_HOST=localhost
-		DB_DATABASE=snipeit
-		DB_USERNAME=snipeit
-		DB_PASSWORD=$mysqluserpw
-		APP_URL=http://$fqdn
-		APP_KEY=$random32
-		EOF
+    cp $webdir/$name/.env.example $webdir/$name/.env
+
+    sed -i '1 i\#Created By Snipe-it Installer' $webdir/$name/.env
+    sed -i 's,^\(APP_TIMEZONE=\).*,\1'$(cat /etc/timezone)',' $webdir/$name/.env
+    sed -i 's,^\(DB_HOST=\).*,\1'localhost',' $webdir/$name/.env
+    sed -i 's,^\(DB_DATABASE=\).*,\1'snipeit',' $webdir/$name/.env
+    sed -i 's,^\(DB_USERNAME=\).*,\1'snipeit',' $webdir/$name/.env
+    sed -i 's,^\(DB_PASSWORD=\).*,\1'$mysqluserpw',' $webdir/$name/.env
+    sed -i 's,^\(APP_URL=\).*,\1'http://$fqdn',' $webdir/$name/.env
+    sed -i 's,^\(APP_KEY=\).*,\1'$$random32',' $webdir/$name/.env
 }
 
 perms () {
-	chmod_dirs=( "$webdir/$name/storage" )
-	chmod_dirs+=( "$webdir/$name/storage/private_uploads" )
-	chmod_dirs+=( "$webdir/$name/public/uploads" )
-	#Change permissions on directories
-	for chmod_dir in "${chmod_dirs[@]}"
-	do
-		chmod -R 755 "$chmod_dir"
-	done
+    chmod_dirs=( "$webdir/$name/storage" )
+    chmod_dirs+=( "$webdir/$name/storage/private_uploads" )
+    chmod_dirs+=( "$webdir/$name/public/uploads" )
+    #Change permissions on directories
+    for chmod_dir in "${chmod_dirs[@]}"
+    do
+        chmod -R 755 "$chmod_dir"
+    done
 }
-    
+
 log () {
-	eval "$@" |& tee -a /var/log/snipeit-install.log >/dev/null 2>&1
+    eval "$@" |& tee -a /var/log/snipeit-install.log >/dev/null 2>&1
 }
 
 #CentOS Friendly f(x)s
 function isinstalled {
-	if yum list installed "$@" >/dev/null 2>&1; then
-		true
-	else
-		false
-	fi
+    if yum list installed "$@" >/dev/null 2>&1; then
+        true
+    else
+        false
+    fi
 }
 
 if [ -f /etc/lsb-release ]; then
@@ -115,26 +116,26 @@ if [ -f /etc/lsb-release ]; then
     version="$(lsb_release -s -r)"
     codename="$(lsb_release -c -s)"
 elif [ -f /etc/os-release ]; then
-	distro="$(. /etc/os-release && echo $ID)"
-	version="$(. /etc/os-release && echo $VERSION_ID)"
-	#Order is important here.  If /etc/os-release and /etc/centos-release exist, we're on centos 7.
-	#If only /etc/centos-release exist, we're on centos6(or earlier).  Centos-release is less parsable,
-	#so lets assume that it's version 6 (Plus, who would be doing a new install of anything on centos5 at this point..)
+    distro="$(. /etc/os-release && echo $ID)"
+    version="$(. /etc/os-release && echo $VERSION_ID)"
+    #Order is important here.  If /etc/os-release and /etc/centos-release exist, we're on centos 7.
+    #If only /etc/centos-release exist, we're on centos6(or earlier).  Centos-release is less parsable,
+    #so lets assume that it's version 6 (Plus, who would be doing a new install of anything on centos5 at this point..)
 elif [ -f /etc/centos-release ]; then
-	distro="Centos"
-	version="6"
+    distro="Centos"
+    version="6"
 else
-	distro="unsupported"
+    distro="unsupported"
 fi
 
 
 echo "
-	   _____       _                  __________
-	  / ___/____  (_)___  ___        /  _/_  __/
-	  \__ \/ __ \/ / __ \/ _ \______ / /  / /
-	 ___/ / / / / / /_/ /  __/_____// /  / /
-	/____/_/ /_/_/ .___/\___/     /___/ /_/
-	            /_/
+       _____       _                  __________
+      / ___/____  (_)___  ___        /  _/_  __/
+      \__ \/ __ \/ / __ \/ _ \______ / /  / /
+     ___/ / / / / / /_/ /  __/_____// /  / /
+    /____/_/ /_/_/ .___/\___/     /___/ /_/
+                /_/
 "
 
 echo ""
@@ -143,22 +144,22 @@ echo "  Welcome to Snipe-IT Inventory Installer for Centos, Debian and Ubuntu!"
 echo ""
 shopt -s nocasematch
 case $distro in
-        *Ubuntu*)
-                echo "  The installer has detected Ubuntu version $version as the OS."
-                distro=ubuntu
-                ;;
-		*Debian*)
-                echo "  The installer has detected Debian version $version as the OS."
-                distro=debian
-                ;;
-        *centos*|*redhat*|*ol*|*rhel*)
-                echo "  The installer has detected $distro version $version as the OS."
-                distro=centos
-                ;;
-        *)
-                echo "  The installer was unable to determine your OS. Exiting for safety."
-                exit
-                ;;
+    *Ubuntu*)
+        echo "  The installer has detected Ubuntu version $version as the OS."
+        distro=ubuntu
+        ;;
+    *Debian*)
+        echo "  The installer has detected Debian version $version as the OS."
+        distro=debian
+        ;;
+    *centos*|*redhat*|*ol*|*rhel*)
+        echo "  The installer has detected $distro version $version as the OS."
+        distro=centos
+        ;;
+    *)
+        echo "  The installer was unable to determine your OS. Exiting for safety."
+        exit
+        ;;
 esac
 shopt -u nocasematch
 #Get your FQDN.
@@ -166,29 +167,29 @@ shopt -u nocasematch
 echo -n "  Q. What is the FQDN of your server? ($fqdn): "
 read fqdn
 if [ -z "$fqdn" ]; then
-        fqdn="$(hostname --fqdn)"
+    fqdn="$(hostname --fqdn)"
 fi
 echo "     Setting to $fqdn"
 echo ""
 
 #Do you want to set your own passwords, or have me generate random ones?
 until [[ $ans == "yes" ]] || [[ $ans == "no" ]]; do
-echo -n "  Q. Do you want me to automatically create the snipe database user password? (y/n) "
+echo -n "  Q. Do you want to automatically create the database user password? (y/n) "
 read setpw
 
 case $setpw in
-        [yY] | [yY][Ee][Ss] )
-                mysqluserpw="$(echo `< /dev/urandom tr -dc _A-Za-z-0-9 | head -c16`)"
-                ans="yes"
-                ;;
-        [nN] | [n|N][O|o] )
-                echo -n  "  Q. What do you want your snipeit user password to be?"
-                read -s mysqluserpw
-                echo ""
-		ans="no"
-                ;;
-        *) 	echo "  Invalid answer. Please type y or n"
-                ;;
+    [yY] | [yY][Ee][Ss] )
+        mysqluserpw="$(echo `< /dev/urandom tr -dc _A-Za-z-0-9 | head -c16`)"
+        ans="yes"
+        ;;
+    [nN] | [n|N][O|o] )
+        echo -n  "  Q. What do you want your snipeit user password to be?"
+        read -s mysqluserpw
+        echo ""
+    ans="no"
+        ;;
+    *)  echo "  Invalid answer. Please type y or n"
+        ;;
 esac
 done
 
@@ -207,346 +208,349 @@ chmod 700 $dbsetup
 ## TODO: Progress tracker on each step
 
 case $distro in
-	debian)
-		#####################################  Install for Debian ##############################################
-		#Update/upgrade Debian/Ubuntu repositories, get the latest version of git.
-		#Git clone snipeit, create vhost, edit hosts file, create .env file, mysql install
-		#composer install, set permissions, restart apache.
-		#BTW, Debian, I swear, you're such a pain.
+    debian)
+        #####################################  Install for Debian ##############################################
+        #Update/upgrade Debian/Ubuntu repositories, get the latest version of git.
+        #Git clone snipeit, create vhost, edit hosts file, create .env file, mysql install
+        #composer install, set permissions, restart apache.
+        #BTW, Debian, I swear, you're such a pain.
 
-		webdir=/var/www
-		echo -e "\n* Updating Debian packages in the background... ${spin[0]}\n"
-		apt-get update >> /var/log/snipeit-install.log & pid=$! 2>&1
-		wait
-		apt-get upgrade >> /var/log/snipeit-install.log & pid=$! 2>&1
-		wait
-		echo -e "\n* Installing packages... ${spin[0]}\n"
-		echo -e "\n* Going to suppress more messages that you don't need to worry about. Please wait... ${spin[0]}"
-		DEBIAN_FRONTEND=noninteractive apt-get -y install mariadb-server mariadb-client apache2 git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap libapache2-mod-php5 curl >> /var/log/snipeit-install.log & pid=$! 2>&1
-		progress
-		wait
-		echo -e "\n* Cloning Snipeit, extracting to $webdir/$name..."
-		git clone https://github.com/snipe/snipe-it $webdir/$name >> /var/log/snipeit-install.log & pid=$! 2>&1
-		progress
-		php5enmod mcrypt >> /var/log/snipeit-install.log 2>&1
-		a2enmod rewrite >> /var/log/snipeit-install.log 2>&1
-		vhenvfile
-		wait
-		echo >> $hosts "127.0.0.1 $hostname $fqdn"
-		a2ensite $name.conf
-		echo -e "* Modify the Snipe-It files necessary for a production environment.\n* Securing Mysql"
-		# Have user set own root password when securing install
-		# and just set the snipeit database user at the beginning
-		/usr/bin/mysql_secure_installation
-		echo -e "* Creating Mysql Database and User.\n##  Please Input your MySQL/MariaDB root password: "
-		mysql -u root -p < $dbsetup
-		cd $webdir/$name/
-		curl -sS https://getcomposer.org/installer | php
-		php composer.phar install --no-dev --prefer-source
-		perms
-		service apache2 restart
-		php artisan key:generate
-		php artisan passport:install
-		;;
-	ubuntu)
-		#####################################  Install for Ubuntu  ##############################################
-		#Update/upgrade Debian/Ubuntu repositories, get the latest version of git.
-		#Git clone snipeit, create vhost, .env file, mysql install
-		#composer install, set permissions, restart apache.
-
-		webdir=/var/www
-		echo -ne "\n* Adding MariaDB repo in the background... ${spin[0]}"
-		(echo "deb [arch=amd64,i386] http://ftp.hosteurope.de/mirror/mariadb.org/repo/10.1/ubuntu $codename main" | tee /etc/apt/sources.list.d/mariadb.list >/dev/null 2>&1)
-		log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8"
-		echo -ne "\n* Updating with apt-get update in the background... ${spin[0]}"
-		log "apt-get update" & pid=$!
-		[ -f /var/lib/dpkg/lock ] && rm -f /var/lib/dpkg/lock
-		progress
-		echo -ne "\n* Upgrading packages with apt-get upgrade in the background... ${spin[0]}"
-		log "apt-get -y upgrade" & pid=$!
-		progress
-		echo -ne "\n* Setting up LAMP in the background... ${spin[0]}\n"
-		log "DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server mariadb-client apache2 libapache2-mod-php curl" & pid=$!
-		progress
-		if [ "$version" == "16.04" ]; then
-			log "apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml" & pid=$!
-			progress
-			log "phpenmod mcrypt"
-			log "phpenmod mbstring"
-			log "a2enmod rewrite"
-		else
-			log "apt-get install -y git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap" & pid=$!
-			progress
-			log "php5enmod mcrypt"
-			log "a2enmod rewrite"
-		fi
-		echo -ne "\n* Cloning Snipeit, extracting to $webdir/$name... ${spin[0]}"
-		log "git clone https://github.com/snipe/snipe-it $webdir/$name" & pid=$!
-		progress
-		vhenvfile
-		echo -e "* MySQL Phase next.\n"
-		service mysql status >/dev/null || service mysql start
-		/usr/bin/mysql_secure_installation
-		echo -e "* Creating MySQL Database and user.\n* Please Input your MySQL/MariaDB root password created in the previous step.: "
-		mysql -u root -p < $dbsetup
-		echo -e "\n* Securing Mysql\n* Installing and configuring composer"
-		cd $webdir/$name/
-		curl -sS https://getcomposer.org/installer  | php
-		php composer.phar install --no-dev --prefer-source
-		perms
-		chown -R www-data:www-data "/var/www/$name"
-		service apache2 restart
+        webdir=/var/www
+        echo -e "\n* Updating Debian packages in the background... ${spin[0]}\n"
+        apt-get update >> /var/log/snipeit-install.log & pid=$! 2>&1
+        wait
+        apt-get upgrade >> /var/log/snipeit-install.log & pid=$! 2>&1
+        wait
+        echo -e "\n* Installing packages... ${spin[0]}\n"
+        echo -e "\n* Going to suppress more messages that you don't need to worry about. Please wait... ${spin[0]}"
+        DEBIAN_FRONTEND=noninteractive apt-get -y install mariadb-server mariadb-client apache2 git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap libapache2-mod-php5 curl >> /var/log/snipeit-install.log & pid=$! 2>&1
+        progress
+        wait
+        echo -e "\n* Cloning Snipeit, extracting to $webdir/$name..."
+        git clone https://github.com/snipe/snipe-it $webdir/$name >> /var/log/snipeit-install.log & pid=$! 2>&1
+        progress
+        php5enmod mcrypt >> /var/log/snipeit-install.log 2>&1
+        a2enmod rewrite >> /var/log/snipeit-install.log 2>&1
+        vhenvfile
+        wait
+        echo >> $hosts "127.0.0.1 $hostname $fqdn"
+        a2ensite $name.conf
+        echo -e "* Modify the Snipe-It files necessary for a production environment.\n* Securing Mysql"
+        # Have user set own root password when securing install
+        # and just set the snipeit database user at the beginning
+        /usr/bin/mysql_secure_installation
+        echo -e "* Creating Mysql Database and User.\n##  Please Input your MySQL/MariaDB root password: "
+        mysql -u root -p < $dbsetup
+        cd $webdir/$name/
+        curl -sS https://getcomposer.org/installer | php
+        php composer.phar install --no-dev --prefer-source
+        perms
+        service apache2 restart
         php artisan key:generate
         php artisan passport:install
-		;;
-	centos )
-	if [[ "$version" =~ ^6 ]]; then
-		#####################################  Install for Centos/Redhat 6  ##############################################
+        ;;
+    ubuntu)
+        #####################################  Install for Ubuntu  ##############################################
+        #Update/upgrade Debian/Ubuntu repositories, get the latest version of git.
+        #Git clone snipeit, create vhost, .env file, mysql install
+        #composer install, set permissions, restart apache.
 
-		webdir=/var/www/html
-		#Allow us to get the mysql engine
-		echo ""
-		echo "##  Adding IUS, epel-release and mariaDB repos.";
-		mariadbRepo=/etc/yum.repos.d/MariaDB.repo
-		touch "$mariadbRepo"
-		{
-			echo "[mariadb]"
-			echo "name = MariaDB"
-			echo "baseurl = http://yum.mariadb.org/10.0/centos6-amd64"
-			echo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
-			echo "gpgcheck=1"
-			echo "enable=1"
-		} >> "$mariadbRepo"
-
-		log "yum -y install wget epel-release"
-		log "wget -P "$tmp/" https://centos6.iuscommunity.org/ius-release.rpm"
-		log "rpm -Uvh "$tmp/ius-release*.rpm""
-
-		#Install PHP and other needed stuff.
-		echo "##  Installing PHP and other needed stuff";
-		PACKAGES="httpd MariaDB-server git unzip php56u php56u-mysqlnd php56u-bcmath php56u-cli php56u-common php56u-embedded php56u-gd php56u-mbstring php56u-mcrypt php56u-ldap"
-
-		for p in $PACKAGES;do
-			if isinstalled "$p"; then
-				echo " ## $p already installed"
-			else
-				echo -n " ## installing $p ... "
-				log "yum -y install $p"
-				echo "";
-			fi
-		done;
-
-		echo -e "\n##  Downloading Snipe-IT from github and putting it in the web directory.";
-
-		log "wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file"
-		unzip -qo $tmp/$file -d $tmp/
-		cp -R $tmp/$fileName $webdir/$name
-
-		# Make mariaDB start on boot and restart the daemon
-		echo "##  Starting the mariaDB server.";
-		chkconfig mysql on
-		/sbin/service mysql start
-
-		echo "##  Securing mariaDB server.";
-		/usr/bin/mysql_secure_installation
-
-		echo "##  Creating MySQL Database/User."
-		echo "##  Please Input your MySQL/MariaDB root password: "
-		mysql -u root -p < $dbsetup
-
-		#Create the new virtual host in Apache and enable rewrite
-		echo "##  Creating the new virtual host in Apache.";
-		apachefile=/etc/httpd/conf.d/$name.conf
-
-		{
-			echo ""
-			echo ""
-			echo ""
-			echo "<VirtualHost *:80>"
-			echo "ServerAdmin webmaster@localhost"
-			echo "    <Directory $webdir/$name/public>"
-			echo "        Allow From All"
-			echo "        AllowOverride All"
-			echo "        Options +Indexes"
-			echo "   </Directory>"
-			echo "    DocumentRoot $webdir/$name/public"
-			echo "    ServerName $fqdn"
-			echo "        ErrorLog /var/log/httpd/snipeIT.error.log"
-			echo "        CustomLog /var/log/access.log combined"
-			echo "</VirtualHost>"
-		} >> "$apachefile"
-
-		echo "##  Setting up hosts file.";
-		echo >> $hosts "127.0.0.1 $hostname $fqdn"
-
-		# Make apache start on boot and restart the daemon
-		echo "##  Starting the apache server.";
-		chkconfig httpd on
-		/sbin/service httpd start
-
-		tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g');
-		echo "## Configuring .env file."
-
-		cat > $webdir/$name/.env <<-EOF
-		#Created By Snipe-it Installer
-		APP_TIMEZONE=$tzone
-		DB_HOST=localhost
-		DB_DATABASE=snipeit
-		DB_USERNAME=snipeit
-		DB_PASSWORD=$mysqluserpw
-		APP_URL=http://$fqdn
-		APP_KEY=$random32
-		DB_DUMP_PATH='/usr/bin'
-		EOF
-
-		echo "##  Configure composer"
-		cd $webdir/$name
-		curl -sS https://getcomposer.org/installer | php
-		php composer.phar install --no-dev --prefer-source
-
-		perms
-		chown -R apache:apache $webdir/$name
-
-                /sbin/service iptables status >/dev/null 2>&1
-                if [ $? = 0 ]; then
-                      #Open http/https port
-                      iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT
-                      iptables -I INPUT 1 -p tcp -m tcp --dport 443 -j ACCEPT
-                      #Save iptables
-                      service iptables save
-                fi
-
-	       service httpd restart
-	       php artisan key:generate
-           php artisan passport:install
-
-	elif [[ "$version" =~ ^7 ]]; then
-		#####################################  Install for Centos/Redhat 7  ##############################################
-
-		webdir=/var/www/html
-
-		#Allow us to get the mysql engine
-		echo -e "\n##  Add IUS, epel-release and mariaDB repos.";
-		log "yum -y install wget epel-release"
-		log "wget -P $tmp/ https://centos7.iuscommunity.org/ius-release.rpm"
-		log "rpm -Uvh $tmp/ius-release*.rpm"
-
-		#Install PHP and other needed stuff.
-		echo "##  Installing PHP and other needed stuff";
-		PACKAGES="httpd mariadb-server git unzip php56u php56u-mysqlnd php56u-bcmath php56u-cli php56u-common php56u-embedded php56u-gd php56u-mbstring php56u-mcrypt php56u-ldap"
-
-		for p in $PACKAGES;do
-			if isinstalled "$p"; then
-				echo " ## $p already installed"
-			else
-				echo -n " ## installing $p ... "
-				log "yum -y install $p"
-			echo "";
-			fi
-		done;
-
-		echo -e "\n##  Downloading Snipe-IT from github and put it in the web directory.";
-
-		log "git clone https://github.com/snipe/snipe-it $webdir/$name"
-
-		# Make mariaDB start on boot and restart the daemon
-		echo "##  Starting the mariaDB server.";
-		systemctl enable mariadb.service
-		systemctl start mariadb.service
-
-		echo "##  Securing mariaDB server.";
-		echo "";
-		echo "";
-		/usr/bin/mysql_secure_installation
-
-		echo "##  Creating MySQL Database/User."
-		echo "##  Please Input your MySQL/MariaDB root password "
-		mysql -u root -p < "$dbsetup"
-
-		##TODO make sure the apachefile doesnt exist isnt already in there
-
-		#Create the new virtual host in Apache and enable rewrite
-		apachefile="/etc/httpd/conf.d/$name.conf"
-
-		{
-			echo "##  Creating the new virtual host in Apache.";
-			echo ""
-			echo ""
-			echo "LoadModule rewrite_module modules/mod_rewrite.so"
-			echo ""
-			echo "<VirtualHost *:80>"
-			echo "ServerAdmin webmaster@localhost"
-			echo "    <Directory $webdir/$name/public>"
-			echo "        Allow From All"
-			echo "        AllowOverride All"
-			echo "        Options +Indexes"
-			echo "   </Directory>"
-			echo "    DocumentRoot $webdir/$name/public"
-			echo "    ServerName $fqdn"
-			echo "        ErrorLog /var/log/httpd/snipeIT.error.log"
-			echo "        CustomLog /var/log/access.log combined"
-			echo "</VirtualHost>"
-		} >> "$apachefile"
-
-##TODO make sure this isnt already in there
-		echo "##  Setting up hosts file.";
-		echo >> $hosts "127.0.0.1 $hostname $fqdn"
-
-		echo "##  Starting the apache server.";
-		# Make apache start on boot and restart the daemon
-		systemctl enable httpd.service
-		systemctl restart httpd.service
-
-		tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}');
-		echo "## Configuring .env file."
-
-		cat > $webdir/$name/.env <<-EOF
-		#Created By Snipe-it Installer
-		APP_TIMEZONE=$tzone
-		DB_HOST=localhost
-		DB_DATABASE=snipeit
-		DB_USERNAME=snipeit
-		DB_PASSWORD=$mysqluserpw
-		APP_URL=http://$fqdn
-		APP_KEY=$random32
-		DB_DUMP_PATH='/usr/bin'
-		EOF
-
-		# Change permissions on directories
-
-
-		#Install / configure composer
-		cd $webdir/$name
-
-		curl -sS https://getcomposer.org/installer | php
-		php composer.phar install --no-dev --prefer-source
-
-		perms
-		chown -R apache:apache $webdir/$name
-		# Make SeLinux happy
-		chcon -R -h -t httpd_sys_script_rw_t $webdir/$name/
-
-          	#Check if SELinux is enforcing
-	       	if [ "$(getenforce)" == "Enforcing" ]; then
-	 	       #Add SELinux and firewall exception/rules.
-		       #Required for ldap integration
-	       	       setsebool -P httpd_can_connect_ldap on
-	 	       #Sets SELinux context type so that scripts running in the web server process are allowed read/write access
-	 	       chcon -R -h -t httpd_sys_script_rw_t $webdir/$name/
- 	       	fi
-
-		systemctl restart httpd.service
-		php artisan key:generate
+        webdir=/var/www
+        echo -ne "\n* Adding MariaDB repo in the background... ${spin[0]}"
+        (echo "deb [arch=amd64,i386] http://ftp.hosteurope.de/mirror/mariadb.org/repo/10.1/ubuntu $codename main" | tee /etc/apt/sources.list.d/mariadb.list >/dev/null 2>&1)
+        log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8"
+        echo -ne "\n* Updating with apt-get update in the background... ${spin[0]}"
+        log "apt-get update" & pid=$!
+        [ -f /var/lib/dpkg/lock ] && rm -f /var/lib/dpkg/lock
+        progress
+        echo -ne "\n* Upgrading packages with apt-get upgrade in the background... ${spin[0]}"
+        log "apt-get -y upgrade" & pid=$!
+        progress
+        echo -ne "\n* Setting up LAMP in the background... ${spin[0]}\n"
+        log "DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server mariadb-client apache2 libapache2-mod-php curl" & pid=$!
+        progress
+        if [ "$version" == "16.04" ]; then
+            log "apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml" & pid=$!
+            progress
+            log "phpenmod mcrypt"
+            log "phpenmod mbstring"
+            log "a2enmod rewrite"
+        else
+            log "apt-get install -y git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap" & pid=$!
+            progress
+            log "php5enmod mcrypt"
+            log "a2enmod rewrite"
+        fi
+        echo -ne "\n* Cloning Snipeit, extracting to $webdir/$name... ${spin[0]}"
+        log "git clone https://github.com/snipe/snipe-it $webdir/$name" & pid=$!
+        progress
+        vhenvfile
+        echo -e "* MySQL Phase next.\n"
+        service mysql status >/dev/null || service mysql start
+        /usr/bin/mysql_secure_installation
+        echo -e "* Creating MySQL Database and user.\n* Please Input your MySQL/MariaDB root password created in the previous step.: "
+        mysql -u root -p < $dbsetup
+        echo -e "\n* Securing Mysql\n* Installing and configuring composer"
+        cd $webdir/$name/
+        curl -sS https://getcomposer.org/installer  | php
+        php composer.phar install --no-dev --prefer-source
+        perms
+        chown -R www-data:www-data "/var/www/$name"
+        service apache2 restart
+        php artisan key:generate
         php artisan passport:install
+        ;;
+    centos )
+    if [[ "$version" =~ ^6 ]]; then
+        #####################################  Install for Centos/Redhat 6  ##############################################
 
-	else
-		echo "Unable to Handle Centos Version #.  Version Found: " $version
-		return 1
-	fi
+        webdir=/var/www/html
+        #Allow us to get the mysql engine
+        echo ""
+        echo "##  Adding IUS, epel-release and mariaDB repositories.";
+        mariadbRepo=/etc/yum.repos.d/MariaDB.repo
+        touch "$mariadbRepo"
+        {
+            echo "[mariadb]"
+            echo "name = MariaDB"
+            echo "baseurl = http://yum.mariadb.org/10.0/centos6-amd64"
+            echo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
+            echo "gpgcheck=1"
+            echo "enable=1"
+        } >> "$mariadbRepo"
+
+        log "yum -y install wget epel-release"
+        log "wget -P "$tmp/" https://centos6.iuscommunity.org/ius-release.rpm"
+        log "rpm -Uvh "$tmp/ius-release*.rpm""
+
+        #Install PHP and other needed stuff
+        echo "##  Installing PHP and other requirements.";
+        PACKAGES="httpd mariadb-server git unzip php71u php71u-mysqlnd php71u-bcmath php71u-cli php71u-common php71u-embedded php71u-gd php71u-mbstring php71u-mcrypt php71u-ldap php71u-json php71u-simplexml"
+
+        for p in $PACKAGES;do
+            if isinstalled "$p"; then
+                echo " ## $p already installed"
+            else
+                echo -n " ## Installing $p ... "
+                log "yum -y install $p"
+                echo "";
+            fi
+        done;
+
+        echo -e "\n##  Cloning Snipe-IT from github to the web directory.";
+
+        log "git clone https://github.com/snipe/snipe-it $webdir/$name"
+
+        # Make mariaDB start on boot and restart the daemon
+        echo "##  Starting the mariaDB server.";
+        chkconfig mysql on
+        /sbin/service mysql start
+
+        echo "##  Securing mariaDB server.";
+        /usr/bin/mysql_secure_installation
+
+        echo "##  Creating MySQL Database/User."
+        echo "##  Please Input your MySQL/MariaDB root password: "
+        mysql -u root -p < $dbsetup
+
+        #Create the new virtual host in Apache and enable rewrite
+        echo "##  Creating the new virtual host in Apache.";
+        apachefile=/etc/httpd/conf.d/$name.conf
+
+        {
+            echo ""
+            echo ""
+            echo ""
+            echo "<VirtualHost *:80>"
+            echo "ServerAdmin webmaster@localhost"
+            echo "    <Directory $webdir/$name/public>"
+            echo "        Allow From All"
+            echo "        AllowOverride All"
+            echo "        Options +Indexes"
+            echo "   </Directory>"
+            echo "    DocumentRoot $webdir/$name/public"
+            echo "    ServerName $fqdn"
+            echo "        ErrorLog /var/log/httpd/snipeIT.error.log"
+            echo "        CustomLog /var/log/access.log combined"
+            echo "</VirtualHost>"
+        } >> "$apachefile"
+
+        echo "##  Setting up hosts file.";
+        echo >> $hosts "127.0.0.1 $hostname $fqdn"
+
+        # Make apache start on boot and restart the daemon
+        echo "##  Starting the apache server.";
+        chkconfig httpd on
+        /sbin/service httpd start
+
+        tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g');
+        echo "## Configuring .env file."
+
+        cp $webdir/$name/.env.example $webdir/$name/.env
+
+        sed -i '1 i\#Created By Snipe-it Installer' $webdir/$name/.env
+        sed -i 's,^\(APP_TIMEZONE=\).*,\1'$tzone',' $webdir/$name/.env
+        sed -i 's,^\(DB_HOST=\).*,\1'localhost',' $webdir/$name/.env
+        sed -i 's,^\(DB_DATABASE=\).*,\1'snipeit',' $webdir/$name/.env
+        sed -i 's,^\(DB_USERNAME=\).*,\1'snipeit',' $webdir/$name/.env
+        sed -i 's,^\(DB_PASSWORD=\).*,\1'$mysqluserpw',' $webdir/$name/.env
+        sed -i 's,^\(APP_URL=\).*,\1'http://$fqdn',' $webdir/$name/.env
+        sed -i 's,^\(APP_KEY=\).*,\1'$$random32',' $webdir/$name/.env
+
+        echo "##  Configure composer"
+        cd $webdir/$name
+        curl -sS https://getcomposer.org/installer | php
+        php composer.phar install --no-dev --prefer-source
+
+        perms
+        chown -R apache:apache $webdir/$name
+
+        /sbin/service iptables status >/dev/null 2>&1
+        if [ $? = 0 ]; then
+            #Open http/https port
+            iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT
+            iptables -I INPUT 1 -p tcp -m tcp --dport 443 -j ACCEPT
+            #Save iptables
+            service iptables save
+        fi
+
+        service httpd restart
+        
+        echo "##  Generating the application key."
+        php artisan key:generate --force
+
+        echo "##  Artisan Migrate."
+        php artisan migrate --force
+
+    elif [[ "$version" =~ ^7 ]]; then
+        #####################################  Install for Centos/Redhat 7  ##############################################
+
+        webdir=/var/www/html
+
+        #Allow us to get the mysql engine
+        echo -e "\n##  Adding IUS, epel-release and mariaDB repositories.";
+        log "yum -y install wget epel-release"
+        log "wget -P $tmp/ https://centos7.iuscommunity.org/ius-release.rpm"
+        log "rpm -Uvh $tmp/ius-release*.rpm"
+
+        #Install PHP and other requirements
+        echo "##  Installing PHP and other requirements.";
+        PACKAGES="httpd mariadb-server git unzip php71u php71u-mysqlnd php71u-bcmath php71u-cli php71u-common php71u-embedded php71u-gd php71u-mbstring php71u-mcrypt php71u-ldap php71u-json php71u-simplexml"
+
+        for p in $PACKAGES;do
+            if isinstalled "$p"; then
+                echo " ## $p already installed"
+            else
+                echo -n " ## Installing $p ... "
+                log "yum -y install $p"
+            echo "";
+            fi
+        done;
+
+        echo -e "\n##  Cloning Snipe-IT from github to the web directory.";
+
+        log "git clone https://github.com/snipe/snipe-it $webdir/$name"
+
+        # Make mariaDB start on boot and restart the daemon
+        echo "##  Starting the mariaDB server.";
+        systemctl enable mariadb.service
+        systemctl start mariadb.service
+
+        echo "##  Securing mariaDB server.";
+        echo "";
+        echo "";
+        /usr/bin/mysql_secure_installation
+
+        echo "##  Creating MySQL Database/User."
+        echo "##  Please Input your MySQL/MariaDB root password "
+        mysql -u root -p < "$dbsetup"
+
+        ##TODO make sure the apachefile doesnt exist isnt already in there
+
+        #Create the new virtual host in Apache and enable rewrite
+        apachefile="/etc/httpd/conf.d/$name.conf"
+
+        {
+            echo "##  Creating the new virtual host in Apache.";
+            echo ""
+            echo ""
+            echo "LoadModule rewrite_module modules/mod_rewrite.so"
+            echo ""
+            echo "<VirtualHost *:80>"
+            echo "ServerAdmin webmaster@localhost"
+            echo "    <Directory $webdir/$name/public>"
+            echo "        Allow From All"
+            echo "        AllowOverride All"
+            echo "        Options +Indexes"
+            echo "   </Directory>"
+            echo "    DocumentRoot $webdir/$name/public"
+            echo "    ServerName $fqdn"
+            echo "        ErrorLog /var/log/httpd/snipeIT.error.log"
+            echo "        CustomLog /var/log/access.log combined"
+            echo "</VirtualHost>"
+        } >> "$apachefile"
+
+        ##TODO make sure this isnt already in there
+        echo "##  Setting up hosts file.";
+        echo >> $hosts "127.0.0.1 $hostname $fqdn"
+
+        echo "##  Starting the apache server.";
+        # Make apache start on boot and restart the daemon
+        systemctl enable httpd.service
+        systemctl restart httpd.service
+
+        tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}');
+        echo "## Configuring .env file."
+
+        cp $webdir/$name/.env.example $webdir/$name/.env
+
+        sed -i '1 i\#Created By Snipe-it Installer' $webdir/$name/.env
+        sed -i 's,^\(APP_TIMEZONE=\).*,\1'$tzone',' $webdir/$name/.env
+        sed -i 's,^\(DB_HOST=\).*,\1'localhost',' $webdir/$name/.env
+        sed -i 's,^\(DB_DATABASE=\).*,\1'snipeit',' $webdir/$name/.env
+        sed -i 's,^\(DB_USERNAME=\).*,\1'snipeit',' $webdir/$name/.env
+        sed -i 's,^\(DB_PASSWORD=\).*,\1'$mysqluserpw',' $webdir/$name/.env
+        sed -i 's,^\(APP_URL=\).*,\1'http://$fqdn',' $webdir/$name/.env
+        sed -i 's,^\(APP_KEY=\).*,\1'$$random32',' $webdir/$name/.env
+
+        #Install / configure composer
+        cd $webdir/$name
+
+        curl -sS https://getcomposer.org/installer | php
+        php composer.phar install --no-dev --prefer-source
+
+        #Set permissions
+        perms
+        chown -R apache:apache $webdir/$name
+
+        #Check if SELinux is enforcing
+        if [ "$(getenforce)" == "Enforcing" ]; then
+            #Add SELinux and firewall exception/rules
+            #Required for ldap integration
+            setsebool -P httpd_can_connect_ldap on
+            #Sets SELinux context type so that scripts running in the web server process are allowed read/write access
+            chcon -R -h -t httpd_sys_script_rw_t $webdir/$name/
+        fi
+
+        systemctl restart httpd.service
+
+        echo "##  Generating the application key."
+        php artisan key:generate --force
+
+        echo "##  Artisan Migrate."
+        php artisan migrate --force
+
+        echo "##  Creating scheduler cron."
+        (crontab -l ; echo "* * * * * /usr/bin/php $webdir/$name/artisan schedule:run >> /dev/null 2>&1") | crontab -
+    
+    else
+        echo "Unable to Handle Centos Version #.  Version Found: " $version
+        return 1
+    fi
 esac
 
 echo ""
-echo "  ***If you want mail capabilities, edit $webdir/$name/.env and edit based on .env.example***"
+echo "  ***If you want mail capabilities, edit $webdir/$name/.env***"
 echo ""
 echo "  ***Open http://$fqdn to login to Snipe-IT.***"
 echo ""

tests/_data/dump.sql

@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.18, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.19, for Linux (x86_64)
 --
 -- Host: localhost    Database: snipeittests
 -- ------------------------------------------------------
--- Server version	5.7.18-0ubuntu0.16.10.1
+-- Server version	5.7.19-0ubuntu0.17.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1347,7 +1347,7 @@ CREATE TABLE `users` (
   PRIMARY KEY (`id`),
   KEY `users_activation_code_index` (`activation_code`),
   KEY `users_reset_password_code_index` (`reset_password_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=35 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1392,4 +1392,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-05-22 20:08:33
+-- Dump completed on 2017-10-01 15:36:56

tests/_support/Helper/Api.php

@@ -1,10 +1,16 @@
 <?php
 namespace Helper;
 
+use Illuminate\Support\Facades\Artisan;
+
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
 
 class Api extends \Codeception\Module
 {
-
+    public function setupDatabase()
+    {
+        Artisan::call('migrate');
+        Artisan::call('db:seed');
+    }
 }

tests/api.suite.yml

@@ -11,3 +11,4 @@ modules:
             environment_file: .env.testing
             disable_middleware: true
             cleanup: true
+

tests/api/ApiAssetsCest.php

@@ -9,15 +9,16 @@ class ApiAssetsCest
 
     public function _before(ApiTester $I)
     {
+        $I->setupDatabase();
         $this->faker = \Faker\Factory::create();
         $this->user = \App\Models\User::find(1);
-
         $I->amBearerAuthenticated($I->getToken($this->user));
     }
 
     /** @test */
     public function indexAssets(ApiTester $I)
     {
+
         $I->wantTo('Get a list of assets');
 
         // setup