Skip to content

bring master up to date #3437

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 9 commits into from
Nov 6, 2019
Merged

bring master up to date #3437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
49ff6a7
Merge pull request #3415 from topcoder-platform/survey_tc
sushilshinde Oct 24, 2019
6620914
fix issue with mm-broker api
Nov 6, 2019
c7dc1fb
fix issue with mm-broker api
Nov 6, 2019
fac4f21
Merge branch 'develop' of github.com:topcoder-platform/community-app …
Nov 6, 2019
03a2a33
fix issue with mm-broker api
Nov 6, 2019
985798c
fix issue with mm-broker api
Nov 6, 2019
8da4313
updated npm version
Nov 6, 2019
1400af0
updated npm version
Nov 6, 2019
6e85c35
Merge pull request #3435 from topcoder-platform/fix-groups-updates
sushilshinde Nov 6, 2019
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
14 changes: 0 additions & 14 deletions config/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* All availalbe configuration options should be documented in the default
* config file, even when they are overriden in every custom configuration. */

const { deferConfig } = require('config/defer');

module.exports = {
/* Configuration of Topcoder APIs. */
API: {
Expand Down Expand Up @@ -213,21 +211,9 @@ module.exports = {

OPEN_EXCHANGE_RATES_KEY: '',

/* Review type ID for AV Scans. */
AV_SCAN_SCORER_REVIEW_TYPE_ID: '',

JWT_AUTH: {
SECRET: '',
VALID_ISSUERS: deferConfig(function d() {
return this.VALID_ISSUERS ? this.VALID_ISSUERS.replace(/\\"/g, '')
: '["https://api.topcoder-dev.com", "https://api.topcoder.com", "https://topcoder-dev.auth0.com/"]';
}),
},

/* These credentials allow Community App server to communicate with
* protected TC API endpoints (on behalf of the app itself). */
TC_M2M: {
AUTH0_URL: '',
CLIENT_ID: '',
CLIENT_SECRET: '',
AUDIENCE: '',
Expand Down
4 changes: 0 additions & 4 deletions config/development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@ module.exports = {
URL: {
USER_SETTINGS: '', /* No dev server is available for saved searches */
},

SECRET: {
AV_SCAN_SCORER_REVIEW_TYPE_ID: '68c5a381-c8ab-48af-92a7-7a869a4ee6c3',
},
};
4 changes: 0 additions & 4 deletions config/production.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,4 @@ module.exports = {
title: 'Switch to BUSINESS',
href: 'https://connect.topcoder.com',
},

SECRET: {
AV_SCAN_SCORER_REVIEW_TYPE_ID: '55bbb17d-aac2-45a6-89c3-a8d102863d05',
},
};
Loading