HTTP/HTTPS mixed content errors #612 (#613)

* Configure TrustProxies middleware * Add trusted proxies to deps * Replace jquery request with axios request code * Trust current user IP for forwarded headers * Update dependencies * Downgrade self-updater package for PHP 7.2
2020-03-03 10:20:13 -05:00
parent dcf9f48364
commit 89481b5fa1
26 changed files with 219 additions and 191 deletions
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -140,4 +140,11 @@ else
  artifacts upload --target-paths "/" ${TRAVIS_BRANCH}_version
 fi

-curl -X POST --data "{\"content\": \"A new build is available at http://downloads.phpvms.net/$TAR_NAME (${FULL_VERSION})\"}" -H "Content-Type: application/json" $DISCORD_WEBHOOK_URL
+#if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
+#  echo "Skipping Discord branch update broadcast"
+#else
+  curl -X POST \
+       --data "{\"content\": \"A new build is available at http://downloads.phpvms.net/$TAR_NAME (${FULL_VERSION})\"}" \
+       -H "Content-Type: application/json" \
+       $DISCORD_WEBHOOK_URL
+#fi
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -7,6 +7,7 @@ use App\Http\Middleware\EncryptCookies;
 use App\Http\Middleware\InstalledCheck;
 use App\Http\Middleware\JsonResponse;
 use App\Http\Middleware\RedirectIfAuthenticated;
+use App\Http\Middleware\TrustProxies;
 use App\Http\Middleware\UpdatePending;
 use Illuminate\Auth\Middleware\Authenticate;
 use Illuminate\Auth\Middleware\Authorize;
