Merge pull request #305 from deedee/use_challenge_service_v3

use challenge service v3

Author: ajefts

conf/ApplicationServer.properties

@@ -46,5 +46,6 @@ SSO_HASH_SECRET = @ApplicationServer.SSO_HASH_SECRET@
 SSO_DOMAIN = @ApplicationServer.SSO_DOMAIN@
 
 JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@
+JWT_V3_COOKIE_KEY = @ApplicationServer.JWT_V3_COOKIE_KEY@
 
 DIRECT_API_SERVICE_ENDPOINT = @ApplicationServer.DIRECT_API_SERVICE_ENDPOINT@

conf/web/WEB-INF/applicationContext.xml

@@ -1554,13 +1554,13 @@
 
     <bean id="myCreatedChallengesAction"
           class="com.topcoder.direct.services.view.action.my.MyCreatedChallengesAction" scope="prototype">
-        <property name="serviceURL" value="/challenges"/>
+        <property name="serviceURL" value="@directChallengeServicesApiUrl@"/>
         <property name="userService" ref="userService"/>
     </bean>
 
     <bean id="myChallengesAction"
           class="com.topcoder.direct.services.view.action.my.MyChallengesAction" scope="prototype">
-        <property name="serviceURL" value="/challenges"/>
+        <property name="serviceURL" value="@directChallengeServicesApiUrl@"/>
     </bean>
 
     <bean id="xmlPhaseTemplatePersistence"

src/java/main/com/topcoder/direct/services/configs/ServerConfiguration.java

@@ -55,12 +55,14 @@ public class ServerConfiguration extends ApplicationServer {
      *
      * @since 1.1
      */
-    public static String JWT_COOOKIE_KEY = bundle.getProperty("JWT_COOOKIE_KEY", "tcjwt");
+    public static String JWT_COOOKIE_KEY = bundle.getProperty("JWT_COOKIE_KEY", "tcjwt");
 
     /**
      * The end point URL of the direct API. The default value is set to empty
      *
      * @since 1.1
      */
     public static String DIRECT_API_SERVICE_ENDPOINT = bundle.getProperty("DIRECT_API_SERVICE_ENDPOINT", "");
+
+    public static String JWT_V3_COOKIE_KEY = bundle.getProperty("JWT_V3_COOKIE_KEY", "v3jwt");
 }

src/java/main/com/topcoder/direct/services/view/action/ServiceBackendDataTablesAction.java

@@ -23,8 +23,10 @@
 import org.codehaus.jackson.map.ObjectMapper;
 
 import javax.servlet.http.Cookie;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -265,23 +267,29 @@ protected void setupFilterPanel() throws Exception {
      * @return the built URI.
      * @throws URISyntaxException if the syntax is error.
      */
-    protected URI buildServiceEndPoint(Map<String, String> parameters) throws URISyntaxException {
+    protected URI buildServiceEndPoint(Map<String, String> parameters) throws URISyntaxException, UnsupportedEncodingException {
 
         int pageSize = getiDisplayLength() == -1 ? MAX_PAGINATION_SIZE : getiDisplayLength();
 
 
-        URIBuilder builder = new URIBuilder();
-        builder.setScheme("http").setHost(ServerConfiguration.DIRECT_API_SERVICE_ENDPOINT).setPath(getServiceURL())
-                .setParameter("offset", String.valueOf(getiDisplayStart()))
+        URIBuilder builder = new URIBuilder(getServiceURL());
+
+        builder.setParameter("offset", String.valueOf(getiDisplayStart()))
                 .setParameter("limit", String.valueOf(pageSize));
 
+        String filters = "";
         if (parameters != null) {
             for (String key : parameters.keySet()) {
-                builder.setParameter(key, parameters.get(key));
+                if ("filter".equals(key)) {
+                    filters = URLEncoder.encode(parameters.get(key), "UTF-8");
+                } else {
+                    builder.setParameter(key, parameters.get(key));
+                }
             }
         }
 
-        return builder.build();
+        return new URI(new StringBuilder(builder.build().toString()).append("&filter=").append(filters).toString());
+
     }
 
     /**
@@ -314,7 +322,7 @@ protected JsonNode getJsonResultFromAPI(URI apiEndPoint) throws Exception {
             HttpGet getRequest = new HttpGet(apiEndPoint);
 
             Cookie jwtCookie = DirectUtils.getCookieFromRequest(ServletActionContext.getRequest(),
-                    ServerConfiguration.JWT_COOOKIE_KEY);
+                    ServerConfiguration.JWT_V3_COOKIE_KEY);
 
             if (jwtCookie == null) {
                 throw new Exception("The jwt cookie for the authorized user could not be loaded");

src/java/main/com/topcoder/direct/services/view/action/my/MyCreatedChallengesAction.java

@@ -13,6 +13,7 @@
 import org.codehaus.jackson.JsonNode;
 
 import javax.servlet.http.Cookie;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
@@ -120,7 +121,6 @@ public String getMyCreatedChallenges() {
             } else {
                 filtersQuery = "creator=" + getUserService().getUserHandle(DirectUtils.getTCSubjectFromSession().getUserId());
             }
-
             params.put("filter", filtersQuery);
 
             JsonNode jsonNode = getJsonResultFromAPI(buildServiceEndPoint(params));

token.properties.docker

@@ -356,6 +356,9 @@
 # Direct API                        #
 #####################################
 @ApplicationServer.JWT_COOKIE_KEY@=tcjwt_vm
+@ApplicationServer.JWT_V3_COOKIE_KEY@=v3jwt
 @ApplicationServer.DIRECT_API_SERVICE_ENDPOINT@= direct.dev.topcoder.com/direct/api/v2/
 
 @memberSearchApiUrl@=https://tc-api.cloud.topcoder.com:8443/v3/members/_suggest/
+@directChallengeServicesApiUrl@=http://api.topcoder-dev.com/v3/direct/challenges
+

token.properties.example

@@ -321,6 +321,7 @@
 @ApplicationServer.SSO_DOMAIN@=topcoder.com
 
 @ApplicationServer.JWT_COOKIE_KEY@=tcjwt
+@ApplicationServer.JWT_V3_COOKIE_KEY@=v3jwt
 
 @ApplicationServer.DIRECT_API_SERVICE_ENDPOINT@= direct.dev.topcoder.com/direct/api/v2/
 
@@ -416,3 +417,5 @@
 @member.profile.url.base@=http://tc.cloud.topcoder.com
 
 @memberSearchApiUrl@=https://tc-api.cloud.topcoder.com:8443/v3/members/_suggest/
+@directChallengeServicesApiUrl@=http://api.topcoder-dev.com/v3/direct/challenges
+