close #840

CHANGELOG.md

@@ -7,6 +7,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Fixed
 * `[beta.3]` — Fixes a bug with the default environment file that was causing an inability to perform a fresh install when running package discovery.
 * `[beta.3]` — Fixes an edge case caused by the Laravel 5.5 upgrade that would try to perform an in_array check aganist a null value.
+* `[beta.3]` — Fixes a bug that would cause an error when attempting to create a new user on the Panel.
 
 ## v0.7.0-beta.3 (Derelict Dermodactylus)
 ### Fixed

app/Http/Controllers/Admin/UserController.php

@@ -9,6 +9,7 @@ use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Contracts\Translation\Translator;
 use Pterodactyl\Services\Users\UserUpdateService;
+use Pterodactyl\Traits\Helpers\AvailableLanguages;
 use Pterodactyl\Services\Users\UserCreationService;
 use Pterodactyl\Services\Users\UserDeletionService;
 use Pterodactyl\Http\Requests\Admin\UserFormRequest;
@@ -16,6 +17,8 @@ use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
 class UserController extends Controller
 {
+    use AvailableLanguages;
+
     /**
      * @var \Prologue\Alerts\AlertsMessageBag
      */
@@ -92,7 +95,9 @@ class UserController extends Controller
      */
     public function create()
     {
-        return view('admin.users.new');
+        return view('admin.users.new', [
+            'languages' => $this->getAvailableLanguages(true),
+        ]);
     }
 
     /**
@@ -103,7 +108,10 @@ class UserController extends Controller
      */
     public function view(User $user)
     {
-        return view('admin.users.view', ['user' => $user]);
+        return view('admin.users.view', [
+            'user' => $user,
+            'languages' => $this->getAvailableLanguages(true),
+        ]);
     }
 
     /**

app/Http/Requests/Admin/AdminFormRequest.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Http\Requests\Admin;
 
@@ -39,11 +32,11 @@ abstract class AdminFormRequest extends FormRequest
      * Return only the fields that we are interested in from the request.
      * This will include empty fields as a null value.
      *
-     * @param array $only
+     * @param array|null $only
      * @return array
      */
-    public function normalize($only = [])
+    public function normalize(array $only = null)
     {
-        return $this->all(empty($only) ? array_keys($this->rules()) : $only);
+        return $this->only($only ?? array_keys($this->rules()));
     }
 }

app/Http/Requests/Admin/UserFormRequest.php

@@ -22,12 +22,16 @@ class UserFormRequest extends AdminFormRequest
         return User::getCreateRules();
     }
 
-    public function normalize($only = [])
+    /**
+     * @param array|null $only
+     * @return array
+     */
+    public function normalize(array $only = null)
     {
         if ($this->method === 'PATCH') {
             return array_merge(
                 $this->all(['password']),
-                $this->only(['email', 'username', 'name_first', 'name_last', 'root_admin', 'ignore_connection_error'])
+                $this->only(['email', 'username', 'name_first', 'name_last', 'root_admin', 'language', 'ignore_connection_error'])
             );
         }
 

app/Models/User.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Models;
 
@@ -127,6 +120,8 @@ class User extends Model implements
         'name_first' => 'required',
         'name_last' => 'required',
         'password' => 'sometimes',
+        'language' => 'sometimes',
+        'use_totp' => 'sometimes',
     ];
 
     /**

app/Observers/UserObserver.php

@@ -1,27 +1,14 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Observers;
 
 use Pterodactyl\Events;
 use Pterodactyl\Models\User;
-use Pterodactyl\Services\Components\UuidService;
 
 class UserObserver
 {
     protected $uuid;
 
-    public function __construct(UuidService $uuid)
-    {
-        $this->uuid = $uuid;
-    }
-
     /**
      * Listen to the User creating event.
      *
@@ -29,8 +16,6 @@ class UserObserver
      */
     public function creating(User $user)
     {
-        $user->uuid = $this->uuid->generate('users', 'uuid');
-
         event(new Events\User\Creating($user));
     }
 

app/Services/Components/UuidService.php