@@ -23,6 +24,7 @@ use Illuminate\View\Middleware\ShareErrorsFromSession;
 class Kernel extends HttpKernel
 {
    protected $middleware = [
+        TrustProxies::class,
        CheckForMaintenanceMode::class,
        TrimStrings::class,
        ConvertEmptyStringsToNull::class,
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Request;
+
+class TrustProxies extends Middleware
+{
+    /**
+     * The trusted proxies for this application.
+     *
+     * @var array|string
+     */
+    protected $proxies;
+
+    /**
+     * The headers that should be used to detect proxies.
+     *
+     * @var int
+     */
+    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+
+    /**
+     * Set the client as trusted
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $request->setTrustedProxies([$request->getClientIp()], $this->getTrustedHeaderNames());
+        $this->setTrustedProxyIpAddresses($request);
+
+        return $next($request);
+    }
+}
--- a/app/Models/FlightField.php
+++ b/app/Models/FlightField.php
@@ -9,6 +9,7 @@ use App\Contracts\Model;
 *
 * @property string name
 * @property string slug
+ * @property bool   required
 */
 class FlightField extends Model
 {
--- a/composer.json
+++ b/composer.json
@@ -21,10 +21,11 @@
        "anhskohbo/no-captcha": "^3.0",
        "appstract/laravel-opcache": "^2.0",
        "arrilot/laravel-widgets": "~3.13.0",
-        "codedge/laravel-selfupdater": "^2.5",
+        "codedge/laravel-selfupdater": "~2.5.1",
        "doctrine/dbal": "~2.9.2",
        "elcobvg/laravel-opcache": "~0.4",
        "facade/ignition": "^1.6",
+        "fideloper/proxy": "^4.3",
        "guzzlehttp/guzzle": "~6.3.3",
        "hashids/hashids": "^2.0.0",
        "igaster/laravel-theme": "^2.0",
@@ -43,6 +44,7 @@
        "nabeel/vacentral": "~2.0",
        "nwidart/laravel-modules": "^6.0",
        "php-units-of-measure/php-units-of-measure": "~2.1.0",
+        "phpvms/sample-module": "^1.0",
        "pragmarx/version": "0.2.*",
        "prettus/l5-repository": "~2.6.0",
        "santigarcor/laratrust": "~5.2.0",
@@ -54,8 +56,7 @@
        "theiconic/php-ga-measurement-protocol": "2.7.*",
        "tivie/php-os-detector": "~1.1.0",
        "webpatser/laravel-uuid": "~3.0",
-        "oomphinc/composer-installers-extender": "^1.1",
-        "phpvms/sample-module": "^1.0"
+        "oomphinc/composer-installers-extender": "^1.1"
    },
    "require-dev": {
        "barryvdh/laravel-debugbar": "^3.0",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "3ecbeb1fd297e2827adb61806383aa5b",
+    "content-hash": "add2551f0dcadfb273fa70e8264c7ce5",
    "packages": [
        {
            "name": "akaunting/money",
@@ -558,16 +558,16 @@
        },
        {
            "name": "codedge/laravel-selfupdater",
-            "version": "2.5.1",
+            "version": "2.5.2",
            "source": {
                "type": "git",
                "url": "https://github.com/codedge/laravel-selfupdater.git",
-                "reference": "6f8c2be280bff00dc8a6c2ef01d4836ad1cae4ed"
+                "reference": "0d7d4eb7ea9e9ab42177df560d0b2e06296a84bd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/codedge/laravel-selfupdater/zipball/6f8c2be280bff00dc8a6c2ef01d4836ad1cae4ed",
-                "reference": "6f8c2be280bff00dc8a6c2ef01d4836ad1cae4ed",
+                "url": "https://api.github.com/repos/codedge/laravel-selfupdater/zipball/0d7d4eb7ea9e9ab42177df560d0b2e06296a84bd",
+                "reference": "0d7d4eb7ea9e9ab42177df560d0b2e06296a84bd",
                "shasum": ""
            },
            "require": {
@@ -622,7 +622,7 @@
                "self-update",
                "update"
            ],
-            "time": "2020-02-10T12:01:41+00:00"
+            "time": "2020-03-02T22:07:04+00:00"
        },
        {
            "name": "composer/ca-bundle",
@@ -1007,16 +1007,16 @@
        },
        {
            "name": "composer/xdebug-handler",
-            "version": "1.4.0",
+            "version": "1.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "cbe23383749496fe0f373345208b79568e4bc248"
+                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
-                "reference": "cbe23383749496fe0f373345208b79568e4bc248",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
                "shasum": ""
            },
            "require": {
@@ -1047,7 +1047,7 @@
                "Xdebug",
                "performance"
            ],
-            "time": "2019-11-06T16:40:04+00:00"
+            "time": "2020-03-01T12:26:26+00:00"
        },
        {
            "name": "doctrine/cache",
@@ -1589,23 +1589,23 @@
        },
        {
            "name": "facade/flare-client-php",
-            "version": "1.3.1",
+            "version": "1.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/facade/flare-client-php.git",
-                "reference": "24444ea0e1556f0a4b5fc8e61802caf72ae9a408"
+                "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/24444ea0e1556f0a4b5fc8e61802caf72ae9a408",
-                "reference": "24444ea0e1556f0a4b5fc8e61802caf72ae9a408",
+                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/db1e03426e7f9472c9ecd1092aff00f56aa6c004",
+                "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004",
                "shasum": ""
            },
            "require": {
                "facade/ignition-contracts": "~1.0",
-                "illuminate/pipeline": "~5.5|~5.6|~5.7|~5.8|^6.0",
+                "illuminate/pipeline": "^5.5|^6.0|^7.0",
                "php": "^7.1",
-                "symfony/http-foundation": "~3.3|~4.1",
+                "symfony/http-foundation": "^3.3|^4.1|^5.0",
                "symfony/var-dumper": "^3.4|^4.0|^5.0"
            },
            "require-dev": {
@@ -1639,7 +1639,7 @@
                "flare",
                "reporting"
            ],
-            "time": "2019-12-15T18:28:38+00:00"
+            "time": "2020-03-02T15:52:04+00:00"
        },
        {
            "name": "facade/ignition",
@@ -1756,6 +1756,60 @@
            ],
            "time": "2019-08-30T14:06:08+00:00"
        },
+        {
+            "name": "fideloper/proxy",
+            "version": "4.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fideloper/TrustedProxy.git",
+                "reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a",
+                "reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "illuminate/http": "^5.0|^6.0|^7.0|^8.0",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Fideloper\\Proxy\\TrustedProxyServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fideloper\\Proxy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Fidao",
+                    "email": "fideloper@gmail.com"
+                }
+            ],
+            "description": "Set trusted proxies for Laravel",
+            "keywords": [
+                "load balancing",
+                "proxy",
+                "trusted proxy"
+            ],
+            "time": "2020-02-22T01:51:47+00:00"
+        },
        {
            "name": "filp/whoops",
            "version": "2.7.1",
@@ -3377,16 +3431,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "2.30.0",
+            "version": "2.31.0",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4"
+                "reference": "bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/912dff66d2690ca66abddb9b291a1df5f371d3b4",
-                "reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d",
+                "reference": "bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d",
                "shasum": ""
            },
            "require": {
@@ -3443,7 +3497,7 @@
                "datetime",
                "time"
            ],
