Merge pull request #64 from xxcxy/dev

add token header to v5api

Author: eisbilir

src/main/java/com/topcoder/onlinereview/component/project/phase/ManagerHelper.java

@@ -338,6 +338,19 @@ public class ManagerHelper {
     @Value("${managerHelper.V5ChallengeURL:#{null}}")
     private String v5ChallengeURL;
 
+    @Value("${managerHelper.authClientId:#{null}}")
+    private String authClientId;
+    @Value("${managerHelper.authClientSecret:#{null}}")
+    private String authClientSecret;
+    @Value("${managerHelper.authAudience:#{null}}")
+    private String authAudience;
+    @Value("${managerHelper.authDomain:#{null}}")
+    private String authDomain;
+    @Value("${managerHelper.authExpirationTime:#{null}}")
+    private String authExpirationTime;
+    @Value("${managerHelper.authProxyURL:#{null}}")
+    private String authProxyURL;
+
     /**
      * <p>A <code>ReviewFeedbackManager</code> providing the interface to review feedback management system.</p>
      * @since 1.7.6
@@ -585,4 +598,28 @@ public ProjectPaymentCalculator getProjectPaymentAdjustmentCalculator() {
     public String getV5ChallengeURL() {
         return v5ChallengeURL;
     }
+
+    public String getAuthClientId() {
+        return authClientId;
+    }
+
+    public String getAuthClientSecret() {
+        return authClientSecret;
+    }
+
+    public String getAuthAudience() {
+        return authAudience;
+    }
+
+    public String getAuthDomain() {
+        return authDomain;
+    }
+
+    public String getAuthExpirationTime() {
+        return authExpirationTime;
+    }
+
+    public String getAuthProxyURL() {
+        return authProxyURL;
+    }
 }

src/main/java/com/topcoder/onlinereview/component/project/phase/handler/AbstractPhaseHandler.java

@@ -22,6 +22,7 @@
 import com.topcoder.onlinereview.component.email.TCSEmailMessage;
 import com.topcoder.onlinereview.component.external.ExternalUser;
 import com.topcoder.onlinereview.component.external.RetrievalException;
+import com.topcoder.onlinereview.component.jwt.JWTTokenGenerator;
 import com.topcoder.onlinereview.component.project.management.PersistenceException;
 import com.topcoder.onlinereview.component.project.management.Project;
 import com.topcoder.onlinereview.component.project.management.ProjectCategory;
@@ -38,6 +39,7 @@
 import com.topcoder.onlinereview.component.search.SearchBuilderException;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.http.HttpHeaders;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -994,6 +996,7 @@ private String getV5Id(Long legacyId, Map<Long, Map<String, String>> challengeId
         GetMethod getMethod = new GetMethod(challengeUrl + legacyId);
         getMethod.addRequestHeader("accept", "application/json");
         try {
+            setM2AuthToken(getMethod);
             int statusCode = new HttpClient().executeMethod(getMethod);
             if (statusCode == 200) {
                 List<Map<String, Object>> res = new ObjectMapper().readValue(getMethod.getResponseBodyAsString(), new TypeReference<List<Map<String, Object>>>(){});
@@ -1007,12 +1010,29 @@ private String getV5Id(Long legacyId, Map<Long, Map<String, String>> challengeId
             } else {
                 log.error("Get challenge Id error with statusCode: " + statusCode);
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             log.error("parse challenge error: ", e);
         }
         return "";
     }
 
+    /**
+     * Set token header
+     *
+     * @param getMethod request method
+     */
+    public void setM2AuthToken(GetMethod getMethod) throws Exception {
+        if (managerHelper.getAuthClientId() != null) {
+            String token = JWTTokenGenerator.getInstance(managerHelper.getAuthClientId(),
+                    managerHelper.getAuthClientSecret(),
+                    managerHelper.getAuthAudience(),
+                    managerHelper.getAuthDomain(),
+                    Integer.parseInt(managerHelper.getAuthExpirationTime()),
+                    managerHelper.getAuthProxyURL()).getMachineToken();
+            getMethod.addRequestHeader(HttpHeaders.AUTHORIZATION, "Bearer " + token);
+        }
+    }
+
     /**
      * Send or delete phase related emails.
      *