Skip to content

Commit 13c4bde

Browse files
committed
- Simplified auth controllers
1 parent 1b35fc1 commit 13c4bde

12 files changed

+2
-136
lines changed

stubs/Controllers/Auth/ConfirmPasswordController.stub

-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@ use Javaabu\Auth\User as UserContract;
77

88
class ConfirmPasswordController extends \Javaabu\Auth\Http\Controllers\Auth\ConfirmPasswordController
99
{
10-
/**
11-
* Apply middlewares for the controller. Used in the constructor.
12-
* Helps with applying/changing applied middlewares for the controller.
13-
*/
14-
public function applyMiddlewares(): void
15-
{
16-
$this->middleware('auth:web_{{singularSnake}}');
17-
}
18-
1910
#[\Override]
2011
public function getConfirmForm(): View
2112
{

stubs/Controllers/Auth/LoginController.stub

-12
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,11 @@
22

33
namespace App\Http\Controllers\{{studlyAuthName}}\Auth;
44

5-
use Illuminate\Contracts\Auth\StatefulGuard;
6-
use Illuminate\Support\Facades\Auth;
75
use Illuminate\View\View;
86
use Javaabu\Auth\User as UserContract;
97

108
class LoginController extends \Javaabu\Auth\Http\Controllers\Auth\LoginController
119
{
12-
public function applyMiddlewares(): void
13-
{
14-
$this->middleware('guest:web_{{singularSnake}}')->except('logout');
15-
}
16-
17-
public function getGuard(): StatefulGuard
18-
{
19-
return Auth::guard('web_{{singularSnake}}');
20-
}
21-
2210
public function getLoginForm(): View
2311
{
2412
return view('{{kebabAuthName}}.auth.login');

stubs/Controllers/Auth/RegisterController.stub

-17
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace App\Http\Controllers\{{studlyAuthName}}\Auth;
44

55
use App\Models\{{singularStudly}};
6-
use Illuminate\Contracts\Auth\StatefulGuard;
7-
use Illuminate\Support\Facades\Auth;
86
use Illuminate\Support\Facades\Validator;
97
use Javaabu\Auth\Enums\UserStatuses;
108
use Illuminate\Validation\Rules\Password;
@@ -17,21 +15,6 @@ class RegisterController extends \Javaabu\Auth\Http\Controllers\Auth\RegisterCon
1715
return new {{singularStudly}}();
1816
}
1917

20-
public function applyMiddlewares(): void
21-
{
22-
$this->middleware('guest:web_{{singularSnake}}');
23-
}
24-
25-
public function getGuard(): StatefulGuard
26-
{
27-
return Auth::guard('web_{{singularSnake}}');
28-
}
29-
30-
public function userClass(): string
31-
{
32-
return {{singularStudly}}::class;
33-
}
34-
3518
public function showRegistrationForm()
3619
{
3720
return view('{{kebabAuthName}}.auth.register');

stubs/Controllers/Auth/ResetPasswordController.stub

+1-8
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,14 @@
33
namespace App\Http\Controllers\{{studlyAuthName}}\Auth;
44

55
use Illuminate\Auth\Passwords\PasswordBroker;
6-
use Illuminate\Contracts\Auth\StatefulGuard;
7-
use Illuminate\Support\Facades\Auth;
86
use Illuminate\Support\Facades\Password;
97
use Javaabu\Auth\User as UserContract;
108

119
class ResetPasswordController extends \Javaabu\Auth\Http\Controllers\Auth\ResetPasswordController
1210
{
1311
public function getBroker(): PasswordBroker
1412
{
15-
return Password::broker('users');
16-
}
17-
18-
public function getGuard(): StatefulGuard
19-
{
20-
return Auth::guard('web_{{singularSnake}}');
13+
return Password::broker('{{pluralSnake}}');
2114
}
2215

2316
public function getResetFormViewName(): string

stubs/Controllers/Auth/UpdatePasswordController.stub

-13
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,12 @@
33
namespace App\Http\Controllers\{{studlyAuthName}}\Auth;
44

55
use Illuminate\Auth\Passwords\PasswordBroker;
6-
use Illuminate\Contracts\Auth\StatefulGuard;
7-
use Illuminate\Support\Facades\Auth;
86
use Illuminate\Support\Facades\Password;
97
use Illuminate\View\View;
108
use Javaabu\Auth\User as UserContract;
119

1210
class UpdatePasswordController extends \Javaabu\Auth\Http\Controllers\Auth\UpdatePasswordController
1311
{
14-
public function applyMiddlewares(): void
15-
{
16-
$this->middleware(['auth:web_{{singularSnake}}', 'active:web_{{singularSnake}}', 'password-update-required:web_{{singularSnake}}']);
17-
}
18-
19-
#[\Override]
20-
public function getGuard(): StatefulGuard
21-
{
22-
return Auth::guard('web_{{singularSnake}}');
23-
}
24-
2512
#[\Override]
2613
public function getBroker(): PasswordBroker
2714
{

stubs/Controllers/Auth/VerificationController.stub

-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ use Javaabu\Auth\User as UserContract;
66

77
class VerificationController extends \Javaabu\Auth\Http\Controllers\Auth\VerificationController
88
{
9-
public function applyMiddlewares(): void
10-
{
11-
$this->middleware('auth:web_{{singularSnake}}');
12-
$this->middleware('inactive:web_{{singularSnake}}')->except('verify');
13-
$this->middleware('signed')->only('verify');
14-
$this->middleware('throttle:6,1')->only('verify', 'resend');
15-
$this->middleware('needs-verification')->except('show');
16-
}
17-
189
#[\Override]
1910
public function getEmailVerificationView()
2011
{

tests/stubs/Controllers/Customer/Auth/ConfirmPasswordController.php

-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77

88
class ConfirmPasswordController extends \Javaabu\Auth\Http\Controllers\Auth\ConfirmPasswordController
99
{
10-
/**
11-
* Apply middlewares for the controller. Used in the constructor.
12-
* Helps with applying/changing applied middlewares for the controller.
13-
*/
14-
public function applyMiddlewares(): void
15-
{
16-
$this->middleware('auth:web_customer');
17-
}
18-
1910
#[\Override]
2011
public function getConfirmForm(): View
2112
{

tests/stubs/Controllers/Customer/Auth/LoginController.php

-12
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,11 @@
22

33
namespace App\Http\Controllers\Customer\Auth;
44

5-
use Illuminate\Contracts\Auth\StatefulGuard;
6-
use Illuminate\Support\Facades\Auth;
75
use Illuminate\View\View;
86
use Javaabu\Auth\User as UserContract;
97

108
class LoginController extends \Javaabu\Auth\Http\Controllers\Auth\LoginController
119
{
12-
public function applyMiddlewares(): void
13-
{
14-
$this->middleware('guest:web_customer')->except('logout');
15-
}
16-
17-
public function getGuard(): StatefulGuard
18-
{
19-
return Auth::guard('web_customer');
20-
}
21-
2210
public function getLoginForm(): View
2311
{
2412
return view('customer.auth.login');

tests/stubs/Controllers/Customer/Auth/RegisterController.php

-17
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace App\Http\Controllers\Customer\Auth;
44

55
use App\Models\Customer;
6-
use Illuminate\Contracts\Auth\StatefulGuard;
7-
use Illuminate\Support\Facades\Auth;
86
use Illuminate\Support\Facades\Validator;
97
use Javaabu\Auth\Enums\UserStatuses;
108
use Illuminate\Validation\Rules\Password;
@@ -17,21 +15,6 @@ public function determinePathForRedirectUsing(): \Javaabu\Auth\User
1715
return new Customer();
1816
}
1917

20-
public function applyMiddlewares(): void
21-
{
22-
$this->middleware('guest:web_customer');
23-
}
24-
25-
public function getGuard(): StatefulGuard
26-
{
27-
return Auth::guard('web_customer');
28-
}
29-
30-
public function userClass(): string
31-
{
32-
return Customer::class;
33-
}
34-
3518
public function showRegistrationForm()
3619
{
3720
return view('customer.auth.register');

tests/stubs/Controllers/Customer/Auth/ResetPasswordController.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,14 @@
33
namespace App\Http\Controllers\Customer\Auth;
44

55
use Illuminate\Auth\Passwords\PasswordBroker;
6-
use Illuminate\Contracts\Auth\StatefulGuard;
7-
use Illuminate\Support\Facades\Auth;
86
use Illuminate\Support\Facades\Password;
97
use Javaabu\Auth\User as UserContract;
108

119
class ResetPasswordController extends \Javaabu\Auth\Http\Controllers\Auth\ResetPasswordController
1210
{
1311
public function getBroker(): PasswordBroker
1412
{
15-
return Password::broker('users');
16-
}
17-
18-
public function getGuard(): StatefulGuard
19-
{
20-
return Auth::guard('web_customer');
13+
return Password::broker('customers');
2114
}
2215

2316
public function getResetFormViewName(): string

tests/stubs/Controllers/Customer/Auth/UpdatePasswordController.php

-13
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,12 @@
33
namespace App\Http\Controllers\Customer\Auth;
44

55
use Illuminate\Auth\Passwords\PasswordBroker;
6-
use Illuminate\Contracts\Auth\StatefulGuard;
7-
use Illuminate\Support\Facades\Auth;
86
use Illuminate\Support\Facades\Password;
97
use Illuminate\View\View;
108
use Javaabu\Auth\User as UserContract;
119

1210
class UpdatePasswordController extends \Javaabu\Auth\Http\Controllers\Auth\UpdatePasswordController
1311
{
14-
public function applyMiddlewares(): void
15-
{
16-
$this->middleware(['auth:web_customer', 'active:web_customer', 'password-update-required:web_customer']);
17-
}
18-
19-
#[\Override]
20-
public function getGuard(): StatefulGuard
21-
{
22-
return Auth::guard('web_customer');
23-
}
24-
2512
#[\Override]
2613
public function getBroker(): PasswordBroker
2714
{

tests/stubs/Controllers/Customer/Auth/VerificationController.php

-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66

77
class VerificationController extends \Javaabu\Auth\Http\Controllers\Auth\VerificationController
88
{
9-
public function applyMiddlewares(): void
10-
{
11-
$this->middleware('auth:web_customer');
12-
$this->middleware('inactive:web_customer')->except('verify');
13-
$this->middleware('signed')->only('verify');
14-
$this->middleware('throttle:6,1')->only('verify', 'resend');
15-
$this->middleware('needs-verification')->except('show');
16-
}
17-
189
#[\Override]
1910
public function getEmailVerificationView()
2011
{

0 commit comments

Comments
 (0)