Skip to content

[PATCH][MASTER]changes to update reg url to new auth0 #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 24, 2020
Merged

[PATCH][MASTER]changes to update reg url to new auth0 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59587c6
changes to update reg url to new auth0
RishiRajSahu Nov 17, 2020
f43d9eb
Merge pull request #206 from topcoder-platform/feature/update_registr…
Nov 19, 2020
6f433a0
Removed caching steps to avoid weird NPM errors
Nov 24, 2020
7dbc0b8
Merge pull request #209 from topcoder-platform/feature/fixing_npm_errors
Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ jobs:
- setup_remote_docker
- run: *install_dependency
- run: *install_deploysuite
- restore_cache: *restore_cache_settings_for_build
- run: *run_build
- save_cache: *save_cache_settings
- deploy:
name: Running Masterscript - deploy tc-notifications-api service
command: |
Expand All @@ -71,9 +69,7 @@ jobs:
- setup_remote_docker
- run: *install_dependency
- run: *install_deploysuite
- restore_cache: *restore_cache_settings_for_build
- run: *run_build
- save_cache: *save_cache_settings
- deploy:
name: Running Masterscript - prod deploy tc-notifications-api service
command: |
Expand Down Expand Up @@ -102,7 +98,7 @@ workflows:
context : org-global
filters:
branches:
only: [dev, 'feature/broadcast2']
only: [dev, 'feature/update_registration_url']
- "build-prod":
context : org-global
filters:
Expand Down
2 changes: 1 addition & 1 deletion connect/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ module.exports = {
DEFAULT_REPLY_EMAIL: process.env.DEFAULT_REPLY_EMAIL,

CONNECT_URL: process.env.CONNECT_URL || 'https://connect.topcoder-dev.com',
ACCOUNTS_APP_URL: process.env.ACCOUNTS_APP_URL || "https://accounts.topcoder-dev.com",
ACCOUNTS_APP_URL: process.env.ACCOUNTS_APP_URL || "https://accounts-auth0.topcoder-dev.com",
TC_CDN_URL: process.env.TC_CDN_URL,
};
2 changes: 1 addition & 1 deletion emails/src/partials/invites.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<tr>
<td class="empty-child-one"></td>
<td class="second-child" align="center">
<a href="{{@root.accountsAppURL}}/member/registration?regSource=tcBusiness">
<a href="{{@root.accountsAppURL}}/?regSource=tcBusiness&retUrl={{@root.connectURL}}">
Register
</a>
</td>
Expand Down