DEleted function in request and changed the way the controller uses it,
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers\Settings;
|
||||
|
||||
use App\Actions\Git\GitProviderKey;
|
||||
use App\Actions\Git\GitProviderManager;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Settings\StoreUserGitConnectionRequest;
|
||||
@@ -9,6 +10,7 @@ use App\Http\Requests\Settings\UpdateUserGitConnectionRequest;
|
||||
use App\Models\UserGitConnection;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Arr;
|
||||
use Inertia\Inertia;
|
||||
use Inertia\Response;
|
||||
use Throwable;
|
||||
@@ -21,8 +23,11 @@ class GitConnectionController extends Controller
|
||||
|
||||
public function edit(Request $request): Response
|
||||
{
|
||||
$user = $request->user();
|
||||
$session = $request->session();
|
||||
|
||||
return Inertia::render('settings/GitConnections', [
|
||||
'gitConnections' => $request->user()->gitConnections
|
||||
'gitConnections' => $user->gitConnections
|
||||
->map(fn (UserGitConnection $gitConnection): array => [
|
||||
'account_login' => $gitConnection->account_login,
|
||||
'account_name' => $gitConnection->account_name,
|
||||
@@ -36,17 +41,25 @@ class GitConnectionController extends Controller
|
||||
'user_id' => $gitConnection->user_id,
|
||||
])
|
||||
->values(),
|
||||
'status' => $request->session()->get('status'),
|
||||
'status' => $session->get('status'),
|
||||
]);
|
||||
}
|
||||
|
||||
public function store(StoreUserGitConnectionRequest $request): RedirectResponse
|
||||
{
|
||||
$validated = $request->validated();
|
||||
|
||||
$apiToken = Arr::get($validated, 'api_token');
|
||||
$baseUrl = Arr::get($validated, 'base_url');
|
||||
$provider = GitProviderKey::from((string) Arr::get($validated, 'provider'));
|
||||
$user = $request->user();
|
||||
|
||||
|
||||
try {
|
||||
$gitProvider = $this->gitProviderManager->client($request->provider());
|
||||
$gitProvider = $this->gitProviderManager->client($provider);
|
||||
$authenticatedUser = $gitProvider->getAuthenticatedUser(
|
||||
$request->baseUrl(),
|
||||
$request->apiToken(),
|
||||
$baseUrl,
|
||||
$apiToken,
|
||||
);
|
||||
} catch (Throwable) {
|
||||
return back()
|
||||
@@ -58,11 +71,11 @@ class GitConnectionController extends Controller
|
||||
UserGitConnection::query()->create([
|
||||
'account_login' => $authenticatedUser->login,
|
||||
'account_name' => $authenticatedUser->name,
|
||||
'api_token' => $request->apiToken(),
|
||||
'base_url' => $request->baseUrl(),
|
||||
'provider' => $request->provider(),
|
||||
'api_token' => $apiToken,
|
||||
'base_url' => $baseUrl,
|
||||
'provider' => $provider,
|
||||
'provider_user_id' => $authenticatedUser->providerUserId,
|
||||
'user_id' => $request->user()->id,
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
|
||||
return to_route('git-connections.edit')
|
||||
@@ -75,11 +88,18 @@ class GitConnectionController extends Controller
|
||||
): RedirectResponse {
|
||||
$this->abortUnlessOwner($request, $gitConnection);
|
||||
|
||||
$validated = $request->validated();
|
||||
$apiToken = Arr::get($validated, 'api_token');
|
||||
$baseUrl = Arr::get($validated, 'base_url');
|
||||
$provider = GitProviderKey::from((string) Arr::get($validated, 'provider'));
|
||||
|
||||
|
||||
|
||||
try {
|
||||
$gitProvider = $this->gitProviderManager->client($request->provider());
|
||||
$gitProvider = $this->gitProviderManager->client($provider);
|
||||
$authenticatedUser = $gitProvider->getAuthenticatedUser(
|
||||
$request->baseUrl(),
|
||||
$request->apiToken(),
|
||||
$baseUrl,
|
||||
$apiToken,
|
||||
);
|
||||
} catch (Throwable) {
|
||||
return back()
|
||||
@@ -91,9 +111,9 @@ class GitConnectionController extends Controller
|
||||
$gitConnection->update([
|
||||
'account_login' => $authenticatedUser->login,
|
||||
'account_name' => $authenticatedUser->name,
|
||||
'api_token' => $request->apiToken(),
|
||||
'base_url' => $request->baseUrl(),
|
||||
'provider' => $request->provider(),
|
||||
'api_token' => $apiToken,
|
||||
'base_url' => $baseUrl,
|
||||
'provider' => $provider,
|
||||
'provider_user_id' => $authenticatedUser->providerUserId,
|
||||
]);
|
||||
|
||||
@@ -115,6 +135,7 @@ class GitConnectionController extends Controller
|
||||
|
||||
private function abortUnlessOwner(Request $request, UserGitConnection $gitConnection): void
|
||||
{
|
||||
abort_unless($gitConnection->user_id === $request->user()->id, 403);
|
||||
$user = $request->user();
|
||||
abort_unless($gitConnection->user_id === $user->id, 403);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,9 +19,12 @@ class ProfileController extends Controller
|
||||
*/
|
||||
public function edit(Request $request): Response
|
||||
{
|
||||
$session = $request->session();
|
||||
$user = $request->user();
|
||||
|
||||
return Inertia::render('settings/Profile', [
|
||||
'mustVerifyEmail' => $request->user() instanceof MustVerifyEmail,
|
||||
'status' => $request->session()->get('status'),
|
||||
'mustVerifyEmail' => $user instanceof MustVerifyEmail,
|
||||
'status' => $session->get('status'),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -30,13 +33,15 @@ class ProfileController extends Controller
|
||||
*/
|
||||
public function update(ProfileUpdateRequest $request): RedirectResponse
|
||||
{
|
||||
$request->user()->fill($request->validated());
|
||||
|
||||
if ($request->user()->isDirty('email')) {
|
||||
$request->user()->email_verified_at = null;
|
||||
$user = $request->user();
|
||||
$user->fill($request->validated());
|
||||
|
||||
if ($user->isDirty('email')) {
|
||||
$user->email_verified_at = null;
|
||||
}
|
||||
|
||||
$request->user()->save();
|
||||
$user->save();
|
||||
|
||||
return to_route('profile.edit');
|
||||
}
|
||||
@@ -47,13 +52,14 @@ class ProfileController extends Controller
|
||||
public function destroy(ProfileDeleteRequest $request): RedirectResponse
|
||||
{
|
||||
$user = $request->user();
|
||||
$session = $request->session();
|
||||
|
||||
Auth::logout();
|
||||
|
||||
$user->delete();
|
||||
|
||||
$request->session()->invalidate();
|
||||
$request->session()->regenerateToken();
|
||||
$session->invalidate();
|
||||
$session->regenerateToken();
|
||||
|
||||
return redirect('/');
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ class SecurityController extends Controller implements HasMiddleware
|
||||
*/
|
||||
public function edit(TwoFactorAuthenticationRequest $request): Response
|
||||
{
|
||||
$user = $request->user();
|
||||
$props = [
|
||||
'canManageTwoFactor' => Features::canManageTwoFactorAuthentication(),
|
||||
];
|
||||
@@ -37,7 +38,7 @@ class SecurityController extends Controller implements HasMiddleware
|
||||
if (Features::canManageTwoFactorAuthentication()) {
|
||||
$request->ensureStateIsValid();
|
||||
|
||||
$props['twoFactorEnabled'] = $request->user()->hasEnabledTwoFactorAuthentication();
|
||||
$props['twoFactorEnabled'] = $user->hasEnabledTwoFactorAuthentication();
|
||||
$props['requiresConfirmation'] = Features::optionEnabled(Features::twoFactorAuthentication(), 'confirm');
|
||||
}
|
||||
|
||||
@@ -49,7 +50,9 @@ class SecurityController extends Controller implements HasMiddleware
|
||||
*/
|
||||
public function update(PasswordUpdateRequest $request): RedirectResponse
|
||||
{
|
||||
$request->user()->update([
|
||||
$user = $request->user();
|
||||
|
||||
$user->update([
|
||||
'password' => $request->password,
|
||||
]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user