Merge pull request #1351 from GnsP/support-bitbucket-http-auth

GnsP · web-flow · commit 92f8bf17f4b4 · 2025-08-06T18:04:31.000+05:30
[CDAP-21200] Add authType HTTP_ACCESS_TOKEN for BITBUCKET_SERVER
diff --git a/app/cdap/components/NamespaceAdmin/SourceControlManagement/SourceControlManagementForm.tsx b/app/cdap/components/NamespaceAdmin/SourceControlManagement/SourceControlManagementForm.tsx
@@ -21,7 +21,14 @@ import { ISourceControlManagementConfig } from './types';
 import PrimaryContainedButton from 'components/shared/Buttons/PrimaryContainedButton';
 import PrimaryOutlinedButton from 'components/shared/Buttons/PrimaryOutlinedButton';
 import ButtonLoadingHoc from 'components/shared/Buttons/ButtonLoadingHoc';
-import { authKeys, githubOnlyProviders, patConfigKeys, providers, scmAuthType } from './constants';
+import {
+  SCM_AUTH_TYPE_PAT,
+  authKeys,
+  githubOnlyProviders,
+  patConfigKeys,
+  providers,
+  scmAuthType,
+} from './constants';
 import { defaultSourceControlManagement, sourceControlManagementFormReducer } from './reducer';
 import { addOrValidateSourceControlManagementForm } from '../store/ActionCreator';
 import { getCurrentNamespace } from 'services/NamespaceStore';
