Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Author: DaneEveritt

app/Http/Controllers/Admin/ServersController.php

@@ -14,6 +14,7 @@
 use Pterodactyl\Models\User;
 use Pterodactyl\Models\Mount;
 use Pterodactyl\Models\Server;
+use Pterodactyl\Models\MountServer;
 use Prologue\Alerts\AlertsMessageBag;
 use GuzzleHttp\Exception\RequestException;
 use Pterodactyl\Exceptions\DisplayException;
@@ -419,17 +420,16 @@ public function deleteDatabase($server, $database)
      *
      * @param Server $server
      * @param \Pterodactyl\Models\Mount $mount
-     * @return \Illuminate\Http\RedirectResponse
      *
-     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException|\Throwable
      */
     public function addMount(Server $server, Mount $mount)
     {
-        $server->mounts()->updateOrCreate([
-            'mount_id' => $mount->id,
-            'server_id' => $server->id,
-        ]);
+        $mountServer = new MountServer;
+        $mountServer->mount_id = $mount->id;
+        $mountServer->server_id = $server->id;
+        $mountServer->saveOrFail();
 
         $data = $this->serverConfigurationStructureService->handle($server);
 
@@ -458,10 +458,7 @@ public function addMount(Server $server, Mount $mount)
      */
     public function deleteMount(Server $server, Mount $mount)
     {
-        $server->mounts()
-            ->where('mount_id', $mount->id)
-            ->where('server_id', $server->id)
-            ->delete();
+        MountServer::where('mount_id', $mount->id)->where('server_id', $server->id)->delete();
 
         $data = $this->serverConfigurationStructureService->handle($server);
 

app/Models/MountServer.php

@@ -11,6 +11,11 @@ class MountServer extends Model
      */
     protected $table = 'mount_server';
 
+    /**
+     * @var bool
+     */
+    public $timestamps = false;
+
     /**
      * @var null
      */

resources/scripts/routers/AuthenticationRouter.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import ReactGA from 'react-ga';
-import { Route, RouteComponentProps, Switch } from 'react-router-dom';
+import { Route, RouteComponentProps, Switch, Redirect } from 'react-router-dom';
 import LoginContainer from '@/components/auth/LoginContainer';
 import ForgotPasswordContainer from '@/components/auth/ForgotPasswordContainer';
 import ResetPasswordContainer from '@/components/auth/ResetPasswordContainer';
@@ -15,6 +15,7 @@ export default ({ location, history, match }: RouteComponentProps) => {
     return (
         <div className={'pt-8 xl:pt-32'}>
             <Switch location={location}>
+                <Redirect from="/:url*(/+)" to={location.pathname.slice(0, -1)} />
                 <Route path={`${match.path}/login`} component={LoginContainer} exact/>
                 <Route path={`${match.path}/login/checkpoint`} component={LoginCheckpointContainer}/>
                 <Route path={`${match.path}/password`} component={ForgotPasswordContainer} exact/>

resources/scripts/routers/DashboardRouter.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import ReactGA from 'react-ga';
-import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom';
+import { NavLink, Route, RouteComponentProps, Switch, Redirect } from 'react-router-dom';
 import AccountOverviewContainer from '@/components/dashboard/AccountOverviewContainer';
 import NavigationBar from '@/components/NavigationBar';
 import DashboardContainer from '@/components/dashboard/DashboardContainer';
@@ -27,6 +27,7 @@ export default ({ location }: RouteComponentProps) => {
             }
             <TransitionRouter>
                 <Switch location={location}>
+                    <Redirect from="/:url*(/+)" to={location.pathname.slice(0, -1)} />
                     <Route path={'/'} component={DashboardContainer} exact />
                     <Route path={'/account'} component={AccountOverviewContainer} exact/>
                     <Route path={'/account/api'} component={AccountApiContainer} exact/>

resources/scripts/routers/ServerRouter.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import ReactGA from 'react-ga';
-import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom';
+import { NavLink, Route, RouteComponentProps, Switch, Redirect } from 'react-router-dom';
 import NavigationBar from '@/components/NavigationBar';
 import ServerConsole from '@/components/server/ServerConsole';
 import TransitionRouter from '@/TransitionRouter';
@@ -123,6 +123,7 @@ const ServerRouter = ({ match, location }: RouteComponentProps<{ id: string }>)
                         <>
                             <TransitionRouter>
                                 <Switch location={location}>
+                                    <Redirect from="/:url*(/+)" to={location.pathname.slice(0, -1)} />
                                     <Route path={`${match.path}`} component={ServerConsole} exact/>
                                     <Route
                                         path={`${match.path}/files`}