@@ -1,63 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Services\Components;
-
-use DB;
-use Uuid;
-
-class UuidService
-{
-    /**
-     * Generate a unique UUID validating against specified table and column.
-     * Defaults to `users.uuid`.
-     *
-     * @param string $table
-     * @param string $field
-     * @param int    $type
-     * @return string
-     * @deprecated
-     */
-    public function generate($table = 'users', $field = 'uuid', $type = 4)
-    {
-        $return = false;
-        do {
-            $uuid = Uuid::generate($type);
-            if (! DB::table($table)->where($field, $uuid)->exists()) {
-                $return = $uuid;
-            }
-        } while (! $return);
-
-        return (string) $return;
-    }
-
-    /**
-     * Generates a ShortUUID code which is 8 characters long and is used for identifying servers in the system.
-     *
-     * @param string      $table
-     * @param string      $field
-     * @param null|string $attachedUuid
-     * @return string
-     * @deprecated
-     */
-    public function generateShort($table = 'servers', $field = 'uuidShort', $attachedUuid = null)
-    {
-        $return = false;
-        do {
-            $short = (is_null($attachedUuid)) ? substr(Uuid::generate(4), 0, 8) : substr($attachedUuid, 0, 8);
-            $attachedUuid = null;
-
-            if (! DB::table($table)->where($field, $short)->exists()) {
-                $return = $short;
-            }
-        } while (! $return);
-
-        return (string) $return;
-    }
-}

app/Services/Users/UserCreationService.php

@@ -9,6 +9,7 @@
 
 namespace Pterodactyl\Services\Users;
 
+use Ramsey\Uuid\Uuid;
 use Illuminate\Foundation\Application;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Database\ConnectionInterface;
@@ -96,7 +97,10 @@ class UserCreationService
             $token = $this->passwordService->handle($data['email']);
         }
 
-        $user = $this->repository->create($data);
+        $user = $this->repository->create(array_merge($data, [
+            'uuid' => Uuid::uuid4()->toString(),
+        ]));
+
         $this->connection->commit();
 
         // @todo fire event, handle notification there

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

@@ -51,6 +51,17 @@
                             <input type="text" autocomplete="off" name="name_last" value="{{ old('name_last') }}" class="form-control" />
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="control-label">Default Langauge</label>
+                        <div>
+                            <select name="language" class="form-control">
+                                @foreach($languages as $key => $value)
+                                    <option value="{{ $key }}" @if(config('app.locale') === $key) selected @endif>{{ $value }}</option>
+                                @endforeach
+                            </select>
+                            <p class="text-muted"><small>The default language to use when rendering the Panel for this user.</small></p>
+                        </div>
+                    </div>
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}

resources/themes/pterodactyl/admin/users/view.blade.php

@@ -51,6 +51,17 @@
                             <input readonly type="text" name="name_last" value="{{ $user->name_last }}" class="form-control form-autocomplete-stop">
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="control-label">Default Langauge</label>
+                        <div>
+                            <select name="language" class="form-control">
+                                @foreach($languages as $key => $value)
+                                    <option value="{{ $key }}" @if($user->language === $key) selected @endif>{{ $value }}</option>
+                                @endforeach
+                            </select>
+                            <p class="text-muted"><small>The default language to use when rendering the Panel for this user.</small></p>
+                        </div>
+                    </div>
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
@@ -101,25 +112,24 @@
             </div>
         </div>
     </form>
-    <div class="col-xs-12">
+    {{--<div class="col-xs-12">--}}
-        <div class="box">
+        {{--<div class="box">--}}
-            <div class="box-header with-border">
+            {{--<div class="box-header with-border">--}}
-                <h3 class="box-title">Associated Servers</h3>
+                {{--<h3 class="box-title">Associated Servers</h3>--}}
-            </div>
+            {{--</div>--}}
-            <div class="box-body table-responsive no-padding">
+            {{--<div class="box-body table-responsive no-padding">--}}
-                <table class="table table-hover">
+                {{--<table class="table table-hover">--}}
-                    <thead>
+                    {{--<thead>--}}
-                        <tr>
+                        {{--<tr>--}}
-                            <th style="width:2%;"></th>
+                            {{--<th style="width:2%;"></th>--}}
-                            <th>Identifier</th>
+                            {{--<th>Identifier</th>--}}
-                            <th>Server Name</th>
+                            {{--<th>Server Name</th>--}}
-                            <th>Access</th>
+                            {{--<th>Access</th>--}}
-                            <th>Node</th>
+                            {{--<th>Node</th>--}}
-                            <th style="width:10%;"></th>
+                            {{--<th style="width:10%;"></th>--}}
-                        </tr>
+                        {{--</tr>--}}
-                    </thead>
+                    {{--</thead>--}}
-                    <tbody>
+                    {{--<tbody>--}}
-                        Oh dear, this hasn't been fixed yet?
                         {{--@foreach($user->setAccessLevel('subuser')->access()->get() as $server)--}}
                             {{--<tr>--}}
                                 {{--<td><a href="{{ route('server.index', $server->uuidShort) }}/"><i class="fa fa-tachometer"></i></a></td>--}}
