Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement base notifications support (#77)

Browse source 
* initial implementation of notifications
* typehint UUID returns. Fixes that notifications bug
This commit is contained in:
Dane Everitt 2016-09-05 12:00:56 -04:00 committed by GitHub
parent b3ca8a3732
commit b02df8e610
11 changed files with 176 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Server/ServerController.php
View file

@ -176,7 +176,7 @@ class ServerController extends Controller
$download = new Models\Download;
$download->token = Uuid::generate(4);
$download->token = (string) Uuid::generate(4);
$download->server = $server->uuid;
$download->path = str_replace('../', '', $file);

1
app/Models/User.php
View file

@ -137,5 +137,4 @@ class User extends Model implements AuthenticatableContract,
$this->notify(new ResetPasswordNotification($token));
}
}

90
app/Notifications/AccountCreated.php Normal file
View file

@ -0,0 +1,90 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
namespace Pterodactyl\Notifications;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage;
class AccountCreated extends Notification implements ShouldQueue
{
use Queueable;
/**
* The password reset token to send.
*
* @var string
*/
public $token;
/**
* Create a new notification instance.
*
* @return void
*/
public function __construct($token)
{
$this->token = $token;
}
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
{
return ['mail', 'database'];
}
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
{
return (new MailMessage)
->line('You are recieving this email because an account has been created for you on Pterodactyl Panel.')
->line('Email: ' . $notifiable->email)
->action('Setup Your Account', url('/auth/password/reset/' . $this->token . '?email=' . $notifiable->email));
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
'email' => $notifiable->email,
'token' => $this->token
];
}
}

25
app/Notifications/SendPasswordReset.php
View file

@ -1,5 +1,26 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
namespace Pterodactyl\Notifications;
use Illuminate\Bus\Queueable;
@ -7,7 +28,7 @@ use Illuminate\Notifications\Notification;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage;
class SendPasswordReset extends Notification
class SendPasswordReset extends Notification implements ShouldQueue
{
use Queueable;

29
app/Repositories/UserRepository.php
View file

@ -29,9 +29,11 @@ use Settings;
use Hash;
use Validator;
use Mail;
use Carbon;
use Pterodactyl\Models;
use Pterodactyl\Services\UuidService;
use Pterodactyl\Notifications\AccountCreated;
use Pterodactyl\Exceptions\DisplayValidationException;
use Pterodactyl\Exceptions\DisplayException;
@ -48,10 +50,10 @@ class UserRepository
* Creates a user on the panel. Returns the created user's ID.
*
* @param string $email
* @param string $password An unhashed version of the user's password.
* @param string|null $password An unhashed version of the user's password.
* @return bool|integer
*/
public function create($email, $password, $admin = false)
public function create($email, $password = null, $admin = false)
{
$validator = Validator::make([
'email' => $email,
@ -59,7 +61,7 @@ class UserRepository
'root_admin' => $admin
], [
'email' => 'required|email|unique:users,email',
'password' => 'required|regex:((?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,})',
'password' => 'nullable|regex:((?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,})',
'root_admin' => 'required|boolean'
]);
@ -77,25 +79,26 @@ class UserRepository
$user->uuid = $uuid->generate('users', 'uuid');
$user->email = $email;
$user->password = Hash::make($password);
$user->password = Hash::make((is_null($password)) ? str_random(30) : $password);
$user->language = 'en';
$user->root_admin = ($admin) ? 1 : 0;
$user->save();
Mail::queue('emails.new-account', [
// Setup a Password Reset to use when they set a password.
$token = str_random(32);
DB::table('password_resets')->insert([
'email' => $user->email,
'forgot' => route('auth.password'),
'login' => route('auth.login')
], function ($message) use ($email) {
$message->to($email);
$message->from(Settings::get('email_from', env('MAIL_FROM')), Settings::get('email_sender_name', env('MAIL_FROM_NAME', 'Pterodactyl Panel')));
$message->subject(Settings::get('company') . ' - New Account');
});
'token' => $token,
'created_at' => Carbon::now()->toDateTimeString()
]);
$user->notify((new AccountCreated($token)));
DB::commit();
return $user->id;
} catch (\Exception $ex) {
DB::rollBack();
throw $e;
throw $ex;
}
}

4
app/Services/UuidService.php
View file

@ -59,7 +59,7 @@ class UuidService
} while (!$return);
return $return;
return (string) $return;
}
@ -85,7 +85,7 @@ class UuidService
} while (!$return);
return $return;
return (string) $return;
}

5
composer.json
View file

@ -17,7 +17,7 @@
],
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.3.*",
"laravel/framework": "5.3.6",
"barryvdh/laravel-debugbar": "^2.2.3",
"doctrine/dbal": "^2.5.4",
"guzzlehttp/guzzle": "^6.2.1",
@ -35,7 +35,8 @@
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*"
"symfony/dom-crawler": "3.1.*",
"laravel/homestead": "3.0.*"
},
"autoload": {
"classmap": [

6
config/queue.php
View file

@ -39,14 +39,14 @@ return [
'driver' => 'database',
'table' => 'jobs',
'queue' => 'default',
'expire' => 60,
'retry_after' => 60,
],
'beanstalkd' => [
'driver' => 'beanstalkd',
'host' => 'localhost',
'queue' => 'default',
'ttr' => 60,
'retry_after' => 60,
],
'sqs' => [
@ -70,7 +70,7 @@ return [
'driver' => 'redis',
'connection' => 'default',
'queue' => 'default',
'expire' => 60,
'retry_after' => 60,
],
],

34
database/migrations/2016_09_04_182835_create_notifications_table.php Normal file
View file

@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateNotificationsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('notifications', function (Blueprint $table) {
$table->string('id')->primary();
$table->string('type');
$table->morphs('notifiable');
$table->text('data');
$table->timestamp('read_at')->nullable();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('notifications');
}
}

2
resources/views/vendor/notifications/email-plain.blade.php vendored
View file

@ -19,4 +19,4 @@ if (! empty($outroLines)) {
}
echo 'Regards,', "\n";
echo config('app.name'), "\n";
echo Settings::get('company'), "\n";

6
resources/views/vendor/notifications/email.blade.php vendored
View file

@ -71,7 +71,7 @@ $style = [
<tr>
<td style="{{ $style['email-masthead'] }}">
<a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank">
{{ config('app.name') }}
{{ Settings::get('company') }}
</a>
</td>
</tr>
@ -140,7 +140,7 @@ $style = [
<!-- Salutation -->
<p style="{{ $style['paragraph'] }}">
Regards,<br>{{ config('app.name') }}
Regards,<br>{{ Settings::get('company') }}
</p>
<!-- Sub Copy -->
@ -176,7 +176,7 @@ $style = [
<td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
<p style="{{ $style['paragraph-sub'] }}">
&copy; {{ date('Y') }}
<a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ config('app.name') }}</a>.
<a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ Settings::get('company') }}</a>.
All rights reserved.
</p>
</td>