Merge branch 'develop' of https://github.com/corowne/lorekeeper into …

…feature/wysiwyg-comments

app/Actions/Fortify/CreateNewUser.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use App\Models\Invitation;
+use App\Models\User\User;
+use App\Services\InvitationService;
+use App\Services\UserService;
+use Illuminate\Support\Facades\Hash;
+use Laravel\Fortify\Contracts\CreatesNewUsers;
+
+class CreateNewUser implements CreatesNewUsers {
+    use PasswordValidationRules;
+
+    /**
+     * Validate and create a newly registered user.
+     *
+     * @return \App\Models\User
+     */
+    public function create(array $input) {
+        (new UserService)->validator($input)->validate();
+
+        $user = User::create([
+            'name'     => $input['name'],
+            'email'    => $input['email'],
+            'password' => Hash::make($input['password']),
+            'rank_id'  => 2,
+        ]);
+
+        if (isset($input['code'])) {
+            if (!(new InvitationService)->useInvitation(Invitation::where('code', $input['code'])->whereNull('recipient_id')->first(), $user)) {
+                throw new \Exception('An error occurred while using the invitation code.');
+            }
+        }
+
+        return $user;
+    }
+}

app/Actions/Fortify/PasswordValidationRules.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Laravel\Fortify\Rules\Password;
+
+trait PasswordValidationRules {
+    /**
+     * Get the validation rules used to validate passwords.
+     *
+     * @return array
+     */
+    protected function passwordRules() {
+        return ['required', 'string', new Password, 'confirmed'];
+    }
+}

app/Actions/Fortify/ResetUserPassword.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\ResetsUserPasswords;
+
+class ResetUserPassword implements ResetsUserPasswords {
+    use PasswordValidationRules;
+
+    /**
+     * Validate and reset the user's forgotten password.
+     *
+     * @param mixed $user
+     */
+    public function reset($user, array $input) {
+        Validator::make($input, [
+            'password' => $this->passwordRules(),
+        ])->validate();
+
+        $user->forceFill([
+            'password' => Hash::make($input['password']),
+        ])->save();
+    }
+}

app/Actions/Fortify/UpdateUserPassword.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\UpdatesUserPasswords;
+
+class UpdateUserPassword implements UpdatesUserPasswords {
+    use PasswordValidationRules;
+
+    /**
+     * Validate and update the user's password.
+     *
+     * @param mixed $user
+     */
+    public function update($user, array $input) {
+        Validator::make($input, [
+            'current_password' => ['required', 'string'],
+            'password'         => $this->passwordRules(),
+        ])->after(function ($validator) use ($user, $input) {
+            if (!isset($input['current_password']) || !Hash::check($input['current_password'], $user->password)) {
+                $validator->errors()->add('current_password', __('The provided password does not match your current password.'));
+            }
+        })->validateWithBag('updatePassword');
+
+        $user->forceFill([
+            'password' => Hash::make($input['password']),
+        ])->save();
+    }
+}

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
+
+class UpdateUserProfileInformation implements UpdatesUserProfileInformation {
+    /**
+     * Validate and update the given user's profile information.
+     *
+     * @param mixed $user
+     */
+    public function update($user, array $input) {
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique('users')->ignore($user->id),
+            ],
+        ])->validateWithBag('updateProfileInformation');
+
+        if ($input['email'] !== $user->email &&
+            $user instanceof MustVerifyEmail) {
+            $this->updateVerifiedUser($user, $input);
+        } else {
+            $user->forceFill([
+                'name'  => $input['name'],
+                'email' => $input['email'],
+            ])->save();
+        }
+    }
+
+    /**
+     * Update the given verified user's profile information.
+     *
+     * @param mixed $user
+     */
+    protected function updateVerifiedUser($user, array $input) {
+        $user->forceFill([
+            'name'              => $input['name'],
+            'email'             => $input['email'],
+            'email_verified_at' => null,
+        ])->save();
+
+        $user->sendEmailVerificationNotification();
+    }
+}