@@ -136,12 +146,11 @@
                                 {{--<td class="centered">@if($server->suspended === 0)<span class="label muted muted-hover label-success">Active</span>@else<span class="label label-warning">Suspended</span>@endif</td>--}}
                             {{--</td>--}}
                         {{--@endforeach--}}
-                    </tbody>
+                    {{--</tbody>--}}
-                </table>
+                {{--</table>--}}
-            </div>
+            {{--</div>--}}
-            </form>
+        {{--</div>--}}
-        </div>
+    {{--</div>--}}
-    </div>
     <div class="col-xs-12">
         <div class="box box-danger">
             <div class="box-header with-border">

tests/Unit/Services/Users/UserCreationServiceTest.php

@@ -1,16 +1,10 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Tests\Unit\Services;
 
 use Mockery as m;
 use Tests\TestCase;
+use Tests\Traits\MocksUuids;
 use Illuminate\Foundation\Application;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Database\ConnectionInterface;
@@ -22,6 +16,8 @@ use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
 class UserCreationServiceTest extends TestCase
 {
+    use MocksUuids;
+
     /**
      * @var \Illuminate\Foundation\Application
      */
@@ -93,9 +89,10 @@ class UserCreationServiceTest extends TestCase
 
         $this->hasher->shouldReceive('make')->with('raw-password')->once()->andReturn('enc-password');
         $this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
-        $this->hasher->shouldNotReceive('make');
+        $this->repository->shouldReceive('create')->with([
-        $this->passwordService->shouldNotReceive('handle');
+            'password' => 'enc-password',
-        $this->repository->shouldReceive('create')->with(['password' => 'enc-password'])->once()->andReturn($user);
+            'uuid' => $this->getKnownUuid(),
+        ])->once()->andReturn($user);
         $this->database->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
         $this->appMock->shouldReceive('makeWith')->with(AccountCreated::class, [
             'user' => [
@@ -116,6 +113,37 @@ class UserCreationServiceTest extends TestCase
         $this->assertEquals($user->name_first, 'FirstName');
     }
 
+    /**
+     * Test that a UUID passed in the submission data is not used when
+     * creating the user.
+     */
+    public function testUuidPassedInDataIsIgnored()
+    {
+        $user = (object) [
+            'name_first' => 'FirstName',
+            'username' => 'user_name',
+        ];
+
+        $this->hasher->shouldReceive('make')->andReturn('enc-password');
+        $this->database->shouldReceive('beginTransaction')->andReturnNull();
+        $this->repository->shouldReceive('create')->with([
+            'password' => 'enc-password',
+            'uuid' => $this->getKnownUuid(),
+        ])->once()->andReturn($user);
+        $this->database->shouldReceive('commit')->andReturnNull();
+        $this->appMock->shouldReceive('makeWith')->andReturnNull();
+        $this->notification->shouldReceive('send')->andReturnNull();
+
+        $response = $this->service->handle([
+            'password' => 'raw-password',
+            'uuid' => 'test-uuid',
+        ]);
+
+        $this->assertNotNull($response);
+        $this->assertEquals($user->username, $response->username);
+        $this->assertEquals($user->name_first, 'FirstName');
+    }
+
     /**
      * Test that a user is created with a random password when no password is provided.
      */
@@ -138,6 +166,7 @@ class UserCreationServiceTest extends TestCase
         $this->repository->shouldReceive('create')->with([
             'password' => 'created-enc-password',
             'email' => 'user@example.com',
+            'uuid' => $this->getKnownUuid(),
         ])->once()->andReturn($user);
 
         $this->database->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();