-            "time": "2020-02-07T15:25:46+00:00"
+            "time": "2020-03-01T11:11:58+00:00"
        },
        {
            "name": "nikic/php-parser",
@@ -4673,16 +4727,16 @@
        },
        {
            "name": "scrivo/highlight.php",
-            "version": "v9.18.1.0",
+            "version": "v9.18.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/scrivo/highlight.php.git",
-                "reference": "a57c858cb753f543965a1e17af386a648012ed8f"
+                "reference": "52fc21c99fd888e33aed4879e55a3646f8d40558"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/a57c858cb753f543965a1e17af386a648012ed8f",
-                "reference": "a57c858cb753f543965a1e17af386a648012ed8f",
+                "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/52fc21c99fd888e33aed4879e55a3646f8d40558",
+                "reference": "52fc21c99fd888e33aed4879e55a3646f8d40558",
                "shasum": ""
            },
            "require": {
@@ -4692,6 +4746,7 @@
            },
            "require-dev": {
                "phpunit/phpunit": "^4.8|^5.7",
+                "sabberworm/php-css-parser": "^8.3",
                "symfony/finder": "^2.8|^3.4",
                "symfony/var-dumper": "^2.8|^3.4"
            },
@@ -4737,7 +4792,7 @@
                "highlight.php",
                "syntax"
            ],
-            "time": "2020-02-03T02:19:36+00:00"
+            "time": "2020-03-02T05:59:21+00:00"
        },
        {
            "name": "sebastiaanluca/laravel-helpers",
@@ -4999,37 +5054,37 @@
        },
        {
            "name": "spatie/laravel-backup",
-            "version": "6.7.8",
+            "version": "6.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/laravel-backup.git",
-                "reference": "48f9310a2396db79d396dd63e20f657e8b11ce4e"
+                "reference": "b2cf3f9f35613a20a39e1c35803b77858b455382"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/48f9310a2396db79d396dd63e20f657e8b11ce4e",
-                "reference": "48f9310a2396db79d396dd63e20f657e8b11ce4e",
+                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/b2cf3f9f35613a20a39e1c35803b77858b455382",
+                "reference": "b2cf3f9f35613a20a39e1c35803b77858b455382",
                "shasum": ""
            },
            "require": {
-                "illuminate/console": "^5.8.15|^6.0",
-                "illuminate/contracts": "^5.8.15|^6.0",
-                "illuminate/events": "^5.8.15|^6.0",
-                "illuminate/filesystem": "^5.8.15|^6.0",
-                "illuminate/notifications": "^5.8.15|^6.0",
-                "illuminate/support": "^5.8.15|^6.0",
+                "illuminate/console": "^5.8.15|^6.0|^7.0",
+                "illuminate/contracts": "^5.8.15|^6.0|^7.0",
+                "illuminate/events": "^5.8.15|^6.0|^7.0",
+                "illuminate/filesystem": "^5.8.15|^6.0|^7.0",
+                "illuminate/notifications": "^5.8.15|^6.0|^7.0",
+                "illuminate/support": "^5.8.15|^6.0|^7.0",
                "league/flysystem": "^1.0.49",
                "php": "^7.2",
                "spatie/db-dumper": "^2.12",
                "spatie/temporary-directory": "^1.1",
-                "symfony/finder": "^4.2"
+                "symfony/finder": "^4.2|^5.0"
            },
            "require-dev": {
                "laravel/slack-notification-channel": "^1.0",
                "league/flysystem-aws-s3-v3": "^1.0",
-                "mockery/mockery": "^1.0",
-                "orchestra/testbench": "3.8.*|4.*",
-                "phpunit/phpunit": "^8.4"
+                "mockery/mockery": "^1.3",
+                "orchestra/testbench": "3.8.*|4.*|5.*",
+                "phpunit/phpunit": "^8.4|^9.0"
            },
            "suggest": {
                "laravel/slack-notification-channel": "Required for sending notifications via Slack"
@@ -5070,7 +5125,7 @@
                "laravel-backup",
                "spatie"
            ],
