Skip to content

Commit

Permalink
Merge pull request #511 from appirio-tech/dev
Browse files Browse the repository at this point in the history
For Prod
  • Loading branch information
ajefts authored Oct 2, 2017
2 parents 329d561 + 61b025c commit 01e459c
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion actions/challengeRegistration.js
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ var sendNotificationEmail = function (api, componentInfo, userId, activeForumCat
if (challengeType === CHALLENGE_TYPE.DEVELOP) {
forumURL = api.config.tcConfig.developForumsUrlPrefix + activeForumCategoryId;
reviewURL = process.env.TC_SOFTWARE_SERVER_NAME + '/review/actions/ViewProjectDetails?pid=' + challengeId;
submitURL = process.env.TC_ACTIVATION_SERVER_NAME + '/challenge-details/' + challengeId + '/submit/?type=develop';
submitURL = process.env.TC_WWW_SERVER_NAME + '/challenge-details/' + challengeId + '/submit/?type=develop';
} else if (challengeType === CHALLENGE_TYPE.DESIGN) {
forumURL = api.config.tcConfig.studioForumsUrlPrefix + activeForumCategoryId;
//submitURL = process.env.TC_STUDIO_SERVER_NAME + '/?module=ViewContestDetails&ct=' + challengeId;
Expand Down
2 changes: 1 addition & 1 deletion actions/memberRegistration.js
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ var registerUser = function (user, api, dbConnectionMap, next) {
},
function (callback) {
var url;
url = process.env.TC_ACTIVATION_SERVER_NAME + '/reg2/activate.action?code=' + activationCode;
url = process.env.TC_ACTIVATION_SERVER_NAME + '?code=' + activationCode + '&retUrl=https://www.topcoder.com/skill-picker';
if (user.regSource && user.regSource.match(/arena/)) {
url += '&destination=http%3A%2F%2Farena.topcoder.com';
}
Expand Down
2 changes: 1 addition & 1 deletion actions/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ function userActivationEmail(api, connection, next) {
toAddress : rs[0].address,
fromAddress : process.env.TC_EMAIL_ACCOUNT,
senderName : activationEmailSenderName,
url : process.env.TC_ACTIVATION_SERVER_NAME + '/reg2/activate.action?code=' + activationCode,
url : process.env.TC_ACTIVATION_SERVER_NAME + '?code=' + activationCode + '&retUrl=https://www.topcoder.com/skill-picker',
userHandle : rs[0].handle
}, 'default');
api.cache.save(cacheKey, currentResendTimes + 1, api.config.tcConfig.userActivationCacheLifeTime,
Expand Down
3 changes: 2 additions & 1 deletion deploy/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ export TC_EMAIL_PASSWORD=tc_public_email
export [email protected]
export TC_EMAIL_TEMPLATE_DIR=mail_templates

export TC_ACTIVATION_SERVER_NAME="https://www.topcoder.com"
export TC_ACTIVATION_SERVER_NAME="https://api.topcoder.com/pub/activation.html"
export TC_WWW_SERVER_NAME="https://www.topcoder.com"
export TC_SOFTWARE_SERVER_NAME="https://www.topcoder.com"

#export DISABLE_CONSOLE_LOG=true
Expand Down
3 changes: 2 additions & 1 deletion deploy/development.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ export TC_EMAIL_PASSWORD=tc_public_email
export [email protected]
export TC_EMAIL_TEMPLATE_DIR=mail_templates

export TC_ACTIVATION_SERVER_NAME="https://www.topcoder.com"
export TC_ACTIVATION_SERVER_NAME="https://api.topcoder.com/pub/activation.html"
export TC_WWW_SERVER_NAME="https://www.topcoder.com"
export TC_SOFTWARE_SERVER_NAME="https://software.topcoder.com"
export TC_FORUMS_SERVER_NAME="http://apps.topcoder.com/forums"

Expand Down
3 changes: 2 additions & 1 deletion deploy/vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export TC_EMAIL_PASSWORD=tc_public_email
export [email protected]
export TC_EMAIL_TEMPLATE_DIR=mail_templates

export TC_ACTIVATION_SERVER_NAME="https://www.topcoder.com"
export TC_ACTIVATION_SERVER_NAME="https://api.topcoder.com/pub/activation.html"
export TC_WWW_SERVER_NAME="https://www.topcoder.com"
export TC_SOFTWARE_SERVER_NAME="https://software.topcoder.com"
export TC_FORUMS_SERVER_NAME="http://apps.topcoder.com/forums"

Expand Down
Binary file removed initializers/.dataAccess.js.swp
Binary file not shown.
2 changes: 1 addition & 1 deletion initializers/v3client.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ function getToken(connection, callback) {
});
}


function urlBase64Decode(str) {
var output = str.replace(/-/g, '+').replace(/_/g, '/');

Expand Down Expand Up @@ -148,7 +149,6 @@ function isTokenExpired(token) {
return !(d.valueOf() > (new Date().valueOf()))
}


/**
* Get IDs of users in the specified group
*
Expand Down
3 changes: 2 additions & 1 deletion local/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ export TC_EMAIL_PASSWORD=tc_public_email
export [email protected]
export TC_EMAIL_TEMPLATE_DIR=mail_templates

export TC_ACTIVATION_SERVER_NAME="https://www.topcoder.com"
export TC_ACTIVATION_SERVER_NAME="https://api.topcoder.com/pub/activation.html"
export TC_WWW_SERVER_NAME="https://www.topcoder.com"
export TC_SOFTWARE_SERVER_NAME="https://software.topcoder.com"
export TC_FORUMS_SERVER_NAME="http://apps.topcoder.com/forums"

Expand Down

0 comments on commit 01e459c

Please sign in to comment.