controller refactoring part 15

This commit is contained in:
Peter Papp
2021-07-21 09:42:39 +02:00
parent 1534696e0d
commit 58d8724cea
47 changed files with 516 additions and 522 deletions

View File

@@ -1,11 +1,8 @@
<?php
namespace App\Users\Controllers\Account;
use App\Users\Resources\UserStorageResource;
use Illuminate\Support\Facades\Auth;
use App\Users\Resources\UserStorageResource;
class StorageCapacityController
{
@@ -15,4 +12,4 @@ class StorageCapacityController
Auth::user()
);
}
}
}

View File

@@ -1,19 +1,16 @@
<?php
namespace App\Users\Controllers\Account;
use App\Http\Controllers\Controller;
use App\Users\Requests\UpdateUserPasswordRequest;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use App\Users\Requests\UpdateUserPasswordRequest;
class UpdatePasswordController extends Controller
{
public function __invoke(
UpdateUserPasswordRequest $request
): Response{
): Response {
$user = Auth::user();
// Check if is demo
@@ -26,4 +23,4 @@ class UpdatePasswordController extends Controller
return response('Changed!', 204);
}
}
}

View File

@@ -1,12 +1,9 @@
<?php
namespace App\Users\Controllers\Account;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
@@ -55,4 +52,4 @@ class UpdateProfileSettingsController extends Controller
return response('Saved!', 204);
}
}
}

View File

@@ -1,15 +1,12 @@
<?php
namespace App\Users\Controllers\Authentication;
use App\Http\Controllers\Controller;
use App\Users\Requests\UserCreateAccessTokenRequest;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Laravel\Sanctum\PersonalAccessToken;
use App\Users\Requests\UserCreateAccessTokenRequest;
class AccountAccessTokenController extends Controller
{
@@ -19,7 +16,8 @@ class AccountAccessTokenController extends Controller
public function index(): Response
{
return response(
Auth::user()->tokens()->get(), 200
Auth::user()->tokens()->get(),
200
);
}
@@ -61,4 +59,4 @@ class AccountAccessTokenController extends Controller
return response('Deleted!', 204);
}
}
}

View File

@@ -2,9 +2,9 @@
namespace App\Users\Controllers\Authentication;
use App\Users\Models\User;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Users\Requests\CheckAccountRequest;
use Illuminate\Http\Response;
class CheckAccountController extends Controller
{
@@ -13,8 +13,7 @@ class CheckAccountController extends Controller
*/
public function __invoke(
CheckAccountRequest $request
): array|Response {
): array | Response {
$user = User::whereEmail($request->input('email'))
->first();

View File

@@ -1,20 +1,16 @@
<?php
namespace App\Users\Controllers\Verification;
use App\Http\Controllers\Controller;
use App\Users\Models\User;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
class ResendVerificationEmail extends Controller
{
public function __invoke(
Request $request
): Response {
$user = User::where('email', $request->input('email'))
->first();
@@ -26,4 +22,4 @@ class ResendVerificationEmail extends Controller
return response('Email verification link sent to your email', 204);
}
}
}

View File

@@ -1,22 +1,18 @@
<?php
namespace App\Users\Controllers\Verification;
use App\Http\Controllers\Controller;
use App\Users\Models\User;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
class VerifyEmailController extends Controller
{
public function __invoke(
string $id,
Request $request,
): RedirectResponse|Response {
): RedirectResponse | Response {
if (! $request->hasValidSignature()) {
return response('Invalid or expired url provided.', 401);
}
@@ -29,4 +25,4 @@ class VerifyEmailController extends Controller
return redirect()->to('/successfully-verified');
}
}
}

View File

@@ -10,7 +10,6 @@ use Laravel\Sanctum\HasApiTokens;
use Illuminate\Support\Collection;
use Database\Factories\UserFactory;
use Kyslik\ColumnSortable\Sortable;
use Support\Services\HelperService;
use Illuminate\Support\Facades\Storage;
use Illuminate\Notifications\Notifiable;
use App\Users\Notifications\ResetPassword;
@@ -215,10 +214,5 @@ class User extends Authenticatable implements MustVerifyEmail
// Create user directory for his files
Storage::makeDirectory("files/$user->id");
});
static::deleted(function ($user) {
resolve(HelperService::class)
->erase_user_data($user);
});
}
}