@@ -95,6 +102,9 @@ const SourceControlManagementForm = ({
     defaultSourceControlManagement
   );
 
+  const supportedAuthTypes =
+    formState?.config?.provider === 'BITBUCKET_SERVER' ? scmAuthType : [SCM_AUTH_TYPE_PAT];
+
   const getMissingFieldsCount = () => {
     let count = 0;
     if (!formState.config?.link) {
@@ -293,74 +303,77 @@ const SourceControlManagementForm = ({
           <BoldHeader>{T.translate(`${PREFIX}.authHeader`)}</BoldHeader>
           <StyledHr />
           <PropertyRow
-            value={formState.config?.auth?.type ? formState.config.auth.type : scmAuthType[0].id}
+            value={
+              formState.config?.auth?.type ? formState.config.auth.type : supportedAuthTypes[0].id
+            }
             property={{
               name: 'auth',
-              description: T.translate(`${PREFIX}.auth.helperText`).toString(),
+              description:
+                supportedAuthTypes.length === 1
+                  ? T.translate(`${PREFIX}.auth.helperTextPatOnly`, {
+                      provider: formState?.config?.provider,
+                    }).toString()
+                  : T.translate(`${PREFIX}.auth.helperText`).toString(),
               label: T.translate(`${PREFIX}.auth.label`).toString(),
               'widget-type': 'radio-group',
               'widget-attributes': {
-                default: scmAuthType[0].id,
+                default: supportedAuthTypes[0].id,
                 layout: 'inline',
-                options: scmAuthType,
+                options: supportedAuthTypes,
               },
             }}
             onChange={(val) => {
               handleValueChange(val, 'type');
             }}
           />
-          {formState.config?.auth?.type === scmAuthType[0].id && (
-            <>
-              <PropertyRow
-                value={formState.config?.auth?.patConfig?.passwordName}
-                property={{
-                  name: 'tokenName',
-                  description: T.translate(`${PREFIX}.auth.pat.tokenNameHelperText`).toString(),
-                  label: T.translate(`${PREFIX}.auth.pat.tokenName`).toString(),
-                  required: true,
-                }}
-                onChange={(val) => {
-                  handleValueChange(val, 'passwordName');
-                }}
-                errors={
-                  !formState.config?.auth?.patConfig?.passwordName && formState.error
-                    ? [{ msg: T.translate('commons.requiredFieldMissingMsg').toString() }]
-                    : []
-                }
-              />
-              <PropertyRow
-                value={formState.config?.auth?.token}
-                property={{
-                  name: 'token',
-                  description: T.translate(`${PREFIX}.auth.pat.tokenHelperText`, {
-                    provider: formState.config?.provider || providers.github,
-                  }).toString(),
-                  label: T.translate(`${PREFIX}.auth.pat.token`).toString(),
-                  required: !isEdit,
-                  'widget-type': 'password',
-                }}
-                onChange={(val) => {
-                  handleValueChange(val, 'token');
-                }}
-                errors={
-                  !formState.config?.auth?.token && formState.error
-                    ? [{ msg: T.translate('commons.requiredFieldMissingMsg').toString() }]
-                    : []
-                }
-              />
-              <PropertyRow
-                value={formState.config?.auth?.patConfig?.username}
-                property={{
-                  name: 'username',
-                  description: T.translate(`${PREFIX}.auth.pat.usernameHelperText`).toString(),
-                  label: T.translate(`${PREFIX}.auth.pat.username`).toString(),
-                }}
-                onChange={(val) => {
-                  handleValueChange(val, 'username');
-                }}
-              />
-            </>
-          )}
+          <PropertyRow
+            value={formState.config?.auth?.patConfig?.passwordName}
+            property={{
+              name: 'tokenName',
+              description: T.translate(`${PREFIX}.auth.pat.tokenNameHelperText`).toString(),
+              label: T.translate(`${PREFIX}.auth.pat.tokenName`).toString(),
+              required: true,
+            }}
+            onChange={(val) => {
+              handleValueChange(val, 'passwordName');
+            }}
+            errors={
+              !formState.config?.auth?.patConfig?.passwordName && formState.error
+                ? [{ msg: T.translate('commons.requiredFieldMissingMsg').toString() }]
+                : []
+            }
+          />
+          <PropertyRow
+            value={formState.config?.auth?.token}
+            property={{
+              name: 'token',
+              description: T.translate(`${PREFIX}.auth.pat.tokenHelperText`, {
+                provider: formState.config?.provider || providers.github,
+              }).toString(),
+              label: T.translate(`${PREFIX}.auth.pat.token`).toString(),
+              required: !isEdit,
+              'widget-type': 'password',
+            }}
+            onChange={(val) => {
+              handleValueChange(val, 'token');
+            }}
+            errors={
+              !formState.config?.auth?.token && formState.error
+                ? [{ msg: T.translate('commons.requiredFieldMissingMsg').toString() }]
+                : []
+            }
+          />
+          <PropertyRow
+            value={formState.config?.auth?.patConfig?.username}
+            property={{
+              name: 'username',
+              description: T.translate(`${PREFIX}.auth.pat.usernameHelperText`).toString(),
+              label: T.translate(`${PREFIX}.auth.pat.username`).toString(),
+            }}
+            onChange={(val) => {
+              handleValueChange(val, 'username');
+            }}
+          />
         </StyledGroup>
       </StyledForm>
       <StyledButtonGroup>
diff --git a/app/cdap/components/NamespaceAdmin/SourceControlManagement/constants.ts b/app/cdap/components/NamespaceAdmin/SourceControlManagement/constants.ts
@@ -18,9 +18,16 @@ import T from 'i18n-react';
 
 const PREFIX = 'features.SourceControlManagement';
 
-export const scmAuthType = [
-  { id: 'PAT', label: T.translate(`${PREFIX}.configModal.auth.pat.label`) },
-];
+export const SCM_AUTH_TYPE_PAT = {
+  id: 'PAT',
+  label: T.translate(`${PREFIX}.configModal.auth.pat.label`),
+};
+export const SCM_AUTH_TYPE_HTTP_ACCESS_TOKEN = {
+  id: 'HTTP_ACCESS_TOKEN',
+  label: T.translate(`${PREFIX}.configModal.auth.httpAccessToken.label`),
+};
+
+export const scmAuthType = [SCM_AUTH_TYPE_PAT, SCM_AUTH_TYPE_HTTP_ACCESS_TOKEN];
 
 export const githubOnlyProviders = {
   github: 'GITHUB',
diff --git a/app/cdap/text/text-en.yaml b/app/cdap/text/text-en.yaml
@@ -3224,7 +3224,8 @@ features:
     configModal:
       auth:
         label: Authentication type
-        helperText: Choose method for authentication. Currently only PAT is available
+        helperTextPatOnly: Choose method for authentication. Currently only PAT is available for {provider}.
+        helperText: Choose method for authentication.
         pat:
           label: Personal access token (PAT)
           token: Token
@@ -3233,6 +3234,8 @@ features:
           tokenNameHelperText: Give personal access token a name for secure store. The name can contain lower case alphabets, numbers, _, and -
           username: User name
           usernameHelperText: Add a username to your token
+        httpAccessToken:
+          label: Http access token
       authHeader: Authentication
       basicHeader: Basic
       branch:
diff --git a/server/config/development/cdap.json b/server/config/development/cdap.json
@@ -18,6 +18,7 @@
   "feature.lifecycle.management.edit.enabled": "true",
   "feature.source.control.management.git.enabled": "true",
   "feature.source.control.management.multi.app.enabled": "true",
+  "feature.source.control.management.gitlab.bitbucket.enabled": "true",
   "ui.analyticsTag": "",
   "ui.GTM": "",
   "hsts.enabled": "false",
diff --git a/src/e2e-test/features/source.control.management.repository.feature b/src/e2e-test/features/source.control.management.repository.feature
@@ -52,3 +52,16 @@ Feature: Source Control Management - Repository Configuration CRUD operations
     Then Verify saved fake repo config
     Then Delete the repo config
     Then Verify UI directed to initial page
+
+  Scenario: Should support HTTP_ACCESS_TOKEN for BITBUCKET_SERVER
+    When Open Source Control Management Page
+    Then Click on "Link Repository" button
+    Then Select "GITHUB" scm provider
+    Then Verify scm auth type "PAT" exists
+    Then Verify scm auth type "HTTP_ACCESS_TOKEN" does not exist
+    Then Select "BITBUCKET_SERVER" scm provider
+    Then Verify scm auth type "PAT" exists
+    Then Verify scm auth type "HTTP_ACCESS_TOKEN" exists
+    Then Select "GITLAB" scm provider
+    Then Verify scm auth type "PAT" exists
+    Then Verify scm auth type "HTTP_ACCESS_TOKEN" does not exist
diff --git a/src/e2e-test/java/io/cdap/cdap/ui/stepsdesign/SourceControlManagement.java b/src/e2e-test/java/io/cdap/cdap/ui/stepsdesign/SourceControlManagement.java
@@ -120,6 +120,26 @@ public void addFakeRepositoryConfiguration() {
     addToken(Constants.FAKE_TOKEN);
   }
 
+  @Then("Select {string} scm provider")
+  public void selectScmProvider(String scmProvider) {
+    WebElement providerSelector = Helper.locateElementByTestId("select-provider");
+    providerSelector.click();
+    WebElement providerOption = Helper.locateElementByTestId("option-" + scmProvider);
+    providerOption.click();
+  }
+
+  @Then("Verify scm auth type {string} exists")
+  public void verifyScmAuthTypeExists(String authType) {
+    String selector = "input[name=\"auth\"][type=\"radio\"][value=\"" + authType + "\"]";
+    Assert.assertNotNull(Helper.locateElementByCssSelector(selector));
+  }
+
+  @Then("Verify scm auth type {string} does not exist")
+  public void verifyScmAuthTypeDoesNotExist(String authType) {
+    String selector = "input[name=\"auth\"][type=\"radio\"][value=\"" + authType + "\"]";
+    Assert.assertFalse(Helper.isElementExists(selector));
+  }
+
   @Then("Add test repository configuration")
   public void addTestRepositoryConfiguration() {
     addRepoUrl(PluginPropertyUtils.pluginProp(Constants.GIT_REPO_URL_PROP_NAME));
