Fix email verification urls

Author: ThomasKranitsas

.deploy/docker/Dockerfile.template

@@ -19,6 +19,6 @@ RUN yum install wget -y
 
 RUN wget -O dd-java-agent.jar 'https://search.maven.org/classic/remote_content?g=com.datadoghq&a=dd-java-agent&v=LATEST'
 
-CMD /bin/bash /usr/local/share/sumocollector/collector start && java @ENV_JAVA_PARAMS@ -javaagent:/data/dd-java-agent.jar -Ddd.agent.host="$DD_TRACE_AGENT_HOSTNAME" -Ddd.agent.port=8126 -Ddd.service.name="$DD_SERVICE_NAME" -Ddw.authDomain="$AUTH_DOMAIN" -Ddw.databases[0].password="$OLTP_PW" -Ddw.databases[1].password="$DW_PW" -jar -Ddw.databases[0].url="$OLTP_URL" -Ddw.databases[1].url="$DW_URL" -Ddw.fileServiceDomain="$FILE_SERVICE_DOMAIN" -Ddw.photoURLDomain="$PHOTO_URL_DOMAIN" -Ddw.baseUrl="$BASE_URL" -Ddw.eventBusServiceClientConfig.endpoint="$EVENT_BUS_SERVICE_ENDPOINT" -Ddw.m2mAuthConfig.clientId="$M2M_AUTH_CLIENT_ID"  -Ddw.m2mAuthConfig.clientSecret="$M2M_AUTH_CLIENT_SECRET"  -Ddw.m2mAuthConfig.audience="$M2M_AUTH_AUDIENCE" -Ddw.m2mAuthConfig.m2mAuthDomain="$M2M_AUTH_DOMAIN"  -Ddw.m2mAuthConfig.m2mAuthProxyServerUrl="$M2M_AUTH_PROXY_SEREVR_URL" -Ddw.jestClientConfiguration.elasticSearchUrl="$ELASTIC_SEARCH_URL" -Ddw.jestClientConfiguration.membersIndexName="$MEMBER_ES_INDEX" -Ddw.jestClientConfiguration.membersProfileTypeName="$MEMBER_ES_TYPE_NAME" -Ddw.jestClientConfiguration.membersProfileTraitTypeName="$MEMBER_TRAIT_ES_TYPE_NAME" -Ddw.jestClientConfiguration.awsSigningEnabled="$AWS_SIGNING_ENABLED" -Ddw.jestClientConfiguration.awsRegion="$AWS_REGION" /data/member-microservice.jar server /data/member-service.yaml
+CMD /bin/bash /usr/local/share/sumocollector/collector start && java @ENV_JAVA_PARAMS@ -javaagent:/data/dd-java-agent.jar -Ddd.agent.host="$DD_TRACE_AGENT_HOSTNAME" -Ddd.agent.port=8126 -Ddd.service.name="$DD_SERVICE_NAME" -Ddw.authDomain="$AUTH_DOMAIN" -Ddw.databases[0].password="$OLTP_PW" -Ddw.databases[1].password="$DW_PW" -jar -Ddw.databases[0].url="$OLTP_URL" -Ddw.databases[1].url="$DW_URL" -Ddw.fileServiceDomain="$FILE_SERVICE_DOMAIN" -Ddw.photoURLDomain="$PHOTO_URL_DOMAIN" -Ddw.baseUrl="$BASE_URL" -Ddw.baseApiUrl="$BASE_API_URL" -Ddw.eventBusServiceClientConfig.endpoint="$EVENT_BUS_SERVICE_ENDPOINT" -Ddw.m2mAuthConfig.clientId="$M2M_AUTH_CLIENT_ID"  -Ddw.m2mAuthConfig.clientSecret="$M2M_AUTH_CLIENT_SECRET"  -Ddw.m2mAuthConfig.audience="$M2M_AUTH_AUDIENCE" -Ddw.m2mAuthConfig.m2mAuthDomain="$M2M_AUTH_DOMAIN"  -Ddw.m2mAuthConfig.m2mAuthProxyServerUrl="$M2M_AUTH_PROXY_SEREVR_URL" -Ddw.jestClientConfiguration.elasticSearchUrl="$ELASTIC_SEARCH_URL" -Ddw.jestClientConfiguration.membersIndexName="$MEMBER_ES_INDEX" -Ddw.jestClientConfiguration.membersProfileTypeName="$MEMBER_ES_TYPE_NAME" -Ddw.jestClientConfiguration.membersProfileTraitTypeName="$MEMBER_TRAIT_ES_TYPE_NAME" -Ddw.jestClientConfiguration.awsSigningEnabled="$AWS_SIGNING_ENABLED" -Ddw.jestClientConfiguration.awsRegion="$AWS_REGION" /data/member-microservice.jar server /data/member-service.yaml
 
-EXPOSE 8080 8081 2181 9092
+EXPOSE 8080 8081 2181 9092

local/env.sh

@@ -37,3 +37,4 @@ export CONF_FILENAME="members-es"
 
 
 export BASE_URL="http://local.topcoder-dev.com:3000"
+export BASE_API_URL="https://api.topcoder-dev.com:8080"

service/src/main/java/com/appirio/service/member/manager/MemberProfileManager.java

@@ -387,21 +387,19 @@ private void fireEmailVerificationEvent(AuthUser authUser, MemberProfile profile
         data.put("subject", this.emailVerificationConfig.getSubject());
         data.put("userHandle", authUser.getHandle());
         String verificationAgreeUrl = this.emailVerificationConfig.getVerificationAgreeUrl()
-                .replace("{baseUrl}", this.emailVerificationConfig.getBaseUrl())
                 .replace("{handle}", profile.getHandle())
                 .replace("{token}", profile.getEmailVerifyToken())
                 .replace("{newEmail}", profile.getNewEmail())
                 .replace("{oldEmail}", profile.getEmail())
                 .replace("{jwtToken}", authUser.getToken())
-                .replace("{redirectTo}", successUrl);
+                .replace("{successUrl}", successUrl);
         String verificationDisagreeUrl = this.emailVerificationConfig.getVerificationDisagreeUrl()
-                .replace("{baseUrl}", this.emailVerificationConfig.getBaseUrl())
                 .replace("{handle}", profile.getHandle())
                 .replace("{token}", profile.getEmailVerifyToken())
                 .replace("{newEmail}", profile.getNewEmail())
                 .replace("{oldEmail}", profile.getEmail())
                 .replace("{jwtToken}", authUser.getToken())
-                .replace("{redirectTo}", failUrl);
+                .replace("{failUrl}", failUrl);
         data.put("verificationAgreeUrl", verificationAgreeUrl);
         data.put("verificationDisagreeUrl", verificationDisagreeUrl);
         data.put("verificationToken", profile.getEmailVerifyToken());

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

@@ -183,6 +183,7 @@ eventBusServiceClientConfig:
 #    authToken: "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJkYW5fZGV2ZWxvcGVyIiwiZXhwIjoxNTI4Mzg1ODQ1LCJ1c2VySWQiOiI0MDE1MjkwNSIsImlhdCI6MTUyODM4NTI0NSwiZW1haWwiOiJ0amVmdHMrZGFuX2RldmVsb3BlckB0b3Bjb2Rlci5jb20iLCJqdGkiOiIwODMzMzJkOC04OTRmLTQ2YjEtYmUzZS0zOTAzZTlmYmI1NjIifQ.n6PZ39_BBZlXmO52MwPVBMmXVJYkKFUhZ8inud2ndGQ"
 
 baseUrl: "${BASE_URL}" #http://local.topcoder-dev.com:3000"
+baseApiUrl: "${BASE_API_URL:https://api.topcoder-dev.com}"
 
 m2mAuthConfig:
   clientId: "${M2M_AUTH_CLIENT_ID}"
@@ -194,8 +195,8 @@ m2mAuthConfig:
 
 emailVerificationConfig:
   subject: "Topcoder - Email Change Verification"
-  verificationAgreeUrl: "{baseUrl}/v3/members/{handle}/verify?action=verify&token={jwtToken}&newEmail={newEmail}&oldEmail={oldEmail}&redirectTo={successUrl}"
-  verificationDisagreeUrl: "{baseUrl}/v3/members/{handle}/verify?action=cancel&token={jwtToken}&newEmail={newEmail}&oldEmail={oldEmail}&redirectTo={failUrl}"
+  verificationAgreeUrl: "${baseApiUrl}/v3/members/{handle}/verify?action=verify&token={jwtToken}&newEmail={newEmail}&oldEmail={oldEmail}&redirectTo={successUrl}"
+  verificationDisagreeUrl: "${baseApiUrl}/v3/members/{handle}/verify?action=cancel&token={jwtToken}&newEmail={newEmail}&oldEmail={oldEmail}&redirectTo={failUrl}"
   expireTimeInMinutes: 60
 
 jestClientConfiguration: