Skip to content

Revert "MM Submission Page" #3378

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.

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 1 commit into from
Oct 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ install_dependency: &install_dependency
install_deploysuite: &install_deploysuite
name: Installation of install_deploysuite.
command: |
git clone --branch dev_comm https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
cp ./../buildscript/master_deploy.sh .
cp ./../buildscript/buildenv.sh .
cp ./../buildscript/awsconfiguration.sh .
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
command: |
source awsenvconf
source buildenvvar
./master_deploy.sh -d ECS -e PROD -t latest -s beta_communityapp_taskvar, -i communityapp
./master_deploy.sh -d ECS -e PROD -t latest -s beta_communityapp_taskvar -i communityapp

# Build & Deploy against production backend
"build-prod":
Expand Down Expand Up @@ -183,16 +183,13 @@ workflows:
branches:
only:
- hot-fix
- feature-groups-api
# This is beta env for production soft releases
- "build-prod-beta":
context : org-global
filters:
branches:
only:
- develop
- feature-groups-api
- mm-broker-api
# Production builds are exectuted only on tagged commits to the
# master branch.
- "build-prod":
Expand Down
8 changes: 0 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ ARG TC_M2M_CLIENT_SECRET
ARG TC_M2M_AUDIENCE
ARG TC_M2M_GRANT_TYPE

ARG TC_M2M_AUTH0_PROXY_SERVER_URL
ARG TC_M2M_AUTH0_URL
ARG AUTH_SECRET

################################################################################
# Setting of environment variables in the Docker image.

Expand Down Expand Up @@ -97,10 +93,6 @@ ENV TC_M2M_CLIENT_SECRET=$TC_M2M_CLIENT_SECRET
ENV TC_M2M_AUDIENCE=$TC_M2M_AUDIENCE
ENV TC_M2M_GRANT_TYPE=$TC_M2M_GRANT_TYPE

ENV TC_M2M_AUTH0_PROXY_SERVER_URL=$TC_M2M_AUTH0_PROXY_SERVER_URL
ENV TC_M2M_AUTH0_URL=$TC_M2M_AUTH0_URL
ENV AUTH_SECRET=$AUTH_SECRET

ENV CONTENTFUL_MANAGEMENT_TOKEN=$CONTENTFUL_MANAGEMENT_TOKEN
ENV CONTENTFUL_EDU_SPACE_ID=$CONTENTFUL_EDU_SPACE_ID
ENV CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY
Expand Down
3 changes: 0 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ docker build -t $TAG \
--build-arg TC_M2M_CLIENT_ID=$TC_M2M_CLIENT_ID \
--build-arg TC_M2M_CLIENT_SECRET=$TC_M2M_CLIENT_SECRET \
--build-arg TC_M2M_AUDIENCE=$TC_M2M_AUDIENCE \
--build-arg TC_M2M_AUTH0_PROXY_SERVER_URL=$TC_M2M_AUTH0_PROXY_SERVER_URL \
--build-arg TC_M2M_AUTH0_URL=$TC_M2M_AUTH0_URL \
--build-arg AUTH_SECRET=$AUTH_SECRET \
--build-arg TC_M2M_GRANT_TYPE=$TC_M2M_GRANT_TYPE .

# Copies "node_modules" from the created image, if necessary for caching.
Expand Down
7 changes: 0 additions & 7 deletions config/custom-environment-variables.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,11 @@ module.exports = {

OPEN_EXCHANGE_RATES_KEY: 'OPEN_EXCHANGE_RATES_KEY',

JWT_AUTH: {
SECRET: 'AUTH_SECRET',
VALID_ISSUERS: 'VALID_ISSUERS',
},

TC_M2M: {
AUTH0_URL: 'TC_M2M_AUTH0_URL',
CLIENT_ID: 'TC_M2M_CLIENT_ID',
CLIENT_SECRET: 'TC_M2M_CLIENT_SECRET',
AUDIENCE: 'TC_M2M_AUDIENCE',
GRANT_TYPE: 'TC_M2M_GRANT_TYPE',
AUTH0_PROXY_SERVER_URL: 'TC_M2M_AUTH0_PROXY_SERVER_URL',
},
},
};
17 changes: 0 additions & 17 deletions config/default.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
/* 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: {
V2: 'https://api.topcoder-dev.com/v2',
V3: 'https://api.topcoder-dev.com/v3',
V4: 'https://api.topcoder-dev.com/v4',
V5: 'https://api.topcoder-dev.com/v5',
MM_BROKER: '/api',
},

/* Auth0 config */
Expand Down Expand Up @@ -213,29 +210,15 @@ 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: '',
GRANT_TYPE: '',
AUTH0_PROXY_SERVER_URL: '',
},
},

SECONDARY_MENU_FOR_LOGGED_USER: [
{
title: 'Dashboard',
Expand Down
4 changes: 0 additions & 4 deletions config/development.js
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
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',
},
};
1 change: 1 addition & 0 deletions config/production.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
67 changes: 0 additions & 67 deletions docs/postman/TC MM Broker.postman_collection.json

This file was deleted.

19 changes: 0 additions & 19 deletions docs/postman/TC MM Broker.postman_environment.json

This file was deleted.

Loading