-            "time": "2020-02-19T16:54:03+00:00"
+            "time": "2020-03-02T21:43:50+00:00"
        },
        {
            "name": "spatie/temporary-directory",
--- a/config/app.php
+++ b/config/app.php
@@ -11,7 +11,7 @@ return [
    'name'          => env('APP_NAME', 'phpvms'),
    'env'           => env('APP_ENV', 'dev'),
    'debug'         => env('APP_DEBUG', true),
-    'url'           => env('APP_URL', 'http://localhost'),
+    'url'           => env('APP_URL', ''),
    'version'       => '7.0.0',
    'debug_toolbar' => false,

--- a/modules/Importer/Resources/views/app.blade.php
+++ b/modules/Importer/Resources/views/app.blade.php
@@ -42,14 +42,17 @@
      <div class="row">
        <div class="col-md-8 ml-auto mr-auto content-center">
          <div class="p-10" style="padding: 10px 0;">
-            <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style="" alt=""/>
+            <div class="row">
+              <div class="col-4">
+                <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style="" alt=""/>
+              </div>
+              <div class="col-8 text-right">
+                <h4 class="text-white mb-0 mr-0 ml-0" style="margin-top: 5px;">@yield('title')</h4>
+              </div>
+            </div>
          </div>
          <div class="card card-login card-plain" style="background: #FFF">
-            <div class="card-header text-center">
-              <h3 class="card-title title">@yield('title')</h3>
-            </div>
            <div class="card-body">
-              <hr />
              @include('importer::flash.message')
              @yield('content')
            </div>
@@ -63,9 +66,8 @@
 {{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}

 <script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
-<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
-<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
-<script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
+<script src="{{ public_mix('/assets/installer/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/installer/js/app.js') }}"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>

 <script>
--- a/modules/Importer/Resources/views/step1-configure.blade.php
+++ b/modules/Importer/Resources/views/step1-configure.blade.php
@@ -102,12 +102,14 @@
@endsection

@section('scripts')
-  <script>
-    $(document).ready(() => {
-
-      $("#dbtest_button").click((e) => {
-        e.preventDefault();
-        const opts = {
+<script>
+  $(document).ready(() => {
+    $("#dbtest_button").click((e) => {
+      e.preventDefault();
+      const opts = {
+        method: 'POST',
+        url: '/importer/dbtest',
+        data: {
          _token: "{{ csrf_token() }}",
          db_conn: 'mysql',
          db_host: $("input[name=db_host]").val(),
@@ -115,12 +117,13 @@
          db_name: $("input[name=db_name]").val(),
          db_user: $("input[name=db_user]").val(),
          db_pass: $("input[name=db_pass]").val(),
-        };
+        },
+      };

-        $.post("{{ route('importer.dbtest') }}", opts, (data) => {
-          $("#dbtest").html(data);
-        })
-      })
+      phpvms.request(opts).then(response => {
+        $("#dbtest").html(response.data);
+      });
    });
-  </script>
+  });
+</script>
@endsection
--- a/modules/Installer/Resources/views/app.blade.php
+++ b/modules/Installer/Resources/views/app.blade.php
@@ -36,37 +36,23 @@
 </head>

 <body class="login-page" style="background: #067ec1;">
-<!-- Navbar -->
-{{--<nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
-  <div class="container" style="width: 85%!important;">
-    <div class="navbar-translate">
-      <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
-        <a href="{{ url('/') }}">
-          <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
-        </a>
-      </p>
-    </div>
-    <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
-      @yield('title')
-    </div>
-  </div>
-</nav>--}}
-<!-- End Navbar -->
 <div class="page-header clear-filter">
-{{--  <div class="page-header-image" style="background-image:url({{ public_asset('/assets/installer/bg.jpg') }})"></div>--}}
  <div class="content">
    <div class="container">
      <div class="row">
        <div class="col-md-8 ml-auto mr-auto content-center">
          <div class="p-10" style="padding: 10px 0;">
-            <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style="" alt=""/>
+            <div class="row">
+              <div class="col-4">
+                <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style="" alt=""/>
+              </div>
+              <div class="col-8 text-right">
+                <h4 class="text-white mb-0 mr-0 ml-0" style="margin-top: 5px;">@yield('title')</h4>
+              </div>
+            </div>
          </div>
          <div class="card card-login card-plain" style="background: #FFF">
-            <div class="card-header text-center">
-              <h3 class="card-title title">@yield('title')</h3>
-            </div>
            <div class="card-body">
-              <hr />
              @include('installer::flash.message')
              @yield('content')
            </div>
@@ -80,9 +66,8 @@
 {{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}

 <script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
-<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
-<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
-<script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
+<script src="{{ public_mix('/assets/installer/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/installer/js/app.js') }}"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>

 <script>
--- a/modules/Installer/Resources/views/install/steps/step2-db.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step2-db.blade.php
@@ -139,18 +139,22 @@
      $("#dbtest_button").click((e) => {
        e.preventDefault();
        const opts = {
-          _token: "{{ csrf_token() }}",
-          db_conn: $("#db_conn option:selected").text(),
-          db_host: $("input[name=db_host]").val(),
-          db_port: $("input[name=db_port]").val(),
-          db_name: $("input[name=db_name]").val(),
-          db_user: $("input[name=db_user]").val(),
-          db_pass: $("input[name=db_pass]").val(),
+          method: 'POST',
+          url: '/importer/dbtest',
+          data: {
+            _token: "{{ csrf_token() }}",
+            db_conn: 'mysql',
+            db_host: $("input[name=db_host]").val(),
+            db_port: $("input[name=db_port]").val(),
+            db_name: $("input[name=db_name]").val(),
+            db_user: $("input[name=db_user]").val(),
+            db_pass: $("input[name=db_pass]").val(),
+          },
        };

-        $.post("{{ route('installer.dbtest') }}", opts, (data) => {
-          $("#dbtest").html(data);
-        })
+        phpvms.request(opts).then(response => {
+          $("#dbtest").html(response.data);
+        });
      })
    });
  </script>
--- a/modules/Installer/Resources/views/update/index-start.blade.php
+++ b/modules/Installer/Resources/views/update/index-start.blade.php
@@ -1,12 +0,0 @@
-@extends('installer::app')
-@section('title', 'Update phpVMS')
-
-@section('content')
-  <h2>phpvms updater</h2>
-  <p>Press continue to check if there are any updates available.</p>
-  {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
-  <p style="text-align: right">
-    {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
-  </p>
-  {{ Form::close() }}
-@endsection
--- a/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php
@@ -1,13 +0,0 @@
-@extends('installer::app')
-@section('title', 'Update phpVMS')
-
-@section('content')
-  <h2>phpvms updater</h2>
-  <p>It seems like you're up to date!</p>
-  {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
-
-  <p style="text-align: right">
-    {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-  </p>
-  {{ Form::close() }}
-@endsection
--- a/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
@@ -1,12 +0,0 @@
-@extends('installer::app')
-@section('title', 'Update phpVMS')
-
-@section('content')
-  <h2>phpvms updater</h2>
-  <p>Click run to complete the update!.</p>
-  {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
-  <p style="text-align: right">
-    {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
-  </p>
-  {{ Form::close() }}
-@endsection
--- a/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php
@@ -1,18 +0,0 @@
-@extends('installer::app')
-@section('title', 'Update Completed')
-@section('content')
-  <div style="align-content: center;">
-    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
-
-    <pre class="lang-sh">
-        <code class="lang-sh">
-            {{ $console_output }}
-        </code>
-    </pre>
-
-    <p style="text-align: right">
-      {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
-  </div>
-@endsection
--- a/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php
@@ -1,13 +0,0 @@
-@extends('installer::app')
-@section('title', 'Update Completed')
-
-@section('content')
-  <h2>phpvms updater</h2>
-  <p>Update completed!.</p>
-
-  {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
-  <p style="text-align: right">
-    {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
-  </p>
-  {{ Form::close() }}
-@endsection
--- a/modules/Updater/Resources/views/app.blade.php
+++ b/modules/Updater/Resources/views/app.blade.php
@@ -49,7 +49,6 @@
              <h3 class="card-title title">@yield('title')</h3>
            </div>
            <div class="card-body">
-              <hr />
              @include('updater::flash.message')
              @yield('content')
            </div>
@@ -63,9 +62,8 @@
 {{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}

 <script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
-<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
-<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
-<script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
+<script src="{{ public_mix('/assets/installer/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/installer/js/app.js') }}"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>

 <script>
--- a/public/assets/admin/js/app.js
+++ b/public/assets/admin/js/app.js
--- a/public/assets/admin/js/app.js.map
+++ b/public/assets/admin/js/app.js.map
--- a/public/assets/frontend/js/app.js
+++ b/public/assets/frontend/js/app.js
--- a/public/assets/frontend/js/app.js.map
+++ b/public/assets/frontend/js/app.js.map
--- a/public/assets/installer/js/app.js
+++ b/public/assets/installer/js/app.js
--- a/public/assets/installer/js/app.js.map
+++ b/public/assets/installer/js/app.js.map
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,14 +1,14 @@
 {
-    "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=eb87a2cb528b13163acf",
+    "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=ccb02e6ada8be5b91964",
    "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=20b82d8dbacf7e058df2",
    "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=9f24c5e6612e74065901",
-    "/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=fd10e979227f3098bc56",
+    "/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=e6c5ea104bd4a4998fe5",
    "/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=fdc4f42ad9047d073145",
    "/assets/admin/css/vendor.min.css.map": "/assets/admin/css/vendor.min.css.map?id=c266c31652dea865307c",
-    "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=dc79304820883b153382",
-    "/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=6c06103ab4e281c3f4f8",
-    "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=aa8661200da32787441c",
-    "/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=459e5951832843d174e1",
+    "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=53dbfe0b2d69322a270a",
+    "/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=ecc14ecd8c9f04ff4645",
+    "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=62e02c2328c69e0bb6fb",
+    "/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=e05cf0c11d7387d5215e",
    "/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
    "/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
    "/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=63b3af84650a0145d61a",
--- a/resources/js/request.js
+++ b/resources/js/request.js
@@ -25,5 +25,7 @@ export default async (_opts) => {
    },
  }, _opts);

+  console.log(opts);
+
  return axios.request(opts);
 };
--- a/yarn.lock
+++ b/yarn.lock
@@ -85,10 +85,6 @@
  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.16.tgz#3ebcbd7bf978fa4c5120fee8be57083271a8b3ac"
  integrity sha512-vRuMyoOr5yfNf8QWxXegOjeyjpWJxFePzHzmBOIzDIzo+rSqF94RW0PkS6y4T2+VjAWLXHWrfbIJY3E3aS7lUw==

-"Leaflet.Geodesic@git+https://git@github.com/henrythasler/Leaflet.Geodesic.git":
-  version "2.5.1"
-  resolved "git+https://git@github.com/henrythasler/Leaflet.Geodesic.git#92e96cc0576be3b00d63b26a4ea13294e983f86a"
-
 abbrev@1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"