Merge branch '0.7-develop' into api-fixes

Author: DaneEveritt

app/Http/Controllers/Admin/DatabaseController.php

@@ -131,7 +131,7 @@ public function create(DatabaseHostFormRequest $request): RedirectResponse
                     sprintf('There was an error while trying to connect to the host or while executing a query: "%s"', $exception->getMessage())
                 )->flash();
 
-                redirect()->route('admin.databases')->withInput($request->validated());
+                return redirect()->route('admin.databases')->withInput($request->validated());
             } else {
                 throw $exception;
             }
@@ -165,7 +165,7 @@ public function update(DatabaseHostFormRequest $request, DatabaseHost $host): Re
                 $this->alert->danger(
                     sprintf('There was an error while trying to connect to the host or while executing a query: "%s"', $exception->getMessage())
                 )->flash();
-                $redirect->withInput($request->normalize());
+                return $redirect->withInput($request->normalize());
             } else {
                 throw $exception;
             }

app/Http/Controllers/Auth/LoginController.php

@@ -20,8 +20,6 @@ class LoginController extends Controller
 {
     use AuthenticatesUsers;
 
-    const USER_INPUT_FIELD = 'user';
-
     /**
      * @var \Illuminate\Auth\AuthManager
      */
@@ -64,14 +62,14 @@ class LoginController extends Controller
      *
      * @var int
      */
-    protected $lockoutTime;
+    protected $decayMinutes;
 
     /**
      * After how many attempts should logins be throttled and locked.
      *
      * @var int
      */
-    protected $maxLoginAttempts;
+    protected $maxAttempts;
 
     /**
      * LoginController constructor.
@@ -98,8 +96,8 @@ public function __construct(
         $this->google2FA = $google2FA;
         $this->repository = $repository;
 
-        $this->lockoutTime = $this->config->get('auth.lockout.time');
-        $this->maxLoginAttempts = $this->config->get('auth.lockout.attempts');
+        $this->decayMinutes = $this->config->get('auth.lockout.time');
+        $this->maxAttempts = $this->config->get('auth.lockout.attempts');
     }
 
     /**
@@ -112,7 +110,7 @@ public function __construct(
      */
     public function login(Request $request)
     {
-        $username = $request->input(self::USER_INPUT_FIELD);
+        $username = $request->input($this->username());
         $useColumn = $this->getField($username);
 
         if ($this->hasTooManyLoginAttempts($request)) {
@@ -209,20 +207,30 @@ protected function sendFailedLoginResponse(Request $request, Authenticatable $us
     {
         $this->incrementLoginAttempts($request);
         $this->fireFailedLoginEvent($user, [
-            $this->getField($request->input(self::USER_INPUT_FIELD)) => $request->input(self::USER_INPUT_FIELD),
+            $this->getField($request->input($this->username())) => $request->input($this->username()),
         ]);
 
-        $errors = [self::USER_INPUT_FIELD => trans('auth.failed')];
+        $errors = [$this->username() => trans('auth.failed')];
 
         if ($request->expectsJson()) {
             return response()->json($errors, 422);
         }
 
         return redirect()->route('auth.login')
-            ->withInput($request->only(self::USER_INPUT_FIELD))
+            ->withInput($request->only($this->username()))
             ->withErrors($errors);
     }
 
+    /**
+     * Get the login username to be used by the controller.
+     *
+     * @return string
+     */
+    public function username()
+    {
+        return 'user';
+    }
+
     /**
      * Determine if the user is logging in using an email or username,.
      *

app/Services/Nests/NestDeletionService.php

@@ -51,7 +51,7 @@ public function handle(int $nest): int
     {
         $count = $this->serverRepository->findCountWhere([['nest_id', '=', $nest]]);
         if ($count > 0) {
-            throw new HasActiveServersException(trans('exceptions.service.delete_has_servers'));
+            throw new HasActiveServersException(trans('exceptions.nest.delete_has_servers'));
         }
 
         return $this->repository->delete($nest);

config/auth.php

@@ -12,7 +12,7 @@
     |
     */
     'lockout' => [
-        'time' => 120,
+        'time' => 2,
         'attempts' => 3,
     ],
 

resources/themes/pterodactyl/admin/nodes/new.blade.php

@@ -106,7 +106,7 @@
                 </div>
                 <div class="box-body">
                     <div class="row">
-                        <div class="form-group col-xs-12">
+                        <div class="form-group col-md-6">
                             <label for="pDaemonBase" class="form-label">Daemon Server File Directory</label>
                             <input type="text" name="daemonBase" id="pDaemonBase" class="form-control" value="/srv/daemon-data" />
                             <p class="text-muted small">Enter the directory where server files should be stored. <strong>If you use OVH you should check your partition scheme. You may need to use <code>/home/daemon-data</code> to have enough space.</strong></p>
@@ -177,4 +177,4 @@
     <script>
         $('#pLocationId').select2();
     </script>
-@endsection
+@endsection

resources/themes/pterodactyl/server/files/list.blade.php

@@ -141,7 +141,7 @@
                     <td data-identifier="name" data-name="{{ rawurlencode($file['entry']) }}" data-path="@if($file['directory'] !== ''){{ rawurlencode($file['directory']) }}@endif/">
                         @if(in_array($file['mime'], $editableMime))
                             @can('edit-files', $server)
-                                <a href="/server/{{ $server->uuidShort }}/files/edit/@if($file['directory'] !== ''){{ rawurlencode($file['directory']) }}/@endif{{ rawurlencode($file['entry']) }}" class="edit_file">{{ $file['entry'] }}</a>
+                                <a href="/server/{{ $server->uuidShort }}/files/edit/@if($file['directory'] !== ''){{ $file['directory'] }}/@endif{{ $file['entry'] }}" class="edit_file">{{ $file['entry'] }}</a>
                             @else
                                 {{ $file['entry'] }}
                             @endcan

tests/Unit/Services/Nests/NestDeletionServiceTest.php

@@ -73,7 +73,7 @@ public function testExceptionIsThrownIfServersAreAttached(int $count)
             $this->service->handle(1);
         } catch (PterodactylException $exception) {
             $this->assertInstanceOf(HasActiveServersException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.delete_has_servers'), $exception->getMessage());
+            $this->assertEquals(trans('exceptions.nest.delete_has_servers'), $exception->getMessage());
         }
     }