direct-online/vito
2
0
Fork 0
mirror of https://github.com/vitodeploy/vito.git synced 2025-07-01 05:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bitbucket (#119)

Browse Source 
Fix Bitbucket API errors
This commit is contained in:
Saeed Vaziry
2024-03-17 11:36:04 +01:00
committed by GitHub
parent f0c4fc4812
commit b07ae470f9
10 changed files with 167 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
app/SourceControlProviders/Bitbucket.php
View File

@ -13,9 +13,33 @@ class Bitbucket extends AbstractSourceControlProvider
{
protected string $apiUrl = 'https://api.bitbucket.org/2.0';
public function createRules(array $input): array
{
return [
'username' => 'required',
'password' => 'required',
];
}
public function createData(array $input): array
{
return [
'username' => $input['username'] ?? '',
'password' => $input['password'] ?? '',
];
}
public function data(): array
{
return [
'username' => $this->sourceControl->provider_data['username'] ?? '',
'password' => $this->sourceControl->provider_data['password'] ?? '',
];
}
public function connect(): bool
{
$res = Http::withToken($this->sourceControl->access_token)
$res = Http::withHeaders($this->getAuthenticationHeaders())
->get($this->apiUrl.'/repositories');
return $res->successful();
@ -26,7 +50,7 @@ public function connect(): bool
*/
public function getRepo(?string $repo = null): mixed
{
$res = Http::withToken($this->sourceControl->access_token)
$res = Http::withHeaders($this->getAuthenticationHeaders())
->get($this->apiUrl."/repositories/$repo");
$this->handleResponseErrors($res, $repo);
@ -44,14 +68,15 @@ public function fullRepoUrl(string $repo, string $key): string
*/
public function deployHook(string $repo, array $events, string $secret): array
{
$response = Http::withToken($this->sourceControl->access_token)->post($this->apiUrl."/repositories/$repo/hooks", [
'description' => 'deploy',
'url' => url('/api/git-hooks?secret='.$secret),
'events' => [
'repo:'.implode(',', $events),
],
'active' => true,
]);
$response = Http::withHeaders($this->getAuthenticationHeaders())
->post($this->apiUrl."/repositories/$repo/hooks", [
'description' => 'deploy',
'url' => url('/api/git-hooks?secret='.$secret),
'events' => [
'repo:'.implode(',', $events),
],
'active' => true,
]);
if ($response->status() != 201) {
throw new FailedToDeployGitHook($response->json()['error']['message']);
@ -69,7 +94,8 @@ public function deployHook(string $repo, array $events, string $secret): array
public function destroyHook(string $repo, string $hookId): void
{
$hookId = urlencode($hookId);
$response = Http::withToken($this->sourceControl->access_token)->delete($this->apiUrl."/repositories/$repo/hooks/$hookId");
$response = Http::withHeaders($this->getAuthenticationHeaders())
->delete($this->apiUrl."/repositories/$repo/hooks/$hookId");
if ($response->status() != 204) {
throw new FailedToDestroyGitHook('Error');
@ -81,7 +107,7 @@ public function destroyHook(string $repo, string $hookId): void
*/
public function getLastCommit(string $repo, string $branch): ?array
{
$res = Http::withToken($this->sourceControl->access_token)
$res = Http::withHeaders($this->getAuthenticationHeaders())
->get($this->apiUrl."/repositories/$repo/commits?include=".$branch);
$this->handleResponseErrors($res, $repo);
@ -108,7 +134,7 @@ public function getLastCommit(string $repo, string $branch): ?array
*/
public function deployKey(string $title, string $repo, string $key): void
{
$res = Http::withToken($this->sourceControl->access_token)->post(
$res = Http::withHeaders($this->getAuthenticationHeaders())->post(
$this->apiUrl."/repositories/$repo/deploy-keys",
[
'label' => $title,
@ -116,7 +142,7 @@ public function deployKey(string $title, string $repo, string $key): void
]
);
if ($res->status() != 201) {
if ($res->status() != 200) {
throw new FailedToDeployGitKey($res->json()['error']['message']);
}
}
@ -130,4 +156,15 @@ protected function getCommitter(string $raw): array
'email' => Str::replace('>', '', $committer[1]),
];
}
private function getAuthenticationHeaders(): array
{
$username = $this->data()['username'];
$password = $this->data()['password'];
$basicAuth = base64_encode("$username:$password");
return [
'Authorization' => 'Basic '.$basicAuth,
];
}
}