From 6f45f3dec6616e88ef0f890a185e940cf8ba7de2 Mon Sep 17 00:00:00 2001
From: Daniel Anechitoaie <daniel.anechitoaie@gmail.com>
Date: Wed, 26 Feb 2020 17:48:37 +0200
Subject: [PATCH] Fixed bug randomly introduced by SFCC and undocumented where
 they started requireing the credentials to be URLEncoded before they are used
 as Basic HTTP Auth

---
 pom.xml                                       | 23 ++++---------------
 findbugs-exclude.xml => spotbugs-exclude.xml  |  0
 .../dataimport/OpenCommerceAPI.java           |  7 +++---
 3 files changed, 9 insertions(+), 21 deletions(-)
 rename findbugs-exclude.xml => spotbugs-exclude.xml (100%)

diff --git a/pom.xml b/pom.xml
index 4712946..d641a35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.6</version>
+        <version>3.56</version>
         <relativePath />
     </parent>
 
@@ -43,7 +43,7 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <java.level>8</java.level>
-        <jenkins.version>2.107.1</jenkins.version>
+        <jenkins.version>2.164.1</jenkins.version>
     </properties>
 
     <build>
@@ -65,23 +65,10 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.16</version>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
                 <configuration>
-                    <signature>
-                        <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>java18</artifactId>
-                        <version>1.0</version>
-                    </signature>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.5</version>
-                <configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+                    <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/findbugs-exclude.xml b/spotbugs-exclude.xml
similarity index 100%
rename from findbugs-exclude.xml
rename to spotbugs-exclude.xml
diff --git a/src/main/java/org/jenkinsci/plugins/osfbuildersuiteforsfcc/dataimport/OpenCommerceAPI.java b/src/main/java/org/jenkinsci/plugins/osfbuildersuiteforsfcc/dataimport/OpenCommerceAPI.java
index a21fc49..80d07a9 100644
--- a/src/main/java/org/jenkinsci/plugins/osfbuildersuiteforsfcc/dataimport/OpenCommerceAPI.java
+++ b/src/main/java/org/jenkinsci/plugins/osfbuildersuiteforsfcc/dataimport/OpenCommerceAPI.java
@@ -46,6 +46,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateExpiredException;
@@ -567,9 +568,9 @@ private AuthResponse auth() throws IOException {
                 Base64.getEncoder().encodeToString(
                         String.format(
                                 "%s:%s",
-                                ocCredentials.getClientId(),
-                                ocCredentials.getClientPassword().getPlainText()
-                        ).getBytes(Consts.UTF_8)
+                                URLEncoder.encode(ocCredentials.getClientId(), "UTF-8"),
+                                URLEncoder.encode(ocCredentials.getClientPassword().getPlainText(), "UTF-8")
+                        ).getBytes(StandardCharsets.UTF_8)
                 )
         ));