app/Console/Commands/FillExistingFullsizeExtensions.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Character\CharacterImage;
+use Illuminate\Console\Command;
+
+class FillExistingFullsizeExtensions extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:fill-character-fullsize-extensions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Supplies file extension information for any stored masterlist full-size images from the existing stored extension.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle() {
+        $images = CharacterImage::whereNotNull('fullsize_hash')->whereNull('fullsize_extension')->get();
+
+        if ($images->count()) {
+            $this->info('Processing '.$images->count().' images...');
+            foreach ($images as $image) {
+                $image->update(['fullsize_extension' => $image->extension]);
+            }
+
+            $this->line('Done!');
+        } else {
+            $this->line('No images need processing!');
+        }
+
+        return Command::SUCCESS;
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -6,7 +6,6 @@
 use App\Models\User\User;
 use App\Models\User\UserAlias;
 use App\Services\LinkService;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
 use Laravel\Socialite\Facades\Socialite;
@@ -23,8 +22,6 @@ class LoginController extends Controller {
     |
     */
 
-    use AuthenticatesUsers;
-
     /**
      * Where to redirect users after login.
      *
@@ -39,19 +36,6 @@ public function __construct() {
         $this->middleware('guest')->except('logout');
     }
 
-    /**
-     * Show the application's login form.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function showLoginForm() {
-        $altLogins = array_filter(Config::get('lorekeeper.sites'), function ($item) {
-            return isset($item['login']) && $item['login'] === 1 && $item['display_name'] != 'tumblr';
-        });
-
-        return view('auth.login', ['userCount' => User::count(), 'altLogins' => $altLogins]);
-    }
-
     /**
      * Authenticate via Aliases.
      *

app/Http/Controllers/Auth/RegisterController.php

@@ -9,14 +9,10 @@
 use App\Services\InvitationService;
 use App\Services\LinkService;
 use App\Services\UserService;
-use Carbon\Carbon;
 use DB;
-use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Validator;
 use Laravel\Socialite\Facades\Socialite;
 use Settings;
 
@@ -32,8 +28,6 @@ class RegisterController extends Controller {
     |
     */
 
-    use RegistersUsers;
-
     /**
      * Where to redirect users after registration.
      *
@@ -84,7 +78,7 @@ public function postRegisterWithDriver(LinkService $service, Request $request, $
 
         $data = $request->all();
 
-        $this->validator($data, true)->validate();
+        (new UserService)->validator($data, true)->validate();
         $user = $this->create($data);
         if ($service->saveProvider($provider, $providerData, $user)) {
             Auth::login($user);
@@ -99,57 +93,6 @@ public function postRegisterWithDriver(LinkService $service, Request $request, $
         }
     }
 
-    /**
-     * Show the application registration form.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function showRegistrationForm() {
-        $altRegistrations = array_filter(Config::get('lorekeeper.sites'), function ($item) {
-            return isset($item['login']) && $item['login'] === 1 && $item['display_name'] != 'tumblr';
-        });
-
-        return view('auth.register', ['userCount' => User::count(), 'altRegistrations' => $altRegistrations]);
-    }
-
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param mixed $socialite
-     *
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    protected function validator(array $data, $socialite = false) {
-        return Validator::make($data, [
-            'name'      => ['required', 'string', 'min:3', 'max:25', 'alpha_dash', 'unique:users'],
-            'email'     => ($socialite ? [] : ['required']) + ['string', 'email', 'max:255', 'unique:users'],
-            'agreement' => ['required', 'accepted'],
-            'password'  => ($socialite ? [] : ['required']) + ['string', 'min:8', 'confirmed'],
-            'dob'       => [
-                'required', function ($attribute, $value, $fail) {
-                    $formatDate = Carbon::createFromFormat('Y-m-d', $value);
-                    $now = Carbon::now();
-                    if ($formatDate->diffInYears($now) < 13) {
-                        $fail('You must be 13 or older to access this site.');
-                    }
-                },
-            ],
-            'code'                 => ['string', function ($attribute, $value, $fail) {
-                if (!Settings::get('is_registration_open')) {
-                    if (!$value) {
-                        $fail('An invitation code is required to register an account.');
-                    }
-                    $invitation = Invitation::where('code', $value)->whereNull('recipient_id')->first();
-                    if (!$invitation) {
-                        $fail('Invalid code entered.');
-                    }
-                }
-            },
-            ],
-            'g-recaptcha-response' => 'required|recaptchav3:register,0.5',
-        ]);
-    }
-
     /**
      * Create a new user instance after a valid registration.
      *