Merge pull request #154 from topcoder-platform/migrate-v5-groups

[Online Review] Migrate to use V5 Groups API instead of V3

Author: LieutenantRoger

conf/OnlineReview.xml

@@ -5231,12 +5231,8 @@
         <Property name="topcoder_api_base_url">
             <Value>@topcoder_api_base_url@</Value>
         </Property>
-
-        <Property name="user_group_membership_url">
-            <Value>@topcoder_api_base_url_v3@/groups?memberId=%s&amp;membershipType=User</Value>
-        </Property>
-        <Property name="parent_groups_url">
-            <Value>@topcoder_api_base_url_v3@/groups/%s/getParentGroup?oneLevel=false</Value>
+        <Property name="user_group_membership_url_v5">
+            <Value>@topcoder_api_base_url_v5@/groups/memberGroups/%s</Value>
         </Property>
         <Property name="v3jwt_cookie_name">
             <Value>v3jwt</Value>

src/main/java/com/cronos/onlinereview/actions/project/SaveProjectAction.java

@@ -1401,107 +1401,40 @@ private Date parseDatetimeFormProperties(int propertyIndex, String dateProperty,
     /**
      * Get groups for the login user
      *
-     * @param request the request to use
      * @param userId the user id to use
      * @throws BaseException if any error occurs
      * @return the Set<Long> result contains the group ids
      */
     private Set<Long> getGroups(long userId) throws BaseException {
     	try {
             DefaultHttpClient httpClient = new DefaultHttpClient();
-            String groupEndPoint = String.format(ConfigHelper.getUserGroupMembershipUrl(), userId);
-            HttpGet getRequest = new HttpGet(groupEndPoint);
-
-            String v3Token = new JwtTokenUpdater().check().getToken();
+            String groupV5EndPoint = String.format(ConfigHelper.getUserGroupMembershipUrlV5(), userId);
+            HttpGet getRequest = new HttpGet(groupV5EndPoint);
 
-            getRequest.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + v3Token);
+            String m2mToken = ConfigHelper.getEventBusAuthToken();
+            getRequest.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + m2mToken);
 
             getRequest.addHeader(HttpHeaders.ACCEPT, "application/json");
             HttpResponse httpResponse = httpClient.execute(getRequest);
 
             HttpEntity entity = httpResponse.getEntity();
 
             if (httpResponse.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
-                throw new BaseException("Unable to get groups from the API:" + httpResponse.getStatusLine().getReasonPhrase());
+                throw new BaseException("Unable to get v5 groups from the API:" + httpResponse.getStatusLine().getReasonPhrase());
             }
 
-            JsonNode result = objectMapper.readTree(entity.getContent());
-
-            JsonNode groups = result.path("result").path("content");
+            JsonNode groups = objectMapper.readTree(entity.getContent());
             Set<Long> groupIds = new HashSet<Long>();
             for (JsonNode group : groups) {
-                groupIds.add(group.path("id").asLong());
+                groupIds.add(group.asLong());
             }
-
-            Set<Long> allGroupIds = new HashSet<Long>(groupIds);
-            for (Long groupId : groupIds) {
-                allGroupIds.addAll(getParentGroups(groupId));
-            }
-
-            return allGroupIds;
+            System.out.println("getGroups Results:" + groupIds);
+            return groupIds;
     	} catch (Exception exp) {
     		throw new BaseException(exp.getMessage(), exp);
     	}
     }
 
-    /**
-     * Get parent groups for the given group id
-     *
-     * @param request the request to use
-     * @param groupId the user id to use
-     * @throws BaseException if any error occurs
-     * @return the Set<Long> result contains the group ids
-     */
-    private Set<Long> getParentGroups(long groupId) throws BaseException {
-        try {
-            DefaultHttpClient httpClient = new DefaultHttpClient();
-            String parentGroupsEndPoint = String.format(ConfigHelper.getParentGroupsUrl(), groupId);
-            HttpGet getRequest = new HttpGet(parentGroupsEndPoint);
-
-            String v3Token = new JwtTokenUpdater().check().getToken();
-
-            getRequest.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + v3Token);
-
-            getRequest.addHeader(HttpHeaders.ACCEPT, "application/json");
-            HttpResponse httpResponse = httpClient.execute(getRequest);
-
-            HttpEntity entity = httpResponse.getEntity();
-
-            if (httpResponse.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
-                throw new BaseException("Unable to get groups from the API:" + httpResponse.getStatusLine().getReasonPhrase());
-            }
-
-            JsonNode result = objectMapper.readTree(entity.getContent());
-
-            JsonNode groupNode = result.path("result").path("content");
-            Set<Long> groupIds = parseGroup(groupNode);
-
-            return groupIds;
-        } catch (Exception exp) {
-            throw new BaseException(exp.getMessage(), exp);
-        }
-    }
-
-    /**
-     * Parse the group from the JSON node
-     * @param groupNode the JSON node
-     * @return the group
-     */
-    private Set<Long> parseGroup(JsonNode groupNode) {
-        Set<Long> parentGroupIds = new HashSet<Long>();
-        Long parentGroupId = groupNode.path("id").asLong();
-        if (parentGroupId != 0) {
-            // exclude null node
-            parentGroupIds.add(groupNode.path("id").asLong());
-        }
-
-        if (groupNode.has("parentGroup")) {
-            parentGroupIds.addAll(parseGroup(groupNode.path("parentGroup")));
-        }
-
-        return parentGroupIds;
-    }
-
     /**
      * Check group permission
      *

src/main/java/com/cronos/onlinereview/util/ConfigHelper.java

@@ -580,14 +580,9 @@ public class ConfigHelper {
     private static final String V3_JWT_COOKIE_NAME = "v3jwt_cookie_name";
 
     /**
-     * <p>A <code>String</code> providing the name for user group memeber ship url property.</p>
+     * <p>A <code>String</code> providing the name for user group member ship v5 url property.</p>
      */
