Switch Gitea connection validation to repository access

This commit is contained in:
Nico Schroeder
2026-03-26 11:16:38 +01:00
parent 92dfe3840c
commit 662bb6e103
7 changed files with 151 additions and 28 deletions
@@ -2,6 +2,8 @@
namespace App\Http\Controllers\Settings;
use App\Actions\Git\Contracts\GitProviderClient;
use App\Actions\Git\Data\GitAuthenticatedUser;
use App\Actions\Git\GitProviderManager;
use App\Http\Controllers\Controller;
use App\Http\Requests\Settings\StoreUserGitConnectionRequest;
@@ -9,6 +11,7 @@ use App\Http\Requests\Settings\UpdateUserGitConnectionRequest;
use App\Models\UserGitConnection;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Inertia\Inertia;
use Inertia\Response;
use Throwable;
@@ -42,26 +45,28 @@ class GitConnectionController extends Controller
public function store(StoreUserGitConnectionRequest $request): RedirectResponse
{
$gitProvider = $this->gitProviderManager->client($request->provider());
try {
$gitProvider = $this->gitProviderManager->client($request->provider());
$authenticatedUser = $gitProvider->getAuthenticatedUser(
$request->baseUrl(),
$request->apiToken(),
);
$gitProvider->verifyRepositoryAccess($request->baseUrl(), $request->apiToken());
} catch (Throwable) {
return back()
->withErrors([
'api_token' => 'KanbanGit could not authenticate against Gitea with this base URL and token.',
'api_token' => 'KanbanGit could not read repositories from Gitea with this base URL and token.',
]);
}
$connectionMetadata = $this->resolveConnectionMetadata(
$gitProvider,
$request->baseUrl(),
$request->apiToken(),
);
UserGitConnection::query()->create([
'account_login' => $authenticatedUser->login,
'account_name' => $authenticatedUser->name,
...$connectionMetadata,
'api_token' => $request->apiToken(),
'base_url' => $request->baseUrl(),
'provider' => $request->provider(),
'provider_user_id' => $authenticatedUser->providerUserId,
'user_id' => $request->user()->id,
]);
@@ -75,26 +80,28 @@ class GitConnectionController extends Controller
): RedirectResponse {
$this->abortUnlessOwner($request, $gitConnection);
$gitProvider = $this->gitProviderManager->client($request->provider());
try {
$gitProvider = $this->gitProviderManager->client($request->provider());
$authenticatedUser = $gitProvider->getAuthenticatedUser(
$request->baseUrl(),
$request->apiToken(),
);
$gitProvider->verifyRepositoryAccess($request->baseUrl(), $request->apiToken());
} catch (Throwable) {
return back()
->withErrors([
'api_token' => 'KanbanGit could not authenticate against Gitea with this base URL and token.',
'api_token' => 'KanbanGit could not read repositories from Gitea with this base URL and token.',
]);
}
$connectionMetadata = $this->resolveConnectionMetadata(
$gitProvider,
$request->baseUrl(),
$request->apiToken(),
);
$gitConnection->update([
'account_login' => $authenticatedUser->login,
'account_name' => $authenticatedUser->name,
...$connectionMetadata,
'api_token' => $request->apiToken(),
'base_url' => $request->baseUrl(),
'provider' => $request->provider(),
'provider_user_id' => $authenticatedUser->providerUserId,
]);
return to_route('git-connections.edit')
@@ -117,4 +124,48 @@ class GitConnectionController extends Controller
{
abort_unless($gitConnection->user_id === $request->user()->id, 403);
}
/**
* @return array{account_login: string, account_name: string|null, provider_user_id: string}
*/
private function resolveConnectionMetadata(
GitProviderClient $gitProvider,
string $baseUrl,
string $apiToken,
): array {
$authenticatedUser = $this->resolveAuthenticatedUser(
$gitProvider,
$baseUrl,
$apiToken,
);
return [
'account_login' => $authenticatedUser?->login ?? $this->fallbackAccountLogin($baseUrl),
'account_name' => $authenticatedUser?->name,
'provider_user_id' => $authenticatedUser?->providerUserId ?? '',
];
}
private function resolveAuthenticatedUser(
GitProviderClient $gitProvider,
string $baseUrl,
string $apiToken,
): ?GitAuthenticatedUser {
try {
return $gitProvider->getAuthenticatedUser($baseUrl, $apiToken);
} catch (Throwable) {
return null;
}
}
private function fallbackAccountLogin(string $baseUrl): string
{
$host = parse_url($baseUrl, PHP_URL_HOST);
if (is_string($host) && $host !== '') {
return Str::lower($host);
}
return Str::lower($baseUrl);
}
}