support bearer token

linhtnlK · linhtnlK · commit bb653eb5ca98 · 2023-05-22T13:43:40.000+07:00
diff --git a/pom.xml b/pom.xml
@@ -108,6 +108,11 @@
 			<artifactId>jsr311-api</artifactId>
 			<version>1.0</version>
 		</dependency>
+		<dependency>
+		  <groupId>org.eclipse.platform</groupId>
+		  <artifactId>org.eclipse.core.jobs</artifactId>
+		  <version>3.10.100</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/com/katalon/plugin/jira/composer/constant/ComposerJiraIntegrationMessageConstant.java b/src/main/java/com/katalon/plugin/jira/composer/constant/ComposerJiraIntegrationMessageConstant.java
@@ -37,6 +37,8 @@ private ComposerJiraIntegrationMessageConstant() {
 
     public static String PREF_CHCK_ENCRYPT_PASSWORD;
 
+    public static String PREF_LBL_BEARER_TOKEN;
+
     public static String PREF_LBL_CONNECT;
 
     public static String PREF_LBL_FETCH_CUSTOM_FIELDS;
diff --git a/src/main/java/com/katalon/plugin/jira/composer/preference/JiraSettingsComposite.java b/src/main/java/com/katalon/plugin/jira/composer/preference/JiraSettingsComposite.java
@@ -65,7 +65,7 @@ public class JiraSettingsComposite implements JiraUIComponent {
 
     private Composite mainComposite;
 
-    private Text txtServerUrl, txtUsername, txtPassword;
+    private Text txtServerUrl, txtUsername, txtPassword, txtBearerToken;
 
     private Button chckUseTestCaseNameAsSumarry, chckAttachScreenshot, chckAttachLog;
 
@@ -222,6 +222,7 @@ private DisplayedComboboxObject<JiraIssueType> getIssueTypeForProject(JiraProjec
 
     private void maskPasswordField() {
         txtPassword.setEchoChar("\u2022".charAt(0));
+        txtBearerToken.setEchoChar("\u2022".charAt(0));
     }
 
     public void setShell(Shell shell) {
@@ -253,6 +254,7 @@ public void initializeData() {
             txtServerUrl.setText(settingStore.getServerUrl(encryptionEnabled));
             txtUsername.setText(settingStore.getUsername(encryptionEnabled));
             txtPassword.setText(settingStore.getPassword(encryptionEnabled));
+            txtBearerToken.setText(settingStore.getBearerToken(encryptionEnabled));
             chckEncrypt.setSelection(encryptionEnabled);
             maskPasswordField();
 
@@ -369,6 +371,12 @@ private void createAuthenticationGroup() {
         txtPassword = new Text(passwordComposite, SWT.BORDER);
         txtPassword.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
 
+        Label lblBearerToken = new Label(grpAuthentication, SWT.NONE);
+        lblBearerToken.setText(ComposerJiraIntegrationMessageConstant.PREF_LBL_BEARER_TOKEN);
+        
+        txtBearerToken = new Text(grpAuthentication, SWT.BORDER);
+        txtBearerToken.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+
         chckEncrypt = new Button(grpAuthentication, SWT.CHECK);
         chckEncrypt.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, true, 2, 1));
         chckEncrypt.setText(ComposerJiraIntegrationMessageConstant.PREF_CHCK_ENCRYPT_PASSWORD);
@@ -465,6 +473,7 @@ public boolean okPressed() {
             settingStore.saveServerUrl(getTrimedValue(txtServerUrl), encryptionEnable);
             settingStore.saveUsername(getTrimedValue(txtUsername), encryptionEnable);
             settingStore.savePassword(txtPassword.getText(), encryptionEnable);
+            settingStore.saveBearerToken(txtBearerToken.getText(), encryptionEnable);
             settingStore.saveJiraUser(user);
             settingStore.enableEncryption(encryptionEnable);
 
@@ -508,6 +517,7 @@ private JiraCredential getEdittingCredential() {
         credential.setServerUrl(getTrimedValue(txtServerUrl));
         credential.setUsername(getTrimedValue(txtUsername));
         credential.setPassword(txtPassword.getText());
+        credential.setBearerToken(txtBearerToken.getText());
         return credential;
     }
 
diff --git a/src/main/java/com/katalon/plugin/jira/composer/toolbar/handler/ImportJiraJQLHandler.java b/src/main/java/com/katalon/plugin/jira/composer/toolbar/handler/ImportJiraJQLHandler.java
@@ -12,6 +12,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
+import org.apache.http.HttpHeaders;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -21,6 +22,8 @@
 import org.joda.time.DateTimeZone;
 import org.joda.time.tz.UTCProvider;
 
+import com.atlassian.httpclient.api.Request.Builder;
+import com.atlassian.jira.rest.client.api.AuthenticationHandler;
 import com.atlassian.jira.rest.client.api.JiraRestClient;
 import com.atlassian.jira.rest.client.api.JiraRestClientFactory;
 import com.atlassian.jira.rest.client.api.domain.Field;
@@ -104,8 +107,22 @@ protected IStatus run(IProgressMonitor monitor) {
                     List<TestCaseEntity> testCases = new ArrayList<>();
 
                     JiraRestClientFactory clientFactory = new AsynchronousJiraRestClientFactory();
-                    restClient = clientFactory.createWithBasicHttpAuthentication(URI.create(credential.getServerUrl()),
-                            credential.getUsername(), credential.getPassword());
+                    if (credential.getBearerToken().isEmpty()) {
+                        restClient = clientFactory.createWithBasicHttpAuthentication(
+                                URI.create(credential.getServerUrl()), credential.getUsername(),
+                                credential.getPassword());
+                    } else {
+                        clientFactory.createWithAuthenticationHandler(URI.create(credential.getServerUrl()),
+                                new AuthenticationHandler() {
+
+                                    @Override
+                                    public void configure(Builder builder) {
+                                        builder.setHeader(HttpHeaders.AUTHORIZATION,
+                                                "Bearer " + credential.getBearerToken());
+
+                                    }
+                                });
+                    }
                     DateTimeZone.setProvider(new UTCProvider());
 
                     ableToGetCustomFieldContentFromJiraCloud = true;
diff --git a/src/main/java/com/katalon/plugin/jira/core/JiraCredential.java b/src/main/java/com/katalon/plugin/jira/core/JiraCredential.java
@@ -7,6 +7,8 @@ public class JiraCredential {
 
     private String password;
 
+    private String bearerToken;
+
     public String getServerUrl() {
         return serverUrl;
     }
@@ -30,4 +32,12 @@ public String getPassword() {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getBearerToken() {
+        return bearerToken;
+    }
+
+    public void setBearerToken(String bearerToken) {
+        this.bearerToken = bearerToken;
+    }
 }
diff --git a/src/main/java/com/katalon/plugin/jira/core/constant/StringConstants.java b/src/main/java/com/katalon/plugin/jira/core/constant/StringConstants.java
@@ -29,6 +29,8 @@ public class StringConstants {
 
     public static final String PREF_AUTH_PASSWORD = "auth.password";
 
+    public static final String PREF_AUTH_BEARER_TOKEN = "auth.bearerToken";
+
     public static final String PREF_AUTH_USERNAME = "auth.username";
 
     public static final String PREF_AUTH_USER = "auth.user";
diff --git a/src/main/java/com/katalon/plugin/jira/core/request/JiraIntegrationRequest.java b/src/main/java/com/katalon/plugin/jira/core/request/JiraIntegrationRequest.java
@@ -174,9 +174,13 @@ protected CloseableHttpClient getClientBuilder() throws GeneralSecurityException
     }
 
     protected void addAuthenticationHeader(JiraCredential credential, HttpRequestBase request) {
-        String authEncoded = new Base64()
-                .encodeAsString((credential.getUsername() + ":" + credential.getPassword()).getBytes());
-        request.setHeader(HttpHeaders.AUTHORIZATION, "Basic " + authEncoded);
+        if (credential.getBearerToken().isEmpty()) {
+            String authEncoded = new Base64()
+                    .encodeAsString((credential.getUsername() + ":" + credential.getPassword()).getBytes());
+            request.setHeader(HttpHeaders.AUTHORIZATION, "Basic " + authEncoded);
+        } else {
+            request.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + credential.getBearerToken());
+        }
         request.setHeader("X-Atlassian-Token", "no-check");
     }
 
diff --git a/src/main/java/com/katalon/plugin/jira/core/setting/JiraIntegrationSettingStore.java b/src/main/java/com/katalon/plugin/jira/core/setting/JiraIntegrationSettingStore.java
@@ -16,7 +16,7 @@
 import static com.katalon.plugin.jira.core.constant.StringConstants.PREF_SUBMIT_USE_TEST_CASE_NAME_AS_SUMMARY;
 import static com.katalon.plugin.jira.core.constant.StringConstants.MIGRATE_PROJECT_SCOPE;
 import static com.katalon.plugin.jira.core.constant.StringConstants.PREF_SUBMIT_FETCH_JIRA_CLOUD_CONTENT;
-
+import static com.katalon.plugin.jira.core.constant.StringConstants.PREF_AUTH_BEARER_TOKEN;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.security.GeneralSecurityException;
@@ -72,11 +72,27 @@ public String getPassword(boolean encryptionEnabled)
         return decryptedString;
     }
 
+    public String getBearerToken(boolean encryptionEnabled)
+            throws IOException, GeneralSecurityException, InvalidDataTypeFormatException, CryptoException {
+        boolean shouldDecrypted = isEncryptionMigrated() && encryptionEnabled;
+        String decryptedString = delegate.getString(PREF_AUTH_BEARER_TOKEN, StringUtils.EMPTY, shouldDecrypted);
+        if (shouldDecrypted) {
+            if (decryptedString.startsWith("\"") && decryptedString.endsWith("\"")) {
+                return decryptedString.substring(1, decryptedString.length() - 1);
+            }
+        }
+        return decryptedString;
+    }
+
     public void savePassword(String rawPassword, boolean encryptEnabled)
             throws IOException, GeneralSecurityException, CryptoException {
         delegate.setString(PREF_AUTH_PASSWORD, rawPassword, encryptEnabled);
     }
 
+    public void saveBearerToken(String rawBearerToken, boolean encryptEnabled) throws CryptoException {
+        delegate.setString(PREF_AUTH_BEARER_TOKEN, rawBearerToken, encryptEnabled);
+    }
+
     public boolean isEncryptionEnabled() throws IOException {
         return delegate.getBoolean(PREF_AUTH_ENCRYPTION_ENABLED, false);
     }
diff --git a/src/main/resources/com/katalon/plugin/jira/composer/constant/ComposerJiraIntegrationMessage.properties b/src/main/resources/com/katalon/plugin/jira/composer/constant/ComposerJiraIntegrationMessage.properties
@@ -4,6 +4,7 @@ PREF_TITLE_SUBMIT_OPTIONS=Submit Options
 PREF_LBL_SERVER_URL=Server URL:
 PREF_LBL_USERNAME=Username:
 PREF_LBL_PASSWORD=Password
+PREF_LBL_BEARER_TOKEN=Bearer Token
 PREF_LBL_API_TOKEN=API Token
 PREF_CHCK_SHOW_PASSWORD=Show password
 PREF_CHCK_ENCRYPT_PASSWORD=Encrypt authentication data (recommended)

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ public class JiraCredential {`
`7`	`7`
`8`	`8`	`private String password;`
`9`	`9`
	`10`	`+ private String bearerToken;`
	`11`	`+`
`10`	`12`	`public String getServerUrl() {`
`11`	`13`	`return serverUrl;`
`12`	`14`	`}`
`@@ -30,4 +32,12 @@ public String getPassword() {`
`30`	`32`	`public void setPassword(String password) {`
`31`	`33`	`this.password = password;`
`32`	`34`	`}`
	`35`	`+`
	`36`	`+ public String getBearerToken() {`
	`37`	`+ return bearerToken;`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ public void setBearerToken(String bearerToken) {`
	`41`	`+ this.bearerToken = bearerToken;`
	`42`	`+ }`
`33`	`43`	`}`