Merge pull request #125 from topcoder-platform/fix-m2m-env-var

Fix m2m env var

Author: sushilshinde

.circleci/config.yml

@@ -77,6 +77,7 @@ workflows:
             branches:
               only:
                 - dev
+                - fix-m2m-env-var
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

build.sh

@@ -5,7 +5,17 @@ UPDATE_CACHE=""
 
 docker build -f docker/Dockerfile -t $APP_NAME:latest \
 --build-arg APPMODE=$APPMODE \
---build-arg APPENV=$APPENV .
+--build-arg APPENV=$APPENV \
+--build-arg RECRUIT_API=$RECRUIT_API \
+--build-arg AUTH_SECRET=$AUTH_SECRET \
+--build-arg VALID_ISSUERS=$VALID_ISSUERS \
+--build-arg AUTH0_URL=$AUTH0_URL \
+--build-arg AUTH0_AUDIENCE=$AUTH0_AUDIENCE \
+--build-arg AUTH0_CLIENT_ID=$AUTH0_CLIENT_ID \
+--build-arg AUTH0_CLIENT_SECRET=$AUTH0_CLIENT_SECRET \
+--build-arg AUTH0_PROXY_SERVER_URL=$AUTH0_PROXY_SERVER_URL \
+--build-arg M2M_AUDIT_USER_ID=$M2M_AUDIT_USER_ID \
+--build-arg M2M_AUDIT_HANDLE=$M2M_AUDIT_HANDLE .
 
 docker create --name app $APP_NAME:latest
 

config/default.js

@@ -12,37 +12,34 @@ module.exports = {
     COMMUNITY_APP: "https://community-app.topcoder-dev.com",
     PLATFORM_WEBSITE_URL: "https://platform.topcoder-dev.com",
   },
-  RECRUIT_API: process.env.RECRUIT_API || "https://www.topcoder-dev.com",
+  RECRUIT_API: process.env.RECRUIT_API,
   // the server api base path
   API_BASE_PATH: process.env.API_BASE_PATH || "/earn-app/api/my-gigs",
   // the log level, default is 'debug'
   LOG_LEVEL: process.env.LOG_LEVEL || "debug",
   // The authorization secret used during token verification.
   AUTH_SECRET:
-    process.env.AUTH_SECRET ||
-    "UgL4(SEAM*~yc7L~vWrKKN&GHrwyc9N[@nVxm,X?#b4}7:xbzM",
+    process.env.AUTH_SECRET,
   // The valid issuer of tokens, a json array contains valid issuer.
   VALID_ISSUERS:
-    process.env.VALID_ISSUERS ||
-    '["https://api.topcoder-dev.com", "https://api.topcoder.com", "https://topcoder-dev.auth0.com/", "https://auth.topcoder-dev.com/"]',
+    process.env.VALID_ISSUERS,
   // Auth0 URL, used to get TC M2M token
   AUTH0_URL:
-    process.env.AUTH0_URL || "https://topcoder-dev.auth0.com/oauth/token",
+    process.env.AUTH0_URL,
   // Auth0 audience, used to get TC M2M token
-  AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE || "https://m2m.topcoder-dev.com/",
+  AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE,
   // Auth0 client id, used to get TC M2M token
   AUTH0_CLIENT_ID:
-    process.env.AUTH0_CLIENT_ID || "gZ6jt50HYHLBf4vhxjUhXPZOR7Q5lk4k",
+    process.env.AUTH0_CLIENT_ID,
   // Auth0 client secret, used to get TC M2M token
   AUTH0_CLIENT_SECRET:
-    process.env.AUTH0_CLIENT_SECRET ||
-    "zb-OV1Rl3QpUkt4BexJ-Rs58jYMazCre1_97aU4PJIvQdVB-DmQIs61W3gCfPyP4",
+    process.env.AUTH0_CLIENT_SECRET,
   // Proxy Auth0 URL, used to get TC M2M token
   AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL,
   m2m: {
     M2M_AUDIT_USER_ID:
-      process.env.M2M_AUDIT_USER_ID || "00000000-0000-0000-0000-000000000000",
-    M2M_AUDIT_HANDLE: process.env.M2M_AUDIT_HANDLE || "TopcoderService",
+      process.env.M2M_AUDIT_USER_ID ,
+    M2M_AUDIT_HANDLE: process.env.M2M_AUDIT_HANDLE,
   },
   MOCK_API_PORT: process.env.MOCK_API_PORT || 4000,
   ALLOWED_FILE_TYPES: process.env.ALLOWED_FILE_TYPES || [

docker/Dockerfile

@@ -3,9 +3,29 @@ FROM node:10.22.1
 
 ARG APPMODE
 ARG APPENV
+ARG RECRUIT_API
+ARG AUTH_SECRET
+ARG VALID_ISSUERS
+ARG AUTH0_URL
+ARG AUTH0_AUDIENCE
+ARG AUTH0_CLIENT_ID
+ARG AUTH0_CLIENT_SECRET
+ARG AUTH0_PROXY_SERVER_URL
+ARG M2M_AUDIT_USER_ID
+ARG M2M_AUDIT_HANDLE
 
 ENV APPMODE=$APPMODE
 ENV APPENV=$APPENV
+ENV RECRUIT_API=$RECRUIT_API
+ENV AUTH_SECRET=$AUTH_SECRET
+ENV VALID_ISSUERS=$VALID_ISSUERS
+ENV AUTH0_URL=$AUTH0_URL
+ENV AUTH0_AUDIENCE=$AUTH0_AUDIENCE
+ENV AUTH0_CLIENT_ID=$AUTH0_CLIENT_ID
+ENV AUTH0_CLIENT_SECRET=$AUTH0_CLIENT_SECRET
+ENV AUTH0_PROXY_SERVER_URL=$AUTH0_PROXY_SERVER_URL
+ENV M2M_AUDIT_USER_ID=$M2M_AUDIT_USER_ID
+ENV M2M_AUDIT_HANDLE=$M2M_AUDIT_HANDLE
 
 # Copy the current directory into the Docker image
 COPY . /micro-frontends-earn-app