Merge pull request #125 from appirio-tech/dev

Update configs

Author: ThomasKranitsas

postman/review-microservice.postman_environment.json

@@ -11,19 +11,19 @@
     {
       "enabled": true,
       "key": "Reviewer1 Token",
-      "value": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJyZXZpZXdlciJdLCJpc3MiOiJodHRwczovL2FwaS50b3Bjb2Rlci1kZXYuY29tIiwiaGFuZGxlIjoicmV2aWV3ZXIxIiwiZXhwIjoxNzY2Mjg5MjQ2LCJ1c2VySWQiOiIxMjM0IiwiaWF0IjoxNDUwOTI5MjQ2LCJlbWFpbCI6bnVsbCwianRpIjoiMTM2OWM2MDAtZTBhMS00NTI1LWE3YzctNTZiZTdkODEzZjUxIn0.4AOKcnvm4Wms_lY_RyYv61OHXCC-I__JnEPRZEN3-vM",
+      "value": "Bearer ey",
       "type": "text"
     },
     {
       "enabled": true,
       "key": "Reviewer2 Token",
-      "value": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJyZXZpZXdlciJdLCJpc3MiOiJodHRwczovL2FwaS50b3Bjb2Rlci1kZXYuY29tIiwiaGFuZGxlIjoicmV2aWV3ZXIyIiwiZXhwIjoxNzY2Mjg5MjQ2LCJ1c2VySWQiOiIxMjM1IiwiaWF0IjoxNDUwOTI5MjQ2LCJlbWFpbCI6bnVsbCwianRpIjoiMTM2OWM2MDAtZTBhMS00NTI1LWE3YzctNTZiZTdkODEzZjUxIn0.RrkQ7srca99ctABa_VM9VYediC2mcg4hPOiQ1Roou14",
+      "value": "Bearer ey",
       "type": "text"
     },
     {
       "enabled": true,
       "key": "Administrator Token",
-      "value": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJhZG1pbmlzdHJhdG9yIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJhZG1pbiIsImV4cCI6MTc2NjI4OTI0NiwidXNlcklkIjoiNTU1NSIsImlhdCI6MTQ1MDkyOTI0NiwiZW1haWwiOm51bGwsImp0aSI6IjEzNjljNjAwLWUwYTEtNDUyNS1hN2M3LTU2YmU3ZDgxM2Y1MSJ9.Wg4nPCva9opNyrYQTngSoXetXr-W-ZSDtD2jae1gswk",
+      "value": "Bearer ey",
       "type": "text"
     }
   ],

service/pom.xml

@@ -10,7 +10,7 @@
 	    <dropwizard.version>1.0.0</dropwizard.version>
 	    <powermock.version>1.5.4</powermock.version>
 	    <jackson-version>2.7.3</jackson-version>
-	    <core.api.version>4.3.1</core.api.version>
+	    <core.api.version>4.3.3</core.api.version>
 	    <supply-library.version>1.0.20-SNAPSHOT</supply-library.version>
 	</properties>
 

service/src/main/java/com/appirio/service/review/M2mAuthConfiguration.java

@@ -60,11 +60,11 @@ public class M2mAuthConfiguration {
     private Integer tokenExpireTimeInMinutes;
 
     /**
-     * The user id.
+     * The proxy server.
      */
     @JsonProperty
-    @NotNull
     @Getter
     @Setter
-    private Long userId;
+    private String auth0ProxyServerUrl;
+
 }

service/src/main/java/com/appirio/service/review/util/Helper.java

@@ -81,7 +81,8 @@ static String generateAuthToken(M2mAuthConfiguration m2mAuthConfiguration) throw
                 m2mAuthConfiguration.getClientSecret(),
                 m2mAuthConfiguration.getAudience(),
                 m2mAuthConfiguration.getM2mAuthDomain(),
-                m2mAuthConfiguration.getTokenExpireTimeInMinutes());
+                m2mAuthConfiguration.getTokenExpireTimeInMinutes(),
+                m2mAuthConfiguration.getAuth0ProxyServerUrl());
         return jwtTokenGenerator.getMachineToken();
     }
-}
+}

service/src/main/resources/review-service.yaml

@@ -68,12 +68,12 @@ parentGroupServiceClient:
   endpoint: "${PARENT_GROUP_SERVICE_ENDPOINT}"
 
 m2mAuthConfig:
-  clientId: "${M2M_AUTH_CLIENT_ID:-jGIf2pd3f44B1jqvOai30BIKTZanYBfU}"
-  clientSecret: "${M2M_AUTH_CLIENT_SECRET:-Qm7nOrpieH267w8Ko4QGfvbEI3WXwbCzFtoA-xWXNIpSqHEIALhDgYtl3y2zbX3w}"
-  audience: "${M2M_AUTH_AUDIENCE:-https://m2m.topcoder-dev.com/}"
+  clientId: "${M2M_AUTH_CLIENT_ID:-dummy}"
+  clientSecret: "${M2M_AUTH_CLIENT_SECRET:-dummy}"
+  audience: "${M2M_AUTH_AUDIENCE:-dummy}"
   m2mAuthDomain: "${M2M_AUTH_DOMAIN:-topcoder-dev.auth0.com}"
   tokenExpireTimeInMinutes: "${M2M_AUTH_TOKEN_EXPIRE_TIME_IN_MINS:-60}"
-  userId: "${M2M_USER_ID:-132457}"
+  auth0ProxyServerUrl: "${M2M_AUTH_PROXY_SEREVR_URL:-dummy}"
 
 # use the simple server factory if you only want to run on a single port
 #server: