Merge branch 'develop' into ast-login-fix

Author: luizrrodrigues

.circleci/config.yml

@@ -350,6 +350,7 @@ workflows:
             branches:
               only:                
                 - free
+                - fix-country-setting-page
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -370,8 +371,7 @@ workflows:
           filters: &filters-staging
             branches:
               only:
-                - develop
-                - ast-login-fix
+                - develop                
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

Dockerfile

@@ -64,6 +64,7 @@ ARG TC_M2M_GRANT_TYPE
 ARG TC_M2M_AUTH0_PROXY_SERVER_URL
 ARG TC_M2M_AUTH0_URL
 ARG AUTH_SECRET
+ARG VALID_ISSUERS
 
 ARG COMMUNITY_APP_URL
 ARG GSHEETS_API_KEY
@@ -124,6 +125,7 @@ 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 VALID_ISSUERS=$VALID_ISSUERS
 
 ENV CONTENTFUL_MANAGEMENT_TOKEN=$CONTENTFUL_MANAGEMENT_TOKEN
 ENV CONTENTFUL_EDU_SPACE_ID=$CONTENTFUL_EDU_SPACE_ID

__tests__/shared/components/GUIKit/Datepicker/__snapshots__/index.jsx.snap

@@ -38,6 +38,8 @@ exports[`Default render 1`] = `
     isRTL={false}
     keepFocusOnInput={false}
     keepOpenOnDateSelect={false}
+    maxDate={null}
+    minDate={null}
     monthFormat="MMMM YYYY"
     navNext={
       <IconNext

build.sh

@@ -51,7 +51,8 @@ docker build -t $TAG \
   --build-arg GROWSURF_CAMPAIGN_ID=$GROWSURF_CAMPAIGN_ID \
   --build-arg GSHEETS_API_KEY=$GSHEETS_API_KEY \
   --build-arg OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY \
-  --build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL .
+  --build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL \
+  --build-arg VALID_ISSUERS=$VALID_ISSUERS .
 
 # Copies "node_modules" from the created image, if necessary for caching.
 docker create --name app $TAG

config/custom-environment-variables.js

@@ -83,6 +83,7 @@ module.exports = {
 
     JWT_AUTH: {
       SECRET: 'AUTH_SECRET',
+      AUTH_SECRET: 'AUTH_SECRET',
       VALID_ISSUERS: 'VALID_ISSUERS',
     },
 

config/default.js

@@ -251,8 +251,12 @@ module.exports = {
     RECRUITCRM_API_KEY: '',
     GROWSURF_API_KEY: '',
     SENDGRID_API_KEY: '',
+    JWT_AUTH: {
+      SECRET: 'mysecret',
+      AUTH_SECRET: 'mysecret',
+      VALID_ISSUERS: '["https://api.topcoder-dev.com", "https://api.topcoder.com", "https://topcoder-dev.auth0.com/", "https://auth.topcoder-dev.com/","https://topcoder.auth0.com/","https://auth.topcoder.com/"]',
+    },
   },
-
   GROWSURF_CAMPAIGN_ID: '',
   GROWSURF_COOKIE: '_tc_gigs_ref',
   GROWSURF_COOKIE_SETTINGS: {
@@ -429,5 +433,5 @@ module.exports = {
   OPTIMIZELY: {
     SDK_KEY: '7V4CJhurXT3Y3bnzv1hv1',
   },
-  PLATFORM_SITE_URL: 'https://platform.topcoder.com',
+  PLATFORM_SITE_URL: 'https://platform.topcoder-dev.com',
 };

config/production.js

@@ -214,4 +214,5 @@ module.exports = {
   TC_EDU_SEARCH_PATH: '/search',
   TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
   ENABLE_RECOMMENDER: true,
+  PLATFORM_SITE_URL: 'https://platform.topcoder.com',
 };