From 6d20804b507f25547da38c73396eb63256a8627d Mon Sep 17 00:00:00 2001 From: Ryan Mortier Date: Mon, 10 Jan 2022 17:16:04 -0500 Subject: [PATCH 01/19] Update app.stub with correct Bootstrap 5 class (#215) --- src/Auth/bootstrap-stubs/layouts/app.stub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Auth/bootstrap-stubs/layouts/app.stub b/src/Auth/bootstrap-stubs/layouts/app.stub index e9d8d2b..9961df7 100644 --- a/src/Auth/bootstrap-stubs/layouts/app.stub +++ b/src/Auth/bootstrap-stubs/layouts/app.stub @@ -57,7 +57,7 @@ {{ Auth::user()->name }} -
+
From f124752e628aed14a0b0a9878b3072c691a14e92 Mon Sep 17 00:00:00 2001 From: madman-81 <50033071+madman-81@users.noreply.github.com> Date: Thu, 20 Jan 2022 14:56:29 +0100 Subject: [PATCH 02/19] Use the same notation for email as Laravel Framework does (#217) Co-authored-by: Aarjan --- src/Auth/bootstrap-stubs/auth/login.stub | 2 +- src/Auth/bootstrap-stubs/auth/passwords/email.stub | 2 +- src/Auth/bootstrap-stubs/auth/passwords/reset.stub | 2 +- src/Auth/bootstrap-stubs/auth/register.stub | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 @@
- +
From 7a4397c6ba8a0b8e2d7a674ee219ef8af0c1826a Mon Sep 17 00:00:00 2001 From: Liam Hackett Date: Thu, 20 Jan 2022 15:49:00 +0000 Subject: [PATCH 03/19] [3.x] Fix bug where special characters can be used when generating throttle key (#216) * Fix bug where special characters can be used when generating throttle keys * Update ThrottlesLogins.php * Update ThrottlesLogins.php Co-authored-by: Liam Hackett Co-authored-by: Taylor Otwell --- auth-backend/ThrottlesLogins.php | 84 +++++++++++++++++++++++- tests/AuthBackend/ThrottleLoginsTest.php | 66 +++++++++++++++++++ 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 tests/AuthBackend/ThrottleLoginsTest.php diff --git a/auth-backend/ThrottlesLogins.php b/auth-backend/ThrottlesLogins.php index 6463a50..a6ffb92 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 $this->removeSpecialCharacters(Str::lower($request->input($this->username())).'|'.$request->ip()); } /** @@ -121,4 +121,86 @@ public function decayMinutes() { return property_exists($this, 'decayMinutes') ? $this->decayMinutes : 1; } + + /** + * Remove special characters that may allow users to bypass rate limiting. + * + * @param string $key + * @return string + */ + protected function removeSpecialCharacters($key) + { + $values = [ + 'ⓐ' => 'a', + 'ⓑ' => 'b', + 'ⓒ' => 'c', + 'ⓓ' => 'd', + 'ⓔ' => 'e', + 'ⓕ' => 'f', + 'ⓖ' => 'g', + 'ⓗ' => 'h', + 'ⓘ' => 'i', + 'ⓙ' => 'j', + 'ⓚ' => 'k', + 'ⓛ' => 'l', + 'ⓜ' => 'm', + 'ⓝ' => 'n', + 'ⓞ' => 'o', + 'ⓟ' => 'p', + 'ⓠ' => 'q', + 'ⓡ' => 'r', + 'ⓢ' => 's', + 'ⓣ' => 't', + 'ⓤ' => 'u', + 'ⓥ' => 'v', + 'ⓦ' => 'w', + 'ⓧ' => 'x', + 'ⓨ' => 'y', + 'ⓩ' => 'z', + '①' => '1', + '②' => '2', + '③' => '3', + '④' => '4', + '⑤' => '5', + '⑥' => '6', + '⑦' => '7', + '⑧' => '8', + '⑨' => '9', + '⑩' => '10', + '⑪' => '11', + '⑫' => '12', + '⑬' => '13', + '⑭' => '14', + '⑮' => '15', + '⑯' => '16', + '⑰' => '17', + '⑱' => '18', + '⑲' => '19', + '⑳' => '20', + '⓪' => '0', + '⓵' => '1', + '⓶' => '2', + '⓷' => '3', + '⓸' => '4', + '⓹' => '5', + '⓺' => '6', + '⓻' => '7', + '⓼' => '8', + '⓽' => '9', + '⓾' => '10', + '⓫' => '11', + '⓬' => '12', + '⓭' => '13', + '⓮' => '14', + '⓯' => '15', + '⓰' => '16', + '⓱' => '17', + '⓲' => '18', + '⓳' => '19', + '⓴' => '20', + '⓿' => '0', + ]; + + return strtr($key, $values); + } } diff --git a/tests/AuthBackend/ThrottleLoginsTest.php b/tests/AuthBackend/ThrottleLoginsTest.php new file mode 100644 index 0000000..d04adb5 --- /dev/null +++ b/tests/AuthBackend/ThrottleLoginsTest.php @@ -0,0 +1,66 @@ +getMockForTrait(ThrottlesLogins::class); + $reflection = new \ReflectionClass($throttle); + $method = $reflection->getMethod('removeSpecialCharacters'); + $method->setAccessible(true); + + $this->assertSame($expected, $method->invoke($throttle, $value)); + } + + public function specialCharacterProvider(): array + { + return [ + ['ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ', 'abcdefghijklmnopqrstuvwxyz'], + ['⓪①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳', '01234567891011121314151617181920'], + ['⓵⓶⓷⓸⓹⓺⓻⓼⓽⓾', '12345678910'], + ['⓿⓫⓬⓭⓮⓯⓰⓱⓲⓳⓴', '011121314151617181920'], + ['abcdefghijklmnopqrstuvwxyz', 'abcdefghijklmnopqrstuvwxyz'], + ['0123456789', '0123456789'], + ]; + } + + /** + * @test + * @dataProvider emailProvider + */ + public function it_can_generate_throttle_key(string $email, string $expectedEmail): void + { + $throttle = $this->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'], + ]; + } +} From e01198123f7f4369d13c1f83a897c3f5e97fc9f4 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 25 Jan 2022 21:15:56 +0100 Subject: [PATCH 04/19] Update CHANGELOG.md --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b7f7c8..e7cbc93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Release Notes -## [Unreleased](https://github.com/laravel/ui/compare/v3.4.1...3.x) +## [Unreleased](https://github.com/laravel/ui/compare/v3.4.2...3.x) + + +## [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) From bc44a9cdce24d36a76dc64e6920e2c966580d659 Mon Sep 17 00:00:00 2001 From: Liam Hackett Date: Sat, 5 Feb 2022 17:34:02 +0000 Subject: [PATCH 05/19] [3.x] Replace removeSpecialCharacters method with Str Helper Equivalent (#219) * Bump support requirment to include new String transliteration helper * Replace removeSpecialCharacters method with Str transliteration method Co-authored-by: Liam Hackett --- auth-backend/ThrottlesLogins.php | 84 +----------------------- composer.json | 2 +- tests/AuthBackend/ThrottleLoginsTest.php | 26 -------- 3 files changed, 2 insertions(+), 110 deletions(-) diff --git a/auth-backend/ThrottlesLogins.php b/auth-backend/ThrottlesLogins.php index a6ffb92..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 $this->removeSpecialCharacters(Str::lower($request->input($this->username())).'|'.$request->ip()); + return Str::transliterate(Str::lower($request->input($this->username())).'|'.$request->ip()); } /** @@ -121,86 +121,4 @@ public function decayMinutes() { return property_exists($this, 'decayMinutes') ? $this->decayMinutes : 1; } - - /** - * Remove special characters that may allow users to bypass rate limiting. - * - * @param string $key - * @return string - */ - protected function removeSpecialCharacters($key) - { - $values = [ - 'ⓐ' => 'a', - 'ⓑ' => 'b', - 'ⓒ' => 'c', - 'ⓓ' => 'd', - 'ⓔ' => 'e', - 'ⓕ' => 'f', - 'ⓖ' => 'g', - 'ⓗ' => 'h', - 'ⓘ' => 'i', - 'ⓙ' => 'j', - 'ⓚ' => 'k', - 'ⓛ' => 'l', - 'ⓜ' => 'm', - 'ⓝ' => 'n', - 'ⓞ' => 'o', - 'ⓟ' => 'p', - 'ⓠ' => 'q', - 'ⓡ' => 'r', - 'ⓢ' => 's', - 'ⓣ' => 't', - 'ⓤ' => 'u', - 'ⓥ' => 'v', - 'ⓦ' => 'w', - 'ⓧ' => 'x', - 'ⓨ' => 'y', - 'ⓩ' => 'z', - '①' => '1', - '②' => '2', - '③' => '3', - '④' => '4', - '⑤' => '5', - '⑥' => '6', - '⑦' => '7', - '⑧' => '8', - '⑨' => '9', - '⑩' => '10', - '⑪' => '11', - '⑫' => '12', - '⑬' => '13', - '⑭' => '14', - '⑮' => '15', - '⑯' => '16', - '⑰' => '17', - '⑱' => '18', - '⑲' => '19', - '⑳' => '20', - '⓪' => '0', - '⓵' => '1', - '⓶' => '2', - '⓷' => '3', - '⓸' => '4', - '⓹' => '5', - '⓺' => '6', - '⓻' => '7', - '⓼' => '8', - '⓽' => '9', - '⓾' => '10', - '⓫' => '11', - '⓬' => '12', - '⓭' => '13', - '⓮' => '14', - '⓯' => '15', - '⓰' => '16', - '⓱' => '17', - '⓲' => '18', - '⓳' => '19', - '⓴' => '20', - '⓿' => '0', - ]; - - return strtr($key, $values); - } } diff --git a/composer.json b/composer.json index 214a59c..01177c3 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/tests/AuthBackend/ThrottleLoginsTest.php b/tests/AuthBackend/ThrottleLoginsTest.php index d04adb5..026dc89 100644 --- a/tests/AuthBackend/ThrottleLoginsTest.php +++ b/tests/AuthBackend/ThrottleLoginsTest.php @@ -9,32 +9,6 @@ class ThrottleLoginsTest extends TestCase { - /** - * @test - * @dataProvider specialCharacterProvider - */ - public function it_can_replace_special_characters(string $value, string $expected): void - { - $throttle = $this->getMockForTrait(ThrottlesLogins::class); - $reflection = new \ReflectionClass($throttle); - $method = $reflection->getMethod('removeSpecialCharacters'); - $method->setAccessible(true); - - $this->assertSame($expected, $method->invoke($throttle, $value)); - } - - public function specialCharacterProvider(): array - { - return [ - ['ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ', 'abcdefghijklmnopqrstuvwxyz'], - ['⓪①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳', '01234567891011121314151617181920'], - ['⓵⓶⓷⓸⓹⓺⓻⓼⓽⓾', '12345678910'], - ['⓿⓫⓬⓭⓮⓯⓰⓱⓲⓳⓴', '011121314151617181920'], - ['abcdefghijklmnopqrstuvwxyz', 'abcdefghijklmnopqrstuvwxyz'], - ['0123456789', '0123456789'], - ]; - } - /** * @test * @dataProvider emailProvider From 64a0f43492c00780b2261c56cd7007a4f370d95b Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 8 Feb 2022 15:19:32 +0100 Subject: [PATCH 06/19] Create update-changelog.yml --- .github/workflows/update-changelog.yml | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/update-changelog.yml diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml new file mode 100644 index 0000000..0200e2b --- /dev/null +++ b/.github/workflows/update-changelog.yml @@ -0,0 +1,29 @@ +name: "Update Changelog" + +on: + release: + types: [released] + +jobs: + update: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + ref: ${{ github.ref_name }} + + - name: Update Changelog + uses: stefanzweifel/changelog-updater-action@v1 + with: + latest-version: ${{ github.event.release.tag_name }} + release-notes: ${{ github.event.release.body }} + compare-url-target-revision: ${{ github.event.release.target_commitish }} + + - name: Commit updated CHANGELOG + uses: stefanzweifel/git-auto-commit-action@v4 + with: + branch: ${{ github.event.release.target_commitish }} + commit_message: Update CHANGELOG.md + file_pattern: CHANGELOG.md From 337fa05a94623797f2e6f42c5d54ce8578fdb3f7 Mon Sep 17 00:00:00 2001 From: driesvints Date: Tue, 8 Feb 2022 19:35:23 +0000 Subject: [PATCH 07/19] Update CHANGELOG.md --- CHANGELOG.md | 68 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7cbc93..ca2f3b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,195 +1,209 @@ # Release Notes -## [Unreleased](https://github.com/laravel/ui/compare/v3.4.2...3.x) +## [Unreleased](https://github.com/laravel/ui/compare/v3.4.3...3.x) +## [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) From 3b522afdb7dc5fef1cb972fe3aac8986c8babe4b Mon Sep 17 00:00:00 2001 From: Antonio Pauletich Date: Thu, 10 Feb 2022 15:39:41 +0100 Subject: [PATCH 08/19] Update README to reflect Laravel 9 support (#221) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 91d43d0..b40d3df 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Only the latest major version of Laravel UI receives bug fixes. The table below |---- |----| | [1.x](https://github.com/laravel/ui/tree/1.x) | 5.8, 6.x | | [2.x](https://github.com/laravel/ui/tree/2.x) | 7.x | -| [3.x](https://github.com/laravel/ui/tree/3.x) | 8.x | +| [3.x](https://github.com/laravel/ui/tree/3.x) | 8.x, 9.x | ### Installation From 1596de849ecafc0bcc891389da939012b67f9d5c Mon Sep 17 00:00:00 2001 From: Hannah Massey <64495914+hannah-massey@users.noreply.github.com> Date: Fri, 11 Feb 2022 01:38:33 +0300 Subject: [PATCH 09/19] Update ConfirmsPasswords.php (#222) password rule was renamed to current_password with the intention of removing it in Laravel 9. Please use the Current Password rule instead. --- auth-backend/ConfirmsPasswords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', ]; } From cf6e83affaf483daf0e6aac67c6afcef725e0c47 Mon Sep 17 00:00:00 2001 From: driesvints Date: Tue, 15 Feb 2022 18:18:14 +0000 Subject: [PATCH 10/19] Update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca2f3b1..e62abd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/ui/compare/v3.4.3...3.x) +## [Unreleased](https://github.com/laravel/ui/compare/v3.4.4...3.x) + +## [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 From f11d295de1508c5bb56206a620b00b6616de414c Mon Sep 17 00:00:00 2001 From: ashkanfekri <31134156+ashkanfekridev@users.noreply.github.com> Date: Mon, 21 Feb 2022 18:29:16 +0330 Subject: [PATCH 11/19] Update 2014_10_12_100000_create_password_resets_table.php (#223) --- .../2014_10_12_100000_create_password_resets_table.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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'); } -} +}; From 9f33c57f79de1a5c8e8c0e381c0898c014bcbcd1 Mon Sep 17 00:00:00 2001 From: driesvints Date: Tue, 22 Feb 2022 16:26:50 +0000 Subject: [PATCH 12/19] Update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e62abd8..fa84302 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/ui/compare/v3.4.4...3.x) +## [Unreleased](https://github.com/laravel/ui/compare/v3.4.5...3.x) + +## [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 From 5ce78cf9d65964a0e1cbace98c233b8700a56266 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 23 Mar 2022 13:38:41 +0100 Subject: [PATCH 13/19] Update update-changelog.yml --- .github/workflows/update-changelog.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 0200e2b..eaeaf1f 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -6,24 +6,4 @@ on: jobs: update: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - ref: ${{ github.ref_name }} - - - name: Update Changelog - uses: stefanzweifel/changelog-updater-action@v1 - with: - latest-version: ${{ github.event.release.tag_name }} - release-notes: ${{ github.event.release.body }} - compare-url-target-revision: ${{ github.event.release.target_commitish }} - - - name: Commit updated CHANGELOG - uses: stefanzweifel/git-auto-commit-action@v4 - with: - branch: ${{ github.event.release.target_commitish }} - commit_message: Update CHANGELOG.md - file_pattern: CHANGELOG.md + uses: laravel/.github/.github/workflows/update-changelog.yml@main From 6843bd4ca835adaae24b8d4d6403bda8ddc52708 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 8 Apr 2022 11:09:29 +0200 Subject: [PATCH 14/19] Create pull-requests.yml --- .github/workflows/pull-requests.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/pull-requests.yml diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml new file mode 100644 index 0000000..156b46e --- /dev/null +++ b/.github/workflows/pull-requests.yml @@ -0,0 +1,13 @@ +name: Pull Requests + +on: + pull_request_target: + types: + - opened + +permissions: + pull-requests: write + +jobs: + uneditable: + uses: laravel/.github/.github/workflows/pull-requests.yml@main From a76cf22f0309769337ea40671bac335293c925ea Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 8 Apr 2022 15:54:20 +0200 Subject: [PATCH 15/19] Update tests.yml (#226) --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) 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 From 65ec5c03f7fee2c8ecae785795b829a15be48c2c Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 May 2022 21:38:08 +0800 Subject: [PATCH 16/19] Fixes AuthenticatesUsers always force remember me (#227) Signed-off-by: Mior Muhammad Zaki --- auth-backend/AuthenticatesUsers.php | 2 +- tests/AuthBackend/AuthenticatesUsersTest.php | 58 ++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) 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/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 */ From 90fe0ad4bb5d8e41930bbf168c8c7b76d656ecd9 Mon Sep 17 00:00:00 2001 From: driesvints Date: Tue, 24 May 2022 15:13:03 +0000 Subject: [PATCH 17/19] Update CHANGELOG --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa84302..2e730f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/ui/compare/v3.4.5...3.x) +## [Unreleased](https://github.com/laravel/ui/compare/v3.4.6...3.x) + +## [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 From 22ac3e60896b04e61335b912b565a39a953901ca Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 8 Jun 2022 11:53:39 +0200 Subject: [PATCH 18/19] Update pull-requests.yml --- .github/workflows/pull-requests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 156b46e..18b32b3 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -1,9 +1,8 @@ -name: Pull Requests +name: pull requests on: pull_request_target: - types: - - opened + types: [opened] permissions: pull-requests: write From 9ee902df67b7d1c79d72a249d99ccca4524dff54 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 8 Jun 2022 11:53:51 +0200 Subject: [PATCH 19/19] Update update-changelog.yml --- .github/workflows/update-changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index eaeaf1f..1625bda 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -1,4 +1,4 @@ -name: "Update Changelog" +name: update changelog on: release: