diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml new file mode 100644 index 0000000..18b32b3 --- /dev/null +++ b/.github/workflows/pull-requests.yml @@ -0,0 +1,12 @@ +name: pull requests + +on: + pull_request_target: + types: [opened] + +permissions: + pull-requests: write + +jobs: + uneditable: + uses: laravel/.github/.github/workflows/pull-requests.yml@main diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index edce430..1b98740 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,6 +32,8 @@ jobs: with: php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, redis, zip + ini-values: error_reporting=E_ALL + tools: composer:v2 coverage: none - name: Install dependencies diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml new file mode 100644 index 0000000..1625bda --- /dev/null +++ b/.github/workflows/update-changelog.yml @@ -0,0 +1,9 @@ +name: update changelog + +on: + release: + types: [released] + +jobs: + update: + uses: laravel/.github/.github/workflows/update-changelog.yml@main diff --git a/CHANGELOG.md b/CHANGELOG.md index 10fb42f..92fbf69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,188 +1,227 @@ # Release Notes -## [Unreleased](https://github.com/laravel/ui/compare/v3.4.1...master) +## [Unreleased](https://github.com/laravel/ui/compare/v3.4.6...master) +## [v3.4.6](https://github.com/laravel/ui/compare/v3.4.5...v3.4.6) - 2022-05-20 + +### Fixes + +- Fixes AuthenticatesUsers always force remember me by @crynobone in https://github.com/laravel/ui/pull/227 + +## [v3.4.5](https://github.com/laravel/ui/compare/v3.4.4...v3.4.5) - 2022-02-22 + +### Changed + +- Update 2014_10_12_100000_create_password_resets_table.php by @ashkanfekridev in https://github.com/laravel/ui/pull/223 + +## [v3.4.4](https://github.com/laravel/ui/compare/v3.4.3...v3.4.4) - 2022-02-15 + +### Fixed + +- Update ConfirmsPasswords.php by @hannah-massey in https://github.com/laravel/ui/pull/222 + +## [v3.4.3](https://github.com/laravel/ui/compare/v3.4.2...v3.4.3) - 2022-02-08 + +### Changed + +- Replace removeSpecialCharacters method with Str Helper Equivalent ([#219](https://github.com/laravel/ui/pull/219)) + +## [v3.4.2 (2021-12-25)](https://github.com/laravel/ui/compare/v3.4.1...v3.4.2) + +### Fixed + +- Update app.stub with correct Bootstrap 5 class ([#215](https://github.com/laravel/ui/pull/215)) +- Fix bug where special characters can be used when generating throttle key ([#216](https://github.com/laravel/ui/pull/216)) ## [v3.4.1 (2021-12-22)](https://github.com/laravel/ui/compare/v3.4.0...v3.4.1) ### Fixed -- Fix Bootstrap 5 text alignment ([#213](https://github.com/laravel/ui/pull/213)) +- Fix Bootstrap 5 text alignment ([#213](https://github.com/laravel/ui/pull/213)) ## [v3.4.0 (2021-11-30)](https://github.com/laravel/ui/compare/v3.3.3...v3.4.0) ### Changed -- Update library to Boostrap 5 ([#212](https://github.com/laravel/ui/pull/212)) +- Update library to Boostrap 5 ([#212](https://github.com/laravel/ui/pull/212)) ## [v3.3.3 (2021-11-21)](https://github.com/laravel/ui/compare/v3.3.2...v3.3.3) ### Added -- Laravel 9 Support ([08ea313](https://github.com/laravel/ui/commit/08ea313a35dfc89ff0cd9916ca0bcef9715d0ed6)) +- Laravel 9 Support ([08ea313](https://github.com/laravel/ui/commit/08ea313a35dfc89ff0cd9916ca0bcef9715d0ed6)) ## [v3.3.2 (2021-11-05)](https://github.com/laravel/ui/compare/v3.3.1...v3.3.2) ### Fixed -- Fix session issue ([9fbdf77](https://github.com/laravel/ui/commit/9fbdf7751119aa6b5047607266a7c0f6e0e24905)) +- Fix session issue ([9fbdf77](https://github.com/laravel/ui/commit/9fbdf7751119aa6b5047607266a7c0f6e0e24905)) ## [v3.3.1 (2021-11-02)](https://github.com/laravel/ui/compare/v3.3.0...v3.3.1) ### Fixed -- Set `password_confirmed_at` on login ([#208](https://github.com/laravel/ui/pull/208)) +- Set `password_confirmed_at` on login ([#208](https://github.com/laravel/ui/pull/208)) ## [v3.3.0 (2021-05-25)](https://github.com/laravel/ui/compare/v3.2.1...v3.3.0) ### Added -- Use new Password::defaults() feature ([#204](https://github.com/laravel/ui/pull/204)) +- Use new Password::defaults() feature ([#204](https://github.com/laravel/ui/pull/204)) ## [v3.2.1 (2021-04-27)](https://github.com/laravel/ui/compare/v3.2.0...v3.2.1) ### Changed + - Use trans helper instead of Lang Facade ([#201](https://github.com/laravel/ui/pull/201)) - Update NPM dependencies ([#203](https://github.com/laravel/ui/pull/203)) - ## [v3.2.0 (2021-01-06)](https://github.com/laravel/ui/compare/v3.1.0...v3.2.0) ### Changed -- Tweak stubs for Mix 6 ([#193](https://github.com/laravel/ui/pull/193)) +- Tweak stubs for Mix 6 ([#193](https://github.com/laravel/ui/pull/193)) ## [v3.1.0 (2020-11-03)](https://github.com/laravel/ui/compare/v3.0.0...v3.1.0) ### Added + - Added PHP 8 Support ([#178](https://github.com/laravel/ui/pull/178)) ### Changed + - Add sourcemaps to webpack config ([#168](https://github.com/laravel/ui/pull/168)) ### Fixed -- Wrap login link in app.stub with a route check ([#177](https://github.com/laravel/ui/pull/177)) +- Wrap login link in app.stub with a route check ([#177](https://github.com/laravel/ui/pull/177)) ## [v3.0.0 (2020-09-11)](https://github.com/laravel/ui/compare/v2.4.0...v3.0.0) ### Added + - Laravel 8 support ([#155](https://github.com/laravel/ui/pull/155)) ### Fixed -- Fetch reset token explicitly ([#130](https://github.com/laravel/ui/pull/130)) +- Fetch reset token explicitly ([#130](https://github.com/laravel/ui/pull/130)) ## [v2.4.1 (2020-09-22)](https://github.com/laravel/ui/compare/v2.4.0...v2.4.1) ### Changed -- Revert "Add namespace check to Auth routes" ([#160](https://github.com/laravel/ui/pull/160)) +- Revert "Add namespace check to Auth routes" ([#160](https://github.com/laravel/ui/pull/160)) ## [v2.4.0 (2020-09-11)](https://github.com/laravel/ui/compare/v2.3.0...v2.4.0) ### Removed + - Remove Laravel 8 support ([#154](https://github.com/laravel/ui/pull/154)) ### Fixed -- Fix Bootstrap preset ([#146](https://github.com/laravel/ui/pull/146)) +- Fix Bootstrap preset ([#146](https://github.com/laravel/ui/pull/146)) ## [v2.3.0 (2020-09-09)](https://github.com/laravel/ui/compare/v2.2.1...v2.3.0) ### Fixed -- Add namespace check to Auth routes ([#143](https://github.com/laravel/ui/pull/143)) +- Add namespace check to Auth routes ([#143](https://github.com/laravel/ui/pull/143)) ## [v2.2.1 (2020-09-08)](https://github.com/laravel/ui/compare/v2.2.0...v2.2.1) ### Fixed + - Use proper json responses ([#139](https://github.com/laravel/ui/pull/139)) - Ensure sass directory exists ([456daa3](https://github.com/laravel/ui/commit/456daa330a32483b0fa9794334e60af6b2db3bf6)) - ## [v2.2.0 (2020-08-25)](https://github.com/laravel/ui/compare/v2.1.0...v2.2.0) ### Added + - Laravel 8 support ([4a0db5b](https://github.com/laravel/ui/commit/4a0db5b2e5d3c032b0f213e847008d39c8c7ce45)) ### Fixed -- Remove caret and replace `display: none` with `d-none` ([#135](https://github.com/laravel/ui/pull/135)) +- Remove caret and replace `display: none` with `d-none` ([#135](https://github.com/laravel/ui/pull/135)) ## [v2.1.0 (2020-06-30)](https://github.com/laravel/ui/compare/v2.0.3...v2.1.0) ### Added + - Allow for optional login and logout routes ([#113](https://github.com/laravel/ui/pull/113)) ### Fixed -- Missed localizable strings ([#105](https://github.com/laravel/ui/pull/105)) +- Missed localizable strings ([#105](https://github.com/laravel/ui/pull/105)) ## [v2.0.3 (2020-04-29)](https://github.com/laravel/ui/compare/v2.0.2...v2.0.3) ### Fixed -- Fix confirm controller overwrite ([#100](https://github.com/laravel/ui/pull/100)) +- Fix confirm controller overwrite ([#100](https://github.com/laravel/ui/pull/100)) ## [v2.0.2 (2020-04-28)](https://github.com/laravel/ui/compare/v2.0.1...v2.0.2) ### Fixed -- Confirm controller overwrite ([#95](https://github.com/laravel/ui/pull/95)) +- Confirm controller overwrite ([#95](https://github.com/laravel/ui/pull/95)) ## [v2.0.1 (2020-03-03)](https://github.com/laravel/ui/compare/v2.0.0...v2.0.1) ### Fixed -- Make `auth` options empty by default ([47a0a1d](https://github.com/laravel/ui/commit/47a0a1dac76f5e73803c86e1f38b2c7e0ae7fa83)) +- Make `auth` options empty by default ([47a0a1d](https://github.com/laravel/ui/commit/47a0a1dac76f5e73803c86e1f38b2c7e0ae7fa83)) ## [v2.0.0 (2020-03-03)](https://github.com/laravel/ui/compare/v1.2.0...v2.0.0) ### Changed -- The UI package now contains all auth scaffolding from the laravel skeleton +- The UI package now contains all auth scaffolding from the laravel skeleton ## [v1.2.0 (2020-02-18)](https://github.com/laravel/ui/compare/v1.1.2...v1.2.0) ### Changed -- Use `sass-loader` v8 for Vue preset ([bb64fca](https://github.com/laravel/ui/commit/bb64fca681566ca94457d490a00f899516e75664)) +- Use `sass-loader` v8 for Vue preset ([bb64fca](https://github.com/laravel/ui/commit/bb64fca681566ca94457d490a00f899516e75664)) ## [v1.1.2 (2019-10-20)](https://github.com/laravel/ui/compare/v1.1.1...v1.1.2) ### Changed -- Removed Laravel 7.0 support ([0287d4ee](https://github.com/laravel/ui/commit/0287d4eee80aad718bdf7f90117cfe720c493064)) +- Removed Laravel 7.0 support ([0287d4ee](https://github.com/laravel/ui/commit/0287d4eee80aad718bdf7f90117cfe720c493064)) ## [v1.1.1 (2019-10-11)](https://github.com/laravel/ui/compare/v1.1.0...v1.1.1) ### Changed + - Change the specified time until re-authentication ([#37](https://github.com/laravel/ui/pull/37)) ### Fixed -- Add `auth.passwords.confirm` to exported views ([#36](https://github.com/laravel/ui/pull/36)) +- Add `auth.passwords.confirm` to exported views ([#36](https://github.com/laravel/ui/pull/36)) ## [v1.1.0 (2019-10-08)](https://github.com/laravel/ui/compare/v1.0.1...v1.1.0) ### Added + - Add password confirmation screen ([#34](https://github.com/laravel/ui/pull/34)) ### Changed + - Remove X-CSRF-TOKEN header from Axios instance ([#23](https://github.com/laravel/ui/pull/23)) ### Fixed + - Replace tab to space ([#28](https://github.com/laravel/ui/pull/28)) - Add missing semicolon to avoid unnecessary diff ([#32](https://github.com/laravel/ui/pull/32)) - Update resolve-url-loader dependency constraint ([#33](https://github.com/laravel/ui/pull/33)) - ## [v1.0.1 (2019-09-02)](https://github.com/laravel/ui/compare/v1.0.0...v1.0.1) ### Added -- Add macro check on ui:auth command ([#16](https://github.com/laravel/ui/pull/16)) +- Add macro check on ui:auth command ([#16](https://github.com/laravel/ui/pull/16)) ## v1.0.0 (2019-08-13) diff --git a/auth-backend/AuthenticatesUsers.php b/auth-backend/AuthenticatesUsers.php index 44d9aae..147607a 100644 --- a/auth-backend/AuthenticatesUsers.php +++ b/auth-backend/AuthenticatesUsers.php @@ -84,7 +84,7 @@ protected function validateLogin(Request $request) protected function attemptLogin(Request $request) { return $this->guard()->attempt( - $this->credentials($request), $request->filled('remember') + $this->credentials($request), $request->boolean('remember') ); } diff --git a/auth-backend/ConfirmsPasswords.php b/auth-backend/ConfirmsPasswords.php index 711c0d0..cc2abba 100644 --- a/auth-backend/ConfirmsPasswords.php +++ b/auth-backend/ConfirmsPasswords.php @@ -55,7 +55,7 @@ protected function resetPasswordConfirmationTimeout(Request $request) protected function rules() { return [ - 'password' => 'required|password', + 'password' => 'required|current_password:web', ]; } diff --git a/auth-backend/ThrottlesLogins.php b/auth-backend/ThrottlesLogins.php index 6463a50..4e22dc1 100644 --- a/auth-backend/ThrottlesLogins.php +++ b/auth-backend/ThrottlesLogins.php @@ -89,7 +89,7 @@ protected function fireLockoutEvent(Request $request) */ protected function throttleKey(Request $request) { - return Str::lower($request->input($this->username())).'|'.$request->ip(); + return Str::transliterate(Str::lower($request->input($this->username())).'|'.$request->ip()); } /** diff --git a/composer.json b/composer.json index 1d63e95..f572cd0 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "php": "^7.3|^8.0", "illuminate/console": "^8.42|^9.0", "illuminate/filesystem": "^8.42|^9.0", - "illuminate/support": "^8.42|^9.0", + "illuminate/support": "^8.82|^9.0", "illuminate/validation": "^8.42|^9.0" }, "require-dev": { diff --git a/src/Auth/bootstrap-stubs/auth/login.stub b/src/Auth/bootstrap-stubs/auth/login.stub index 5b38c4b..ea9ac94 100644 --- a/src/Auth/bootstrap-stubs/auth/login.stub +++ b/src/Auth/bootstrap-stubs/auth/login.stub @@ -12,7 +12,7 @@ @csrf
- +
diff --git a/src/Auth/bootstrap-stubs/auth/passwords/email.stub b/src/Auth/bootstrap-stubs/auth/passwords/email.stub index 288e2cd..d1ac783 100644 --- a/src/Auth/bootstrap-stubs/auth/passwords/email.stub +++ b/src/Auth/bootstrap-stubs/auth/passwords/email.stub @@ -18,7 +18,7 @@ @csrf
- +
diff --git a/src/Auth/bootstrap-stubs/auth/passwords/reset.stub b/src/Auth/bootstrap-stubs/auth/passwords/reset.stub index 7de4c89..dccf6c6 100644 --- a/src/Auth/bootstrap-stubs/auth/passwords/reset.stub +++ b/src/Auth/bootstrap-stubs/auth/passwords/reset.stub @@ -14,7 +14,7 @@
- +
diff --git a/src/Auth/bootstrap-stubs/auth/register.stub b/src/Auth/bootstrap-stubs/auth/register.stub index 057277a..12cad1a 100644 --- a/src/Auth/bootstrap-stubs/auth/register.stub +++ b/src/Auth/bootstrap-stubs/auth/register.stub @@ -26,7 +26,7 @@
- +
diff --git a/src/Auth/bootstrap-stubs/layouts/app.stub b/src/Auth/bootstrap-stubs/layouts/app.stub index ea3f9cd..f8af491 100644 --- a/src/Auth/bootstrap-stubs/layouts/app.stub +++ b/src/Auth/bootstrap-stubs/layouts/app.stub @@ -54,7 +54,7 @@ {{ Auth::user()->name }} -
+
diff --git a/stubs/migrations/2014_10_12_100000_create_password_resets_table.php b/stubs/migrations/2014_10_12_100000_create_password_resets_table.php index 0ee0a36..fcacb80 100644 --- a/stubs/migrations/2014_10_12_100000_create_password_resets_table.php +++ b/stubs/migrations/2014_10_12_100000_create_password_resets_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreatePasswordResetsTable extends Migration +return new class extends Migration { /** * Run the migrations. @@ -29,4 +29,4 @@ public function down() { Schema::dropIfExists('password_resets'); } -} +}; diff --git a/tests/AuthBackend/AuthenticatesUsersTest.php b/tests/AuthBackend/AuthenticatesUsersTest.php index de0fa5f..d25891c 100644 --- a/tests/AuthBackend/AuthenticatesUsersTest.php +++ b/tests/AuthBackend/AuthenticatesUsersTest.php @@ -2,10 +2,12 @@ namespace Laravel\Ui\Tests\AuthBackend; +use Illuminate\Auth\Events\Attempting; use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Http\Request; use Illuminate\Routing\Pipeline; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Event; use Illuminate\Testing\TestResponse; use Illuminate\Validation\ValidationException; use Orchestra\Testbench\Factories\UserFactory; @@ -35,11 +37,63 @@ protected function defineDatabaseMigrations() /** @test */ public function it_can_authenticate_a_user() { + Event::fake(); + + $user = UserFactory::new()->create(); + + $request = Request::create('/login', 'POST', [ + 'email' => $user->email, + 'password' => 'password', + ], [], [], [ + 'HTTP_ACCEPT' => 'application/json', + ]); + + $response = $this->handleRequestUsing($request, function ($request) { + return $this->login($request); + })->assertStatus(204); + + Event::assertDispatched(function (Attempting $event) { + return $event->remember === false; + }); + } + + /** @test */ + public function it_can_authenticate_a_user_with_remember_as_false() + { + Event::fake(); + + $user = UserFactory::new()->create(); + + $request = Request::create('/login', 'POST', [ + 'email' => $user->email, + 'password' => 'password', + 'remember' => false, + ], [], [], [ + 'HTTP_ACCEPT' => 'application/json', + ]); + + $response = $this->handleRequestUsing($request, function ($request) { + return $this->login($request); + })->assertStatus(204); + + Event::assertDispatched(function (Attempting $event) { + return $event->remember === false; + }); + } + + + + /** @test */ + public function it_can_authenticate_a_user_with_remember_as_true() + { + Event::fake(); + $user = UserFactory::new()->create(); $request = Request::create('/login', 'POST', [ 'email' => $user->email, 'password' => 'password', + 'remember' => true, ], [], [], [ 'HTTP_ACCEPT' => 'application/json', ]); @@ -47,6 +101,10 @@ public function it_can_authenticate_a_user() $response = $this->handleRequestUsing($request, function ($request) { return $this->login($request); })->assertStatus(204); + + Event::assertDispatched(function (Attempting $event) { + return $event->remember === true; + }); } /** @test */ diff --git a/tests/AuthBackend/ThrottleLoginsTest.php b/tests/AuthBackend/ThrottleLoginsTest.php new file mode 100644 index 0000000..026dc89 --- /dev/null +++ b/tests/AuthBackend/ThrottleLoginsTest.php @@ -0,0 +1,40 @@ +getMockForTrait(ThrottlesLogins::class, [], '', true, true, true, ['username']); + $throttle->method('username')->willReturn('email'); + $reflection = new \ReflectionClass($throttle); + $method = $reflection->getMethod('throttleKey'); + $method->setAccessible(true); + + $request = $this->mock(Request::class); + $request->expects('input')->with('email')->andReturn($email); + $request->expects('ip')->andReturn('192.168.0.1'); + + $this->assertSame($expectedEmail . '|192.168.0.1', $method->invoke($throttle, $request)); + } + + public function emailProvider(): array + { + return [ + 'lowercase special characters' => ['ⓣⓔⓢⓣ@ⓛⓐⓡⓐⓥⓔⓛ.ⓒⓞⓜ', 'test@laravel.com'], + 'uppercase special characters' => ['ⓉⒺⓈⓉ@ⓁⒶⓇⒶⓋⒺⓁ.ⒸⓄⓂ', 'test@laravel.com'], + 'special character numbers' =>['test⑩⓸③@laravel.com', 'test1043@laravel.com'], + 'default email' => ['test@laravel.com', 'test@laravel.com'], + ]; + } +}