Add Bitbucket V2 source control using OAuth consumers

Author: saeedvaziry

app/Actions/SourceControl/ConnectSourceControl.php

@@ -29,9 +29,21 @@ public function connect(User $user, array $input): SourceControl
 
         $sourceControl->provider_data = $sourceControl->provider()->createData($input);
 
-        if (! $sourceControl->provider()->connect()) {
+        try {
+            if (! $sourceControl->provider()->connect()) {
+                throw ValidationException::withMessages([
+                    'provider' => __('Cannot connect to :provider or invalid credentials!', ['provider' => $sourceControl->provider]),
+                ]);
+            }
+        } catch (\Exception $e) {
+            // Re-throw validation exceptions as-is
+            if ($e instanceof ValidationException) {
+                throw $e;
+            }
+
+            // For all other exceptions, wrap in validation exception to show the error message in the frontend
             throw ValidationException::withMessages([
-                'token' => __('Cannot connect to :provider or invalid token!', ['provider' => $sourceControl->provider]),
+                'provider' => $e->getMessage(),
             ]);
         }
 

app/Providers/SourceControlServiceProvider.php

@@ -6,6 +6,7 @@
 use App\DTOs\DynamicForm;
 use App\Plugins\RegisterSourceControl;
 use App\SourceControlProviders\Bitbucket;
+use App\SourceControlProviders\BitbucketV2;
 use App\SourceControlProviders\Gitea;
 use App\SourceControlProviders\Github;
 use App\SourceControlProviders\Gitlab;
@@ -20,6 +21,7 @@ public function boot(): void
         $this->github();
         $this->gitlab();
         $this->bitbucket();
+        $this->bitbucketV2();
         $this->gitea();
     }
 
@@ -59,7 +61,7 @@ private function gitlab(): void
     private function bitbucket(): void
     {
         RegisterSourceControl::make(Bitbucket::id())
-            ->label('Bitbucket')
+            ->label('Bitbucket (deprecated)')
             ->handler(Bitbucket::class)
             ->form(
                 DynamicForm::make([
@@ -74,6 +76,24 @@ private function bitbucket(): void
             ->register();
     }
 
+    private function bitbucketV2(): void
+    {
+        RegisterSourceControl::make(BitbucketV2::id())
+            ->label('Bitbucket V2')
+            ->handler(BitbucketV2::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('key')
+                        ->text()
+                        ->label('Key'),
+                    DynamicField::make('secret')
+                        ->text()
+                        ->label('Secret'),
+                ])
+            )
+            ->register();
+    }
+
     private function gitea(): void
     {
         RegisterSourceControl::make(Gitea::id())