-    private static final String USER_GROUP_MEMBERSHIP_URL = "user_group_membership_url";
-
-    /**
-     * <p>A <code>String</code> providing the name for parent groups url property.</p>
-     */
-    private static final String PARENT_GROUPS_URL = "parent_groups_url";
+    private static final String USER_GROUP_MEMBERSHIP_URL_V5 = "user_group_membership_url_v5";
 
     /**
      * <p>A <code>String</code> providing the name for v2 jwt cookie name property.</p>
@@ -962,15 +957,9 @@ public class ConfigHelper {
     private static String thurgoodPassword;
 
     /**
-     * <p>Represents the userGroupMembershipUrl.</p>
-     */
-    private static String userGroupMembershipUrl;
-
-    /**
-     * <p>Represents the parentGroupsUrl.</p>
+     * <p>Represents the userGroupMembershipUrlV5.</p>
      */
-    private static String parentGroupsUrl;
-
+    private static String userGroupMembershipUrlV5;
     /**
      * <p>Represents the v3jwtCookieBame.</p>
      */
@@ -1671,8 +1660,7 @@ public class ConfigHelper {
                 thurgoodPassword = value;
             }
 
-            userGroupMembershipUrl = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, USER_GROUP_MEMBERSHIP_URL);
-            parentGroupsUrl = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, PARENT_GROUPS_URL);
+            userGroupMembershipUrlV5 = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, USER_GROUP_MEMBERSHIP_URL_V5);
             v3jwtCookieName = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, V3_JWT_COOKIE_NAME);
             v2jwtCookieName = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, V2_JWT_COOKIE_NAME);
             ssoDomainForV3jwtCookie = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, SSO_DOMAIN_FOR_V3_JWT_COOKIE);
@@ -2536,21 +2524,12 @@ public static String getThurgoodPassword() {
     }
 
     /**
-     * Get user group membership url
-     *
-     * @return the userGroupMembershipUrl
-     */
-    public static String getUserGroupMembershipUrl() {
-    	return userGroupMembershipUrl;
-    }
-
-    /**
-     * Get parent groups url
+     * Get user group membership v5 url
      *
-     * @return the parent groups url
+     * @return the userGroupMembershipUrlV5
      */
-    public static String getParentGroupsUrl() {
-        return parentGroupsUrl;
+    public static String getUserGroupMembershipUrlV5() {
+        return userGroupMembershipUrlV5;
     }
 
     /**

token.properties.example

@@ -154,6 +154,7 @@ thurgood.username=Thurgood
 thurgood.password=password
 topcoder_api_base_url=http://api.topcoder.com/v2/develop/challenges
 topcoder_api_base_url_v3=http://api.topcoder.com/v3/challenges
+topcoder_api_base_url_v5=https://api.topcoder.com/v5
 amazon_sns_arn=
 amazonSNSAccessKey=
 amazonSNSSecretKey=

token.properties.local

@@ -160,6 +160,7 @@ thurgood.username=Thurgood
 thurgood.password=password
 topcoder_api_base_url=http://api.topcoder-dev.com/v2/develop/challenges
 topcoder_api_base_url_v3=http://api.topcoder-dev.com/v3/challenges
+topcoder_api_base_url_v5=https://api.topcoder-dev.com/v5
 amazon_sns_arn=arn:aws:sns:us-east-1:766830814403:community-challenge-create
 amazonSNSAccessKey=AKIAIZNXS3HERHTLVQKA
 amazonSNSSecretKey=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