Merge pull request #13 from DDynamic/development
Account Creation in AdminCP
This commit is contained in:
commit
9c9d33c127
5 changed files with 136 additions and 3 deletions
|
@ -2,9 +2,12 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Http\Controllers\Admin;
|
namespace Pterodactyl\Http\Controllers\Admin;
|
||||||
|
|
||||||
|
use Alert;
|
||||||
use Debugbar;
|
use Debugbar;
|
||||||
use Pterodactyl\Models\User;
|
use Hash;
|
||||||
|
use Uuid;
|
||||||
|
|
||||||
|
use Pterodactyl\Models\User;
|
||||||
use Pterodactyl\Http\Controllers\Controller;
|
use Pterodactyl\Http\Controllers\Controller;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
@ -32,7 +35,7 @@ class AccountsController extends Controller
|
||||||
|
|
||||||
public function getNew(Request $request)
|
public function getNew(Request $request)
|
||||||
{
|
{
|
||||||
//
|
return view('admin.accounts.new');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getView(Request $request, $id)
|
public function getView(Request $request, $id)
|
||||||
|
@ -40,4 +43,27 @@ class AccountsController extends Controller
|
||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function postNew(Request $request)
|
||||||
|
{
|
||||||
|
$this->validate($request, [
|
||||||
|
'username' => 'required|min:4|unique:users,username',
|
||||||
|
'email' => 'required|email|unique:users,email',
|
||||||
|
'password' => 'required|confirmed|regex:((?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,})',
|
||||||
|
'password_confirmation' => 'required'
|
||||||
|
]);
|
||||||
|
|
||||||
|
//@TODO: re-generate UUID if conflict
|
||||||
|
$user = new User;
|
||||||
|
$user->uuid = Uuid::generate(4);
|
||||||
|
|
||||||
|
$user->username = $request->input('username');
|
||||||
|
$user->email = $request->input('email');
|
||||||
|
$user->password = Hash::make($request->input('password'));
|
||||||
|
|
||||||
|
$user->save();
|
||||||
|
|
||||||
|
Alert::success('Account has been successfully created.')->flash();
|
||||||
|
return redirect()->route('admin.accounts.view', ['id' => $user->id]);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,18 @@ class IndexController extends Controller
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate a random string.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request $request
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getPassword(Request $request, $length = 16)
|
||||||
|
{
|
||||||
|
$length = ($length < 8) ? 8 : $length;
|
||||||
|
return str_random($length);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns TOTP Management Page.
|
* Returns TOTP Management Page.
|
||||||
*
|
*
|
||||||
|
|
|
@ -13,8 +13,10 @@ class AdminRoutes {
|
||||||
// Account Routes
|
// Account Routes
|
||||||
$router->group(['prefix' => 'accounts'], function ($server) use ($router) {
|
$router->group(['prefix' => 'accounts'], function ($server) use ($router) {
|
||||||
$router->get('/', [ 'as' => 'admin.accounts', 'uses' => 'Admin\AccountsController@getIndex' ]);
|
$router->get('/', [ 'as' => 'admin.accounts', 'uses' => 'Admin\AccountsController@getIndex' ]);
|
||||||
$router->get('/new', [ 'as' => 'admin.accounts.new', 'uses' => 'Admin\AccountsController@getNew' ]);
|
|
||||||
$router->get('/view/{id}', [ 'as' => 'admin.accounts.view', 'uses' => 'Admin\AccountsController@getView' ]);
|
$router->get('/view/{id}', [ 'as' => 'admin.accounts.view', 'uses' => 'Admin\AccountsController@getView' ]);
|
||||||
|
|
||||||
|
$router->get('/new', [ 'as' => 'admin.accounts.new', 'uses' => 'Admin\AccountsController@getNew' ]);
|
||||||
|
$router->post('/new', [ 'as' => 'admin.accounts.new', 'uses' => 'Admin\AccountsController@postNew' ]);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Server Routes
|
// Server Routes
|
||||||
|
|
|
@ -14,6 +14,9 @@ class BaseRoutes {
|
||||||
return redirect()->route('index');
|
return redirect()->route('index');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Password Generation
|
||||||
|
$router->get('/password-gen/{length}', [ 'as' => 'password-gen', 'uses' => 'Base\IndexController@getPassword' ]);
|
||||||
|
|
||||||
// Account Routes
|
// Account Routes
|
||||||
$router->get('/account', [ 'as' => 'account', 'uses' => 'Base\IndexController@getAccount' ]);
|
$router->get('/account', [ 'as' => 'account', 'uses' => 'Base\IndexController@getAccount' ]);
|
||||||
$router->post('/account/password', [ 'uses' => 'Base\IndexController@postAccountPassword' ]);
|
$router->post('/account/password', [ 'uses' => 'Base\IndexController@postAccountPassword' ]);
|
||||||
|
|
90
resources/views/admin/accounts/new.blade.php
Normal file
90
resources/views/admin/accounts/new.blade.php
Normal file
|
@ -0,0 +1,90 @@
|
||||||
|
@extends('layouts.admin')
|
||||||
|
|
||||||
|
@section('title')
|
||||||
|
New Account
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
@section('content')
|
||||||
|
<div class="col-md-9">
|
||||||
|
<ul class="breadcrumb">
|
||||||
|
<li><a href="/admin">Admin Controls</a></li>
|
||||||
|
<li><a href="/admin/accounts">Accounts</a></li>
|
||||||
|
<li class="active">Add New Account</li>
|
||||||
|
</ul>
|
||||||
|
@if (count($errors) > 0)
|
||||||
|
<div class="alert alert-danger">
|
||||||
|
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
|
||||||
|
<ul>
|
||||||
|
@foreach ($errors->all() as $error)
|
||||||
|
<li>{{ $error }}</li>
|
||||||
|
@endforeach
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
<h3>Create New Account</h3><hr />
|
||||||
|
<form action="new" method="post">
|
||||||
|
<fieldset>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="username" class="control-label">Username</label>
|
||||||
|
<div>
|
||||||
|
<input type="text" autocomplete="off" name="username" class="form-control" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="email" class="control-label">Email</label>
|
||||||
|
<div>
|
||||||
|
<input type="text" autocomplete="off" name="email" class="form-control" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div id="gen_pass" class=" alert alert-success" style="display:none;margin-bottom: 10px;"></div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group col-md-6">
|
||||||
|
<label for="pass" class="control-label">Password</label>
|
||||||
|
<div>
|
||||||
|
<input type="password" name="password" class="form-control" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group col-md-6">
|
||||||
|
<label for="pass_2" class="control-label">Password Again</label>
|
||||||
|
<div>
|
||||||
|
<input type="password" name="password_confirmation" class="form-control" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<div>
|
||||||
|
{!! csrf_field() !!}
|
||||||
|
<button class="btn btn-primary btn-sm" type="submit">Create Account</button>
|
||||||
|
<button class="btn btn-default btn-sm" id="gen_pass_bttn" type="button">Generate Password</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<script>
|
||||||
|
$(document).ready(function(){
|
||||||
|
$("#sidebar_links").find("a[href='/admin/account/new']").addClass('active');
|
||||||
|
$("#gen_pass_bttn").click(function(e){
|
||||||
|
e.preventDefault();
|
||||||
|
$.ajax({
|
||||||
|
type: "GET",
|
||||||
|
url: "/password-gen/12",
|
||||||
|
headers: {
|
||||||
|
'X-CSRF-TOKEN': '{{ csrf_token() }}'
|
||||||
|
},
|
||||||
|
success: function(data) {
|
||||||
|
$("#gen_pass").html('<strong>Generated Password:</strong> ' + data).slideDown();
|
||||||
|
$('input[name="password"], input[name="password_confirmation"]').val(data);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
$(document).ready(function () {
|
||||||
|
$('#sidebar_links').find("a[href='/admin/accounts']").addClass('active');
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
@endsection
|
Loading…
Reference in a new issue