diff --git a/packages/bladebones/templates/Controllers/AccountRecoveryRequestController.bladetmpl b/packages/bladebones/templates/Controllers/AccountRecoveryRequestController.bladetmpl index 444b684..411434a 100644 --- a/packages/bladebones/templates/Controllers/AccountRecoveryRequestController.bladetmpl +++ b/packages/bladebones/templates/Controllers/AccountRecoveryRequestController.bladetmpl @@ -3,15 +3,15 @@ $traits = []; if ($withoutRateLimiting) { - $traits[] = "ClaudioDekker\LaravelAuth\Http\Traits\WithoutRateLimiting"; + $traits[] = "ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutRateLimiting"; } if ($withoutEmailVerification) { - $traits[] = "ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail"; + $traits[] = "ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail"; } if ($flavor !== 'email-based') { - $traits[] = "ClaudioDekker\LaravelAuth\Http\Traits\\" . $flavorTrait; + $traits[] = "ClaudioDekker\LaravelAuth\Http\Modifiers\\" . $flavorTrait; } asort($traits); diff --git a/packages/bladebones/templates/Controllers/Challenges/AccountRecoveryChallengeController.bladetmpl b/packages/bladebones/templates/Controllers/Challenges/AccountRecoveryChallengeController.bladetmpl index 6d13287..27b1194 100644 --- a/packages/bladebones/templates/Controllers/Challenges/AccountRecoveryChallengeController.bladetmpl +++ b/packages/bladebones/templates/Controllers/Challenges/AccountRecoveryChallengeController.bladetmpl @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Auth\Challenges; use ClaudioDekker\LaravelAuth\Http\Controllers\Challenges\AccountRecoveryChallengeController as BaseController; @if ($withoutRateLimiting) -use ClaudioDekker\LaravelAuth\Http\Traits\WithoutRateLimiting; +use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutRateLimiting; @endif use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\View\View; diff --git a/packages/bladebones/templates/Controllers/Challenges/MultiFactorChallengeController.bladetmpl b/packages/bladebones/templates/Controllers/Challenges/MultiFactorChallengeController.bladetmpl index eb4a644..5e0fc2e 100644 --- a/packages/bladebones/templates/Controllers/Challenges/MultiFactorChallengeController.bladetmpl +++ b/packages/bladebones/templates/Controllers/Challenges/MultiFactorChallengeController.bladetmpl @@ -6,10 +6,10 @@ namespace App\Http\Controllers\Auth\Challenges; use ClaudioDekker\LaravelAuth\Http\Controllers\Challenges\MultiFactorChallengeController as BaseController; @if ($flavor !== 'email-based') -use ClaudioDekker\LaravelAuth\Http\Traits\{{ $flavorTrait }}; +use ClaudioDekker\LaravelAuth\Http\Modifiers\{{ $flavorTrait }}; @endif @if ($withoutRateLimiting) -use ClaudioDekker\LaravelAuth\Http\Traits\WithoutRateLimiting; +use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutRateLimiting; @endif use ClaudioDekker\LaravelAuth\Specifications\WebAuthn\Dictionaries\PublicKeyCredentialRequestOptions; use Illuminate\Contracts\Auth\Authenticatable; diff --git a/packages/bladebones/templates/Controllers/Challenges/SudoModeChallengeController.bladetmpl b/packages/bladebones/templates/Controllers/Challenges/SudoModeChallengeController.bladetmpl index cd7356a..5fa375e 100644 --- a/packages/bladebones/templates/Controllers/Challenges/SudoModeChallengeController.bladetmpl +++ b/packages/bladebones/templates/Controllers/Challenges/SudoModeChallengeController.bladetmpl @@ -6,10 +6,10 @@ namespace App\Http\Controllers\Auth\Challenges; use ClaudioDekker\LaravelAuth\Http\Controllers\Challenges\SudoModeChallengeController as BaseController; @if ($flavor !== 'email-based') -use ClaudioDekker\LaravelAuth\Http\Traits\{{ $flavorTrait }}; +use ClaudioDekker\LaravelAuth\Http\Modifiers\{{ $flavorTrait }}; @endif @if ($withoutRateLimiting) -use ClaudioDekker\LaravelAuth\Http\Traits\WithoutRateLimiting; +use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutRateLimiting; @endif use ClaudioDekker\LaravelAuth\Specifications\WebAuthn\Dictionaries\PublicKeyCredentialRequestOptions; use Illuminate\Contracts\View\View; diff --git a/packages/bladebones/templates/Controllers/LoginController.bladetmpl b/packages/bladebones/templates/Controllers/LoginController.bladetmpl index dd39881..382fcec 100644 --- a/packages/bladebones/templates/Controllers/LoginController.bladetmpl +++ b/packages/bladebones/templates/Controllers/LoginController.bladetmpl @@ -7,10 +7,10 @@ namespace App\Http\Controllers\Auth; use ClaudioDekker\LaravelAuth\CredentialType; use ClaudioDekker\LaravelAuth\Http\Controllers\LoginController as BaseController; @if ($flavor !== 'email-based') -use ClaudioDekker\LaravelAuth\Http\Traits\{{ $flavorTrait }}; +use ClaudioDekker\LaravelAuth\Http\Modifiers\{{ $flavorTrait }}; @endif @if ($withoutRateLimiting) -use ClaudioDekker\LaravelAuth\Http\Traits\WithoutRateLimiting; +use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutRateLimiting; @endif use ClaudioDekker\LaravelAuth\Specifications\WebAuthn\Dictionaries\PublicKeyCredentialRequestOptions; use Illuminate\Contracts\Auth\Authenticatable; diff --git a/packages/bladebones/templates/Controllers/RegisterController.bladetmpl b/packages/bladebones/templates/Controllers/RegisterController.bladetmpl index c4ab57d..c977796 100644 --- a/packages/bladebones/templates/Controllers/RegisterController.bladetmpl +++ b/packages/bladebones/templates/Controllers/RegisterController.bladetmpl @@ -3,11 +3,11 @@ $traits = []; if ($withoutEmailVerification) { - $traits[] = "ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail"; + $traits[] = "ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail"; } if ($flavor !== 'email-based') { - $traits[] = "ClaudioDekker\LaravelAuth\Http\Traits\\" . $flavorTrait; + $traits[] = "ClaudioDekker\LaravelAuth\Http\Modifiers\\" . $flavorTrait; } asort($traits); diff --git a/packages/bladebones/templates/Controllers/Settings/RegisterPublicKeyCredentialController.bladetmpl b/packages/bladebones/templates/Controllers/Settings/RegisterPublicKeyCredentialController.bladetmpl index e7f1d64..e4f7b58 100644 --- a/packages/bladebones/templates/Controllers/Settings/RegisterPublicKeyCredentialController.bladetmpl +++ b/packages/bladebones/templates/Controllers/Settings/RegisterPublicKeyCredentialController.bladetmpl @@ -6,7 +6,7 @@ namespace App\Http\Controllers\Auth\Settings; use ClaudioDekker\LaravelAuth\Http\Controllers\Settings\RegisterPublicKeyCredentialController as BaseController; @if ($flavor !== 'email-based') -use ClaudioDekker\LaravelAuth\Http\Traits\{{ $flavorTrait }}; +use ClaudioDekker\LaravelAuth\Http\Modifiers\{{ $flavorTrait }}; @endif use ClaudioDekker\LaravelAuth\Specifications\WebAuthn\Dictionaries\PublicKeyCredentialCreationOptions; use ClaudioDekker\WordGenerator\Generator; diff --git a/packages/bladebones/templates/Controllers/Settings/RegisterTotpCredentialController.bladetmpl b/packages/bladebones/templates/Controllers/Settings/RegisterTotpCredentialController.bladetmpl index e12a7a2..d264451 100644 --- a/packages/bladebones/templates/Controllers/Settings/RegisterTotpCredentialController.bladetmpl +++ b/packages/bladebones/templates/Controllers/Settings/RegisterTotpCredentialController.bladetmpl @@ -6,7 +6,7 @@ namespace App\Http\Controllers\Auth\Settings; use ClaudioDekker\LaravelAuth\Http\Controllers\Settings\RegisterTotpCredentialController as BaseController; @if ($flavor !== 'email-based') -use ClaudioDekker\LaravelAuth\Http\Traits\{{ $flavorTrait }}; +use ClaudioDekker\LaravelAuth\Http\Modifiers\{{ $flavorTrait }}; @endif use ClaudioDekker\WordGenerator\Generator; use Illuminate\Contracts\View\View; diff --git a/packages/bladebones/tests/Feature/Console/GenerateCommandTest.php b/packages/bladebones/tests/Feature/Console/GenerateCommandTest.php index af0edec..eaa1689 100644 --- a/packages/bladebones/tests/Feature/Console/GenerateCommandTest.php +++ b/packages/bladebones/tests/Feature/Console/GenerateCommandTest.php @@ -62,7 +62,7 @@ public function it_accepts_all_default_options_without_prompting_when_passing_th $this->assertMockShouldReceiveControllerWithRateLimiting('Challenges/SudoModeChallengeController'); $this->assertMockShouldReceiveControllerWithRateLimiting('LoginController'); $this->assertMockShouldReceiveControllerWithRateLimiting('RegisterController', function ($contents) { - $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail;\n", $contents); + $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail;\n", $contents); $this->assertStringNotContainsString("use WithoutVerificationEmail;\n", $contents); }); $this->assertMockShouldReceiveTest('Unit/PruneUnclaimedUsersTest'); @@ -162,7 +162,7 @@ public function it_asks_whether_you_want_to_use_rate_limiting(): void $this->assertMockShouldReceiveControllerWithRateLimiting('Challenges/SudoModeChallengeController'); $this->assertMockShouldReceiveControllerWithRateLimiting('LoginController'); $this->assertMockShouldReceiveControllerWithRateLimiting('RegisterController', function ($contents) { - $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail;\n", $contents); + $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail;\n", $contents); $this->assertStringContainsString("use WithoutVerificationEmail;\n", $contents); }); $this->assertMockShouldReceiveTest('Unit/PruneUnclaimedUsersTest'); @@ -250,7 +250,7 @@ public function it_disables_rate_limiting_when_you_answer_the_rate_limiting_ques $this->assertMockShouldReceiveControllerWithoutRateLimiting('Challenges/SudoModeChallengeController'); $this->assertMockShouldReceiveControllerWithoutRateLimiting('LoginController'); $this->assertMockShouldReceiveController('RegisterController', function ($contents) { - $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail;\n", $contents); + $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail;\n", $contents); $this->assertStringContainsString("use WithoutVerificationEmail;\n", $contents); }); $this->assertMockShouldReceiveTest('Unit/PruneUnclaimedUsersTest'); @@ -337,7 +337,7 @@ public function it_disables_rate_limiting_when_the_without_rate_limiting_flag_wa $this->assertMockShouldReceiveControllerWithoutRateLimiting('Challenges/SudoModeChallengeController'); $this->assertMockShouldReceiveControllerWithoutRateLimiting('LoginController'); $this->assertMockShouldReceiveController('RegisterController', function ($contents) { - $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail;\n", $contents); + $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail;\n", $contents); $this->assertStringNotContainsString("use WithoutVerificationEmail;\n", $contents); }); $this->assertMockShouldReceiveTest('Unit/PruneUnclaimedUsersTest'); @@ -425,7 +425,7 @@ public function it_asks_whether_you_want_to_send_verification_emails_on_registra $this->assertMockShouldReceiveControllerWithoutRateLimiting('Challenges/SudoModeChallengeController'); $this->assertMockShouldReceiveControllerWithoutRateLimiting('LoginController'); $this->assertMockShouldReceiveController('RegisterController', function ($contents) { - $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail;\n", $contents); + $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail;\n", $contents); $this->assertStringNotContainsString("use WithoutVerificationEmail;\n", $contents); }); $this->assertMockShouldReceiveTest('Unit/PruneUnclaimedUsersTest'); @@ -513,7 +513,7 @@ public function it_does_not_send_verification_emails_on_registration_when_you_an $this->assertMockShouldReceiveControllerWithoutRateLimiting('Challenges/SudoModeChallengeController'); $this->assertMockShouldReceiveControllerWithoutRateLimiting('LoginController'); $this->assertMockShouldReceiveController('RegisterController', function ($contents) { - $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail;\n", $contents); + $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail;\n", $contents); $this->assertStringContainsString("use WithoutVerificationEmail;\n", $contents); }); $this->assertMockShouldReceiveTest('Unit/PruneUnclaimedUsersTest'); @@ -600,7 +600,7 @@ public function it_does_not_send_verification_emails_on_registration_when_the_re $this->assertMockShouldReceiveControllerWithoutRateLimiting('Challenges/SudoModeChallengeController'); $this->assertMockShouldReceiveControllerWithoutRateLimiting('LoginController'); $this->assertMockShouldReceiveController('RegisterController', function ($contents) { - $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail;\n", $contents); + $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail;\n", $contents); $this->assertStringContainsString("use WithoutVerificationEmail;\n", $contents); }); $this->assertMockShouldReceiveTest('Unit/PruneUnclaimedUsersTest'); @@ -688,7 +688,7 @@ public function it_does_not_create_views_and_view_tests_when_the_without_views_f $this->assertMockShouldReceiveControllerWithRateLimiting('Challenges/SudoModeChallengeController'); $this->assertMockShouldReceiveControllerWithRateLimiting('LoginController'); $this->assertMockShouldReceiveControllerWithRateLimiting('RegisterController', function ($contents) { - $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail;\n", $contents); + $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail;\n", $contents); $this->assertStringNotContainsString("use WithoutVerificationEmail;\n", $contents); }); $this->assertMockShouldReceiveTest('Unit/PruneUnclaimedUsersTest'); @@ -785,12 +785,12 @@ public function it_asks_what_flavor_of_user_accounts_should_be_used(): void $this->assertMockShouldReceiveControllerWithoutRateLimiting('Challenges/MultiFactorChallengeController'); $this->assertMockShouldReceiveControllerWithoutRateLimiting('Challenges/SudoModeChallengeController'); $this->assertMockShouldReceiveControllerWithoutRateLimiting('LoginController', function ($contents) { - $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\UsernameBased;\n", $contents); + $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\UsernameBased;\n", $contents); $this->assertStringContainsString("use UsernameBased;\n", $contents); }); $this->assertMockShouldReceiveController('RegisterController', function ($contents) { - $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\UsernameBased;\n", $contents); - $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutVerificationEmail;\n", $contents); + $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\UsernameBased;\n", $contents); + $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutVerificationEmail;\n", $contents); $this->assertStringContainsString("use UsernameBased;\n", $contents); $this->assertStringContainsString("use WithoutVerificationEmail;\n", $contents); }); @@ -875,7 +875,7 @@ protected function assertMockShouldReceiveControllerWithRateLimiting(string $fil $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Controllers\\$className as BaseController;\n", $contents); $this->assertStringContainsString("\n\nclass $relativeClassName extends BaseController\n{\n", $contents); - $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutRateLimiting;\n", $contents); + $this->assertStringNotContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutRateLimiting;\n", $contents); $this->assertStringNotContainsString("use WithoutRateLimiting;\n", $contents); if ($callback) { @@ -896,7 +896,7 @@ protected function assertMockShouldReceiveControllerWithoutRateLimiting(string $ $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Controllers\\$className as BaseController;\n", $contents); $this->assertStringContainsString("\n\nclass $relativeClassName extends BaseController\n{\n", $contents); - $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Traits\WithoutRateLimiting;\n", $contents); + $this->assertStringContainsString("use ClaudioDekker\LaravelAuth\Http\Modifiers\WithoutRateLimiting;\n", $contents); $this->assertStringContainsString("use WithoutRateLimiting;\n", $contents); if ($callback) { diff --git a/packages/core/src/Http/Controllers/Challenges/AccountRecoveryChallengeController.php b/packages/core/src/Http/Controllers/Challenges/AccountRecoveryChallengeController.php index 9242958..028ec93 100644 --- a/packages/core/src/Http/Controllers/Challenges/AccountRecoveryChallengeController.php +++ b/packages/core/src/Http/Controllers/Challenges/AccountRecoveryChallengeController.php @@ -5,8 +5,8 @@ use ClaudioDekker\LaravelAuth\Events\AccountRecovered; use ClaudioDekker\LaravelAuth\Events\AccountRecoveryFailed; use ClaudioDekker\LaravelAuth\Events\Mixins\EmitsLockoutEvent; -use ClaudioDekker\LaravelAuth\Http\Concerns\EnablesSudoMode; use ClaudioDekker\LaravelAuth\Http\Concerns\InteractsWithRateLimiting; +use ClaudioDekker\LaravelAuth\Http\Mixins\EnablesSudoMode; use ClaudioDekker\LaravelAuth\LaravelAuth; use ClaudioDekker\LaravelAuth\RecoveryCodeManager; use Illuminate\Contracts\Auth\Authenticatable; diff --git a/packages/core/src/Http/Controllers/Challenges/MultiFactorChallengeController.php b/packages/core/src/Http/Controllers/Challenges/MultiFactorChallengeController.php index a917c9a..7ead2a7 100644 --- a/packages/core/src/Http/Controllers/Challenges/MultiFactorChallengeController.php +++ b/packages/core/src/Http/Controllers/Challenges/MultiFactorChallengeController.php @@ -6,10 +6,10 @@ use ClaudioDekker\LaravelAuth\Events\Mixins\EmitsAuthenticatedEvent; use ClaudioDekker\LaravelAuth\Events\Mixins\EmitsLockoutEvent; use ClaudioDekker\LaravelAuth\Events\MultiFactorChallengeFailed; -use ClaudioDekker\LaravelAuth\Http\Concerns\Challenges\PublicKeyChallenge; -use ClaudioDekker\LaravelAuth\Http\Concerns\Challenges\TotpChallenge; -use ClaudioDekker\LaravelAuth\Http\Concerns\EnablesSudoMode; -use ClaudioDekker\LaravelAuth\Http\Traits\EmailBased; +use ClaudioDekker\LaravelAuth\Http\Mixins\Challenges\PublicKeyChallenge; +use ClaudioDekker\LaravelAuth\Http\Mixins\Challenges\TotpChallenge; +use ClaudioDekker\LaravelAuth\Http\Mixins\EnablesSudoMode; +use ClaudioDekker\LaravelAuth\Http\Modifiers\EmailBased; use ClaudioDekker\LaravelAuth\LaravelAuth; use ClaudioDekker\LaravelAuth\Methods\WebAuthn\Objects\CredentialAttributes; use ClaudioDekker\LaravelAuth\Specifications\WebAuthn\Dictionaries\PublicKeyCredentialRequestOptions; diff --git a/packages/core/src/Http/Controllers/Challenges/SudoModeChallengeController.php b/packages/core/src/Http/Controllers/Challenges/SudoModeChallengeController.php index 4d293e4..06af0bc 100644 --- a/packages/core/src/Http/Controllers/Challenges/SudoModeChallengeController.php +++ b/packages/core/src/Http/Controllers/Challenges/SudoModeChallengeController.php @@ -5,11 +5,11 @@ use App\Providers\RouteServiceProvider; use ClaudioDekker\LaravelAuth\Events\Mixins\EmitsLockoutEvent; use ClaudioDekker\LaravelAuth\Events\SudoModeEnabled; -use ClaudioDekker\LaravelAuth\Http\Concerns\Challenges\PasswordChallenge; -use ClaudioDekker\LaravelAuth\Http\Concerns\Challenges\PublicKeyChallenge; -use ClaudioDekker\LaravelAuth\Http\Concerns\EnablesSudoMode; use ClaudioDekker\LaravelAuth\Http\Middleware\EnsureSudoMode; -use ClaudioDekker\LaravelAuth\Http\Traits\EmailBased; +use ClaudioDekker\LaravelAuth\Http\Mixins\Challenges\PasswordChallenge; +use ClaudioDekker\LaravelAuth\Http\Mixins\Challenges\PublicKeyChallenge; +use ClaudioDekker\LaravelAuth\Http\Mixins\EnablesSudoMode; +use ClaudioDekker\LaravelAuth\Http\Modifiers\EmailBased; use ClaudioDekker\LaravelAuth\Specifications\WebAuthn\Dictionaries\PublicKeyCredentialRequestOptions; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Http\Request; diff --git a/packages/core/src/Http/Controllers/LoginController.php b/packages/core/src/Http/Controllers/LoginController.php index 18b01cd..917eeae 100644 --- a/packages/core/src/Http/Controllers/LoginController.php +++ b/packages/core/src/Http/Controllers/LoginController.php @@ -5,11 +5,11 @@ use App\Providers\RouteServiceProvider; use ClaudioDekker\LaravelAuth\Events\AuthenticationFailed; use ClaudioDekker\LaravelAuth\Events\Mixins\EmitsAuthenticatedEvent; -use ClaudioDekker\LaravelAuth\Http\Concerns\EnablesSudoMode; use ClaudioDekker\LaravelAuth\Http\Concerns\HandlesLogouts; use ClaudioDekker\LaravelAuth\Http\Concerns\Login\PasskeyBasedAuthentication; use ClaudioDekker\LaravelAuth\Http\Concerns\Login\PasswordBasedAuthentication; -use ClaudioDekker\LaravelAuth\Http\Traits\EmailBased; +use ClaudioDekker\LaravelAuth\Http\Mixins\EnablesSudoMode; +use ClaudioDekker\LaravelAuth\Http\Modifiers\EmailBased; use ClaudioDekker\LaravelAuth\Specifications\WebAuthn\Dictionaries\PublicKeyCredentialRequestOptions; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Contracts\Auth\Authenticatable; diff --git a/packages/core/src/Http/Controllers/RegisterController.php b/packages/core/src/Http/Controllers/RegisterController.php index 8757acc..cb596d4 100644 --- a/packages/core/src/Http/Controllers/RegisterController.php +++ b/packages/core/src/Http/Controllers/RegisterController.php @@ -3,10 +3,10 @@ namespace ClaudioDekker\LaravelAuth\Http\Controllers; use App\Providers\RouteServiceProvider; -use ClaudioDekker\LaravelAuth\Http\Concerns\EnablesSudoMode; use ClaudioDekker\LaravelAuth\Http\Concerns\Registration\PasskeyBasedRegistration; use ClaudioDekker\LaravelAuth\Http\Concerns\Registration\PasswordBasedRegistration; -use ClaudioDekker\LaravelAuth\Http\Traits\EmailBased; +use ClaudioDekker\LaravelAuth\Http\Mixins\EnablesSudoMode; +use ClaudioDekker\LaravelAuth\Http\Modifiers\EmailBased; use Illuminate\Auth\Events\Registered; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Http\Request; diff --git a/packages/core/src/Http/Controllers/Settings/RegisterPublicKeyCredentialController.php b/packages/core/src/Http/Controllers/Settings/RegisterPublicKeyCredentialController.php index 13b5a32..1a98437 100644 --- a/packages/core/src/Http/Controllers/Settings/RegisterPublicKeyCredentialController.php +++ b/packages/core/src/Http/Controllers/Settings/RegisterPublicKeyCredentialController.php @@ -3,7 +3,7 @@ namespace ClaudioDekker\LaravelAuth\Http\Controllers\Settings; use ClaudioDekker\LaravelAuth\CredentialType; -use ClaudioDekker\LaravelAuth\Http\Traits\EmailBased; +use ClaudioDekker\LaravelAuth\Http\Modifiers\EmailBased; use ClaudioDekker\LaravelAuth\LaravelAuth; use ClaudioDekker\LaravelAuth\Methods\WebAuthn\Contracts\WebAuthnContract as WebAuthn; use ClaudioDekker\LaravelAuth\Methods\WebAuthn\Exceptions\InvalidPublicKeyCredentialException; diff --git a/packages/core/src/Http/Controllers/Settings/RegisterTotpCredentialController.php b/packages/core/src/Http/Controllers/Settings/RegisterTotpCredentialController.php index e6d48e6..2603f16 100644 --- a/packages/core/src/Http/Controllers/Settings/RegisterTotpCredentialController.php +++ b/packages/core/src/Http/Controllers/Settings/RegisterTotpCredentialController.php @@ -3,7 +3,7 @@ namespace ClaudioDekker\LaravelAuth\Http\Controllers\Settings; use ClaudioDekker\LaravelAuth\CredentialType; -use ClaudioDekker\LaravelAuth\Http\Traits\EmailBased; +use ClaudioDekker\LaravelAuth\Http\Modifiers\EmailBased; use ClaudioDekker\LaravelAuth\LaravelAuth; use ClaudioDekker\LaravelAuth\Methods\Totp\Contracts\TotpContract as Totp; use Illuminate\Http\Request; diff --git a/packages/core/src/Http/Concerns/Challenges/PasswordChallenge.php b/packages/core/src/Http/Mixins/Challenges/PasswordChallenge.php similarity index 97% rename from packages/core/src/Http/Concerns/Challenges/PasswordChallenge.php rename to packages/core/src/Http/Mixins/Challenges/PasswordChallenge.php index c45b0c1..6ec9f27 100644 --- a/packages/core/src/Http/Concerns/Challenges/PasswordChallenge.php +++ b/packages/core/src/Http/Mixins/Challenges/PasswordChallenge.php @@ -1,6 +1,6 @@