Supporting Release for Connect 2.4.8

.circleci/config.yml

@@ -76,7 +76,7 @@ workflows:
             - test
           filters:
             branches:
-              only: ['dev', 'feature/auth0-proxy-server']
+              only: ['dev']
       - deployProd:
           requires:
             - test

config/custom-environment-variables.json

@@ -47,5 +47,9 @@
   "AUTH0_AUDIENCE": "AUTH0_AUDIENCE",
   "TOKEN_CACHE_TIME" : "TOKEN_CACHE_TIME",
   "whitelistedOriginsForUserIdAuth": "WHITELISTED_ORIGINS_FOR_USERID_AUTH",
-  "AUTH0_PROXY_SERVER_URL" : "AUTH0_PROXY_SERVER_URL"
+  "AUTH0_PROXY_SERVER_URL" : "AUTH0_PROXY_SERVER_URL",
+  "connectUrl": "CONNECT_URL",
+  "accountsAppUrl": "ACCOUNTS_APP_URL",
+  "inviteEmailSubject": "INVITE_EMAIL_SUBJECT",
+  "inviteEmailSectionTitle": "INVITE_EMAIL_SECTION_TITLE"
 }

config/default.json

@@ -51,5 +51,12 @@
   "AUTH0_URL": "",
   "TOKEN_CACHE_TIME": "",
   "whitelistedOriginsForUserIdAuth": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
-  "AUTH0_PROXY_SERVER_URL" : ""
+  "AUTH0_PROXY_SERVER_URL" : "",
+  "EMAIL_INVITE_FROM_NAME":"Topcoder",
+  "EMAIL_INVITE_FROM_EMAIL":"noreply@connect.topcoder.com",
+  "inviteEmailSubject": "You are invited to Topcoder",
+  "inviteEmailSectionTitle": "Project Invitation",
+  "connectUrl":"https://connect.topcoder-dev.com",
+  "accountsAppUrl": "https://accounts.topcoder-dev.com"
+
 }

deploy.sh

@@ -152,6 +152,14 @@ make_task_def(){
           "name": "CONNECT_PROJECTS_URL",
           "value": "%s"
         },
+        {
+          "name": "CONNECT_URL",
+          "value": "%s"
+        },
+        {
+          "name": "ACCOUNTS_APP_URL",
+          "value": "%s"
+        },
         {
           "name": "SEGMENT_ANALYTICS_KEY",
           "value": "%s"
@@ -195,6 +203,22 @@ make_task_def(){
         {
           "name": "AUTH0_PROXY_SERVER_URL",
           "value": "%s"
+        },
+        {
+          "name": "EMAIL_INVITE_FROM_NAME",
+          "value": "%s"
+        },
+        {
+          "name": "EMAIL_INVITE_FROM_EMAIL",
+          "value": "%s"
+        },
+        {
+          "name": "INVITE_EMAIL_SUBJECT",
+          "value": "%s"
+        },
+        {
+          "name": "INVITE_EMAIL_SECTION_TITLE",
+          "value": "%s"
         }
       ],
       "portMappings": [
@@ -230,6 +254,8 @@ make_task_def(){
   DIRECT_PROJECT_SERVICE_ENDPOINT=$(eval "echo \$${ENV}_DIRECT_PROJECT_SERVICE_ENDPOINT")
   FILE_SERVICE_ENDPOINT=$(eval "echo \$${ENV}_FILE_SERVICE_ENDPOINT")
   CONNECT_PROJECTS_URL=$(eval "echo \$${ENV}_CONNECT_PROJECTS_URL")
+  CONNECT_URL=$(eval "echo \$${ENV}_CONNECT_URL")
+  ACCOUNTS_APP_URL=$(eval "echo \$${ENV}_ACCOUNTS_APP_URL")
   SEGMENT_ANALYTICS_KEY=$(eval "echo \$${ENV}_SEGMENT_ANALYTICS_KEY")
   MESSAGE_SERVICE_URL=$(eval "echo \$${ENV}_MESSAGE_SERVICE_URL")
   if [ "$ENV" = "PROD" ]; then
@@ -250,11 +276,14 @@ make_task_def(){
   KAFKA_CLIENT_CERT_KEY=$(eval "echo \$${ENV}_KAFKA_CLIENT_CERT_KEY")
   KAFKA_GROUP_ID=$(eval "echo \$${ENV}_KAFKA_GROUP_ID")
   KAFKA_URL=$(eval "echo \$${ENV}_KAFKA_URL")
-  AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL")
 
   AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL")
+  EMAIL_INVITE_FROM_NAME=$(eval "echo \$${ENV}_EMAIL_INVITE_FROM_NAME")
+  EMAIL_INVITE_FROM_EMAIL=$(eval "echo \$${ENV}_EMAIL_INVITE_FROM_EMAIL")
+  INVITE_EMAIL_SUBJECT=$(eval "echo \$${ENV}_INVITE_EMAIL_SUBJECT")
+  INVITE_EMAIL_SECTION_TITLE=$(eval "echo \$${ENV}_INVITE_EMAIL_SECTION_TITLE")
 
-  task_def=$(printf "$task_template" $1 $ACCOUNT_ID $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $2 $3 $4 $NODE_ENV $ENABLE_FILE_UPLOAD $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL "$AUTH0_PROXY_SERVER_URL" $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
+  task_def=$(printf "$task_template" $1 $ACCOUNT_ID $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $2 $3 $4 $NODE_ENV $ENABLE_FILE_UPLOAD $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $CONNECT_URL $ACCOUNTS_APP_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL "$AUTH0_PROXY_SERVER_URL" "$EMAIL_INVITE_FROM_NAME" "$EMAIL_INVITE_FROM_EMAIL" "$INVITE_EMAIL_SUBJECT" "$INVITE_EMAIL_SECTION_TITLE" $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
 }
 
 push_ecr_image(){

local/mock-services/server.js

@@ -14,6 +14,7 @@ const middlewares = jsonServer.defaults();
 const authMiddleware = require('./authMiddleware');
 
 const members = require('./services.json').members;
+const roles = require('./services.json').roles;
 
 server.use(middlewares);
 
@@ -29,7 +30,12 @@ server.get('/v3/members/_search', (req, res) => {
     const ret = {};
     const splitted = single.split(':');
     // if the result can be parsed successfully
-    const parsed = jsprim.parseInteger(splitted[1], { allowTrailing: true, trimWhitespace: true });
+    let parsed = Error();
+    try {
+      parsed = jsprim.parseInteger(splitted[1], { allowTrailing: true, trimWhitespace: true });
+    } catch (e) {
+      // no-empty
+    }
     if (parsed instanceof Error) {
       ret[splitted[0]] = splitted[1];
     } else {
@@ -38,6 +44,7 @@ server.get('/v3/members/_search', (req, res) => {
     return ret;
   });
   const userIds = _.map(criteria, 'userId');
+  const handles = _.map(criteria, 'handle');
   const cloned = _.cloneDeep(members);
   const response = {
     id: 'res1',
@@ -53,13 +60,42 @@ server.get('/v3/members/_search', (req, res) => {
         found = _.pick(found, fields);
       }
       return found;
+    } else if (_.indexOf(handles, single.result.content.handle) > -1) {
+      let found = single.result.content;
+      if (fields.length > 0) {
+        found = _.pick(found, fields);
+      }
+      return found;
     }
     return null;
   }).filter(_.identity);
   response.result.metadata = { totalCount: response.result.content.length };
   res.status(200).json(response);
 });
 
+// add additional search route for project members
+server.get('/roles', (req, res) => {
+  const filter = _.isString(req.query.filter) ?
+    req.query.filter.replace('%2520', ' ').replace('%20', ' ').split('=') : [];
+  const cloned = _.cloneDeep(roles);
+  const response = {
+    id: 'res1',
+    result: {
+      success: true,
+      status: 200,
+    },
+  };
+  const role = filter ? _.find(cloned, (single) => {
+    if (single.userId === filter[1]) {
+      return single.roles;
+    }
+    return null;
+  }) : null;
+
+  response.result.content = role ? role.roles : [];
+  res.status(200).json(response);
+});
+
 server.use(router);
 
 server.listen(PORT, () => {

local/mock-services/services.json

@@ -300,5 +300,13 @@
             },
             "version": "v3"
         }
+    ],
+    "roles": [
+        { "userId": "40051334", "roles": [ { "roleName": "Connect Manager" } ] },
+        { "userId": "40051332", "roles": [ { "roleName": "Connect Copilot" } ] },
+        { "userId": "40051333", "roles": [ { "roleName": "administrator" } ] },
+        { "userId": "40051336", "roles": [ { "roleName": "Connect Admin" }, { "roleName": "Connect Copilot" } ] },
+        { "userId": "40051331", "roles": [ ] },
+        { "userId": "40051335", "roles": [ ] }
     ]
 }

migrations/20181201_create_project_member_invites.sql

@@ -0,0 +1,41 @@
+--
+-- CREATE NEW TABLES:
+--   project_member_invites
+--
+
+--
+-- project_member_invites
+--
+
+CREATE TABLE project_member_invites (
+    id bigint NOT NULL,
+    "projectId" bigint,
+    "userId" bigint,
+    email character varying(255),
+    role character varying(255) NOT NULL,
+    status character varying(255) NOT NULL,
+    "createdAt" timestamp with time zone,
+    "updatedAt" timestamp with time zone,
+    "deletedAt" timestamp with time zone,
+    "createdBy" integer NOT NULL,
+    "updatedBy" integer NOT NULL,
+    "deletedBy" bigint
+);
+
+ALTER TABLE ONLY project_member_invites
+   ADD CONSTRAINT project_member_invites_pkey PRIMARY KEY (id);
+
+CREATE SEQUENCE project_member_invites_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE project_member_invites_id_seq OWNED BY project_member_invites.id;
+
+ALTER TABLE project_member_invites
+    ALTER COLUMN id SET DEFAULT nextval('project_member_invites_id_seq');
+
+ALTER TABLE ONLY project_member_invites
+    ADD CONSTRAINT "project_member_invites_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES projects(id) ON UPDATE CASCADE ON DELETE CASCADE;

migrations/20181226_productTemplates_subCategory.sql

@@ -0,0 +1,14 @@
+--
+-- UPDATE EXISTING TABLES:
+--   product_templates:
+--     added column `subCategory`
+
+--
+-- product_templates
+
+-- Add new column
+ALTER TABLE product_templates ADD COLUMN "subCategory" character varying(45);
+-- Update new column
+UPDATE product_templates SET "subCategory"="category" WHERE "subCategory" is NULL;
+-- Set not null
+ALTER TABLE product_templates ALTER COLUMN "subCategory" SET NOT NULL;