-
-
Notifications
You must be signed in to change notification settings - Fork 160
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #170 from Kovah/dev
v0.0.44
- Loading branch information
Showing
116 changed files
with
2,267 additions
and
1,363 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <?php | ||
|
|
||
| namespace App\Actions\Fortify; | ||
|
|
||
| use App\Models\User; | ||
| use Illuminate\Support\Facades\Hash; | ||
| use Illuminate\Support\Facades\Validator; | ||
| use Illuminate\Validation\Rule; | ||
| use Laravel\Fortify\Contracts\CreatesNewUsers; | ||
|
|
||
| class CreateNewUser implements CreatesNewUsers | ||
| { | ||
| use PasswordValidationRules; | ||
|
|
||
| /** | ||
| * Validate and create a newly registered user. | ||
| * | ||
| * @param array $input | ||
| * @return \App\Models\User | ||
| */ | ||
| public function create(array $input) | ||
| { | ||
| Validator::make($input, [ | ||
| 'name' => ['required', 'string', 'max:255'], | ||
| 'email' => [ | ||
| 'required', | ||
| 'string', | ||
| 'email', | ||
| 'max:255', | ||
| Rule::unique(User::class), | ||
| ], | ||
| 'password' => $this->passwordRules(), | ||
| ])->validate(); | ||
|
|
||
| return User::create([ | ||
| 'name' => $input['name'], | ||
| 'email' => $input['email'], | ||
| 'password' => Hash::make($input['password']), | ||
| ]); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?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']; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?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 | ||
| * @param array $input | ||
| * @return void | ||
| */ | ||
| public function reset($user, array $input) | ||
| { | ||
| Validator::make($input, [ | ||
| 'password' => $this->passwordRules(), | ||
| ])->validate(); | ||
|
|
||
| $user->forceFill([ | ||
| 'password' => Hash::make($input['password']), | ||
| ])->save(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?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 | ||
| * @param array $input | ||
| * @return void | ||
| */ | ||
| public function update($user, array $input) | ||
| { | ||
| Validator::make($input, [ | ||
| 'current_password' => ['required', 'string'], | ||
| 'password' => $this->passwordRules(), | ||
| ])->after(function ($validator) use ($user, $input) { | ||
| if (! Hash::check($input['current_password'], $user->password)) { | ||
| $validator->errors()->add('current_password', trans('settings.old_password_invalid')); | ||
| } | ||
| })->validateWithBag('updatePassword'); | ||
|
|
||
| $user->forceFill([ | ||
| 'password' => Hash::make($input['password']), | ||
| ])->save(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <?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 | ||
| * @param array $input | ||
| * @return void | ||
| */ | ||
| 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 | ||
| * @param array $input | ||
| * @return void | ||
| */ | ||
| protected function updateVerifiedUser($user, array $input) | ||
| { | ||
| $user->forceFill([ | ||
| 'name' => $input['name'], | ||
| 'email' => $input['email'], | ||
| 'email_verified_at' => null, | ||
| ])->save(); | ||
|
|
||
| $user->sendEmailVerificationNotification(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.