From 9dc746cb62026d6e9b2b62ead729f796a66ea90a Mon Sep 17 00:00:00 2001
From: rishabhbohra-bito <157113574+rishabhbohra-bito@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:37:46 +0530
Subject: [PATCH 1/8] Update bito-cra.sh - 2.5.0

---
 cra-scripts/bito-cra.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/cra-scripts/bito-cra.sh b/cra-scripts/bito-cra.sh
index 1e6d3a8..52d3332 100755
--- a/cra-scripts/bito-cra.sh
+++ b/cra-scripts/bito-cra.sh
@@ -48,10 +48,10 @@ validate_url() {
 validate_git_provider() {
   local git_provider_val=$(echo "$1" | tr '[:lower:]' '[:upper:]')
 
-  if [ "$git_provider_val" == "GITLAB" ] || [ "$git_provider_val" == "GITHUB" ] || [ "$git_provider_val" == "BITBUCKET" ]; then
+  if [ "$git_provider_val" == "GITLAB" ] || [ "$git_provider_val" == "GITHUB" ] || [ "$git_provider_val" == "BITBUCKET" ] || [ "$git_provider_val" == "BITBUCKET-ENTERPRISE" ]; then
     echo $git_provider_val
   else
-    echo "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET."
+    echo "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET or BITBUCKET-ENTERPRISE."
     exit 1
   fi
 }
@@ -463,10 +463,10 @@ optional_params_cli=(
 required_params_server=(
   "mode"
   "code_feedback"
+  "git.provider"
 )
 
 optional_params_server=(
-  "git.provider"
   "git.access_token"
   "bito_cli.bito.access_key"
   "acceptable_suggestions_enabled"
@@ -720,16 +720,21 @@ encrypt_git_secret() {
 
 param_bito_access_key="bito_cli.bito.access_key"
 param_git_access_token="git.access_token"
+param_git_provider="git.provider"
 
 docker_enc_params=
 if [ "$mode" == "server" ]; then
     if [ -n "${props[$param_bito_access_key]}" ] && [ -n "${props[$param_git_access_token]}" ]; then
-        git_secret="${props[$param_bito_access_key]}@#~^${props[$param_git_access_token]}"
+        if [[ "${props[$param_git_provider]}" == "BITBUCKET" || "${props[$param_git_provider]}" == "BITBUCKET-ENTERPRISE" ]]; then
+          git_secret="${props[$param_git_access_token]}"
+        else
+          git_secret="${props[$param_bito_access_key]}@#~^${props[$param_git_access_token]}"
+        fi
         encryption_key=$(openssl rand -base64 32)
         git_secret=$(encrypt_git_secret "$encryption_key" "$git_secret")
         docker_enc_params=" --git.secret=$git_secret --encryption_key=$encryption_key"
         
-        echo "Use below as Gitlab and Github Webhook secret:"
+        echo "Use below as Gitlab and Github or Bitbucket Webhook secret:"
         echo "$git_secret"
         echo
     fi

From a53b7d4ca61e92f350881cdd1a551adf6affd954 Mon Sep 17 00:00:00 2001
From: rishabhbohra-bito <157113574+rishabhbohra-bito@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:44:31 +0530
Subject: [PATCH 2/8] Update bito-cra.sh - release 2.5.0

---
 cra-scripts/bito-cra.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cra-scripts/bito-cra.sh b/cra-scripts/bito-cra.sh
index 52d3332..eb546f9 100755
--- a/cra-scripts/bito-cra.sh
+++ b/cra-scripts/bito-cra.sh
@@ -459,14 +459,14 @@ optional_params_cli=(
   "support_email"
 )
 
-# Parameters that are required/optional in mode server
+# Parameters that are required/optional in the mode server
 required_params_server=(
   "mode"
   "code_feedback"
-  "git.provider"
 )
 
 optional_params_server=(
+  "git.provider"
   "git.access_token"
   "bito_cli.bito.access_key"
   "acceptable_suggestions_enabled"

From 91b8a4a040ca71920f8d0fa8e284c0c26104e3ad Mon Sep 17 00:00:00 2001
From: rishabhbohra-bito <157113574+rishabhbohra-bito@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:45:23 +0530
Subject: [PATCH 3/8] Update bito-cra.ps1

---
 cra-scripts/bito-cra.ps1 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cra-scripts/bito-cra.ps1 b/cra-scripts/bito-cra.ps1
index 528f6e1..01441ba 100755
--- a/cra-scripts/bito-cra.ps1
+++ b/cra-scripts/bito-cra.ps1
@@ -49,8 +49,8 @@ function Validate-GitProvider {
     $git_provider_val = $git_provider_val.ToUpper()
 
     # Check if the converted value is either "GITLAB" or "GITHUB" or "BITBUCKET"
-    if ($git_provider_val -ne "GITLAB" -and $git_provider_val -ne "GITHUB" -and $git_provider_val -ne "BITBUCKET") {
-        Write-Host "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET."
+    if ($git_provider_val -ne "GITLAB" -and $git_provider_val -ne "GITHUB" -and $git_provider_val -ne "BITBUCKET" and $git_provider_val -ne "BITBUCKET-ENTERPRISE") {
+        Write-Host "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET or BITBUCKET-ENTERPRISE."
         exit 1
     }
 
@@ -698,13 +698,17 @@ $docker_enc_params=
 
 if ($mode -eq "server") {
     if (-not([string]::IsNullOrEmpty($props[$param_bito_access_key])) -and -not([string]::IsNullOrEmpty($props[$param_git_access_token]))) {
-        $git_secret = "$($props[$param_bito_access_key])@#~^$($props[$param_git_access_token])"
+        if ($props[$param_git_provider] -eq "BITBUCKET" -or $props[$param_git_provider] -eq "BITBUCKET-ENTERPRISE") {
+            $git_secret = $props[$param_git_access_token]
+        } else {
+            $git_secret = "$($props[$param_bito_access_key])@#~^$($props[$param_git_access_token])"
+        }
         $encryption_key = [System.Convert]::ToBase64String((1..32 | ForEach-Object { [byte](Get-Random -Minimum 0 -Maximum 256) }))
         $git_secret_encrypted = Encrypt-GitSecret -key $encryption_key -plaintext $git_secret
         $docker_enc_params=" --git.secret=$git_secret_encrypted --encryption_key=$encryption_key"
         $docker_cmd += " ${docker_enc_params}"
         
-        Write-Host "Use below as Gitlab and Github Webhook secret:"
+        Write-Host "Use below as Gitlab and Github or Bitbucket Webhook secret:"
         Write-Host $git_secret_encrypted
         Write-Host
     }

From 1dd0df554b7e0e1acf0bb126b44252c00aeeb8d4 Mon Sep 17 00:00:00 2001
From: rishabhbohra-bito <157113574+rishabhbohra-bito@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:48:20 +0530
Subject: [PATCH 4/8] Update bito-cra.ps1 - release - 2.5.0

---
 cra-scripts/bito-cra.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cra-scripts/bito-cra.ps1 b/cra-scripts/bito-cra.ps1
index 01441ba..1385c8c 100755
--- a/cra-scripts/bito-cra.ps1
+++ b/cra-scripts/bito-cra.ps1
@@ -49,7 +49,7 @@ function Validate-GitProvider {
     $git_provider_val = $git_provider_val.ToUpper()
 
     # Check if the converted value is either "GITLAB" or "GITHUB" or "BITBUCKET"
-    if ($git_provider_val -ne "GITLAB" -and $git_provider_val -ne "GITHUB" -and $git_provider_val -ne "BITBUCKET" and $git_provider_val -ne "BITBUCKET-ENTERPRISE") {
+    if ($git_provider_val -ne "GITLAB" -and $git_provider_val -ne "GITHUB" -and $git_provider_val -ne "BITBUCKET" -and $git_provider_val -ne "BITBUCKET-ENTERPRISE") {
         Write-Host "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET or BITBUCKET-ENTERPRISE."
         exit 1
     }

From 84911dc2521e3c2696e21a0f123fb08401b5c5b6 Mon Sep 17 00:00:00 2001
From: rishabhbohra-bito <157113574+rishabhbohra-bito@users.noreply.github.com>
Date: Thu, 24 Jul 2025 23:21:02 +0530
Subject: [PATCH 5/8] Update bito-cra.ps1 - removed bitbucket enterprise

---
 cra-scripts/bito-cra.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cra-scripts/bito-cra.ps1 b/cra-scripts/bito-cra.ps1
index 1385c8c..a4f9ac0 100755
--- a/cra-scripts/bito-cra.ps1
+++ b/cra-scripts/bito-cra.ps1
@@ -49,8 +49,8 @@ function Validate-GitProvider {
     $git_provider_val = $git_provider_val.ToUpper()
 
     # Check if the converted value is either "GITLAB" or "GITHUB" or "BITBUCKET"
-    if ($git_provider_val -ne "GITLAB" -and $git_provider_val -ne "GITHUB" -and $git_provider_val -ne "BITBUCKET" -and $git_provider_val -ne "BITBUCKET-ENTERPRISE") {
-        Write-Host "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET or BITBUCKET-ENTERPRISE."
+    if ($git_provider_val -ne "GITLAB" -and $git_provider_val -ne "GITHUB" -and $git_provider_val -ne "BITBUCKET") {
+        Write-Host "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET."
         exit 1
     }
 
@@ -698,7 +698,7 @@ $docker_enc_params=
 
 if ($mode -eq "server") {
     if (-not([string]::IsNullOrEmpty($props[$param_bito_access_key])) -and -not([string]::IsNullOrEmpty($props[$param_git_access_token]))) {
-        if ($props[$param_git_provider] -eq "BITBUCKET" -or $props[$param_git_provider] -eq "BITBUCKET-ENTERPRISE") {
+        if ($props[$param_git_provider] -eq "BITBUCKET") {
             $git_secret = $props[$param_git_access_token]
         } else {
             $git_secret = "$($props[$param_bito_access_key])@#~^$($props[$param_git_access_token])"

From 5bb2f5e0e78efb033e86915bf8490b9110baa9dc Mon Sep 17 00:00:00 2001
From: rishabhbohra-bito <157113574+rishabhbohra-bito@users.noreply.github.com>
Date: Thu, 24 Jul 2025 23:23:19 +0530
Subject: [PATCH 6/8] Update bito-cra.sh - release 2.5.0

---
 cra-scripts/bito-cra.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cra-scripts/bito-cra.sh b/cra-scripts/bito-cra.sh
index eb546f9..16139bb 100755
--- a/cra-scripts/bito-cra.sh
+++ b/cra-scripts/bito-cra.sh
@@ -48,10 +48,10 @@ validate_url() {
 validate_git_provider() {
   local git_provider_val=$(echo "$1" | tr '[:lower:]' '[:upper:]')
 
-  if [ "$git_provider_val" == "GITLAB" ] || [ "$git_provider_val" == "GITHUB" ] || [ "$git_provider_val" == "BITBUCKET" ] || [ "$git_provider_val" == "BITBUCKET-ENTERPRISE" ]; then
+  if [ "$git_provider_val" == "GITLAB" ] || [ "$git_provider_val" == "GITHUB" ] || [ "$git_provider_val" == "BITBUCKET" ]; then
     echo $git_provider_val
   else
-    echo "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET or BITBUCKET-ENTERPRISE."
+    echo "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET."
     exit 1
   fi
 }
@@ -725,7 +725,7 @@ param_git_provider="git.provider"
 docker_enc_params=
 if [ "$mode" == "server" ]; then
     if [ -n "${props[$param_bito_access_key]}" ] && [ -n "${props[$param_git_access_token]}" ]; then
-        if [[ "${props[$param_git_provider]}" == "BITBUCKET" || "${props[$param_git_provider]}" == "BITBUCKET-ENTERPRISE" ]]; then
+        if [[ "${props[$param_git_provider]}" == "BITBUCKET" ]]; then
           git_secret="${props[$param_git_access_token]}"
         else
           git_secret="${props[$param_bito_access_key]}@#~^${props[$param_git_access_token]}"

From a3549fa6e4471d1b47665711a1d49c41df74af1f Mon Sep 17 00:00:00 2001
From: rishabhbohra-bito <157113574+rishabhbohra-bito@users.noreply.github.com>
Date: Mon, 8 Sep 2025 19:37:45 +0530
Subject: [PATCH 7/8] Update bito-cra.ps1

- Handle long char git access token in bitbucket
---
 cra-scripts/bito-cra.ps1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cra-scripts/bito-cra.ps1 b/cra-scripts/bito-cra.ps1
index a4f9ac0..bd5792b 100755
--- a/cra-scripts/bito-cra.ps1
+++ b/cra-scripts/bito-cra.ps1
@@ -700,6 +700,10 @@ if ($mode -eq "server") {
     if (-not([string]::IsNullOrEmpty($props[$param_bito_access_key])) -and -not([string]::IsNullOrEmpty($props[$param_git_access_token]))) {
         if ($props[$param_git_provider] -eq "BITBUCKET") {
             $git_secret = $props[$param_git_access_token]
+            # Truncate if longer than 60 characters
+            if ($git_secret.Length -gt 60) {
+                $git_secret = $git_secret.Substring(0, 60)
+            }
         } else {
             $git_secret = "$($props[$param_bito_access_key])@#~^$($props[$param_git_access_token])"
         }

From b44ec7f979e89695762ebd568d5e1f62aebbed31 Mon Sep 17 00:00:00 2001
From: rishabhbohra-bito <157113574+rishabhbohra-bito@users.noreply.github.com>
Date: Mon, 8 Sep 2025 19:42:57 +0530
Subject: [PATCH 8/8] Update bito-cra.sh

- added char limit check while creating secret
---
 cra-scripts/bito-cra.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cra-scripts/bito-cra.sh b/cra-scripts/bito-cra.sh
index 16139bb..4855a4a 100755
--- a/cra-scripts/bito-cra.sh
+++ b/cra-scripts/bito-cra.sh
@@ -727,6 +727,10 @@ if [ "$mode" == "server" ]; then
     if [ -n "${props[$param_bito_access_key]}" ] && [ -n "${props[$param_git_access_token]}" ]; then
         if [[ "${props[$param_git_provider]}" == "BITBUCKET" ]]; then
           git_secret="${props[$param_git_access_token]}"
+		  # Truncate only for Bitbucket if longer than 60 characters
+          if [ ${#git_secret} -gt 60 ]; then
+            git_secret="${git_secret:0:60}"
+          fi
         else
           git_secret="${props[$param_bito_access_key]}@#~^${props[$param_git_access_token]}"
         fi