Merge branch 'feature/account_verification_status' into feature/profile_nudge

Author: jmgasper

README.md

@@ -28,6 +28,7 @@ The following parameters can be set in config files or in env variables:
 - GROUPS_API_URL: Groups API URL
 - AMAZON.AWS_ACCESS_KEY_ID: The Amazon certificate key to use when connecting. Use local dynamodb you can set fake value
 - AMAZON.AWS_SECRET_ACCESS_KEY: The Amazon certificate access key to use when connecting. Use local dynamodb you can set fake value
+- AMAZON.AWS.SESSION_TOKEN: The user session token, used when developing locally against the TC dev AWS services
 - AMAZON.AWS_REGION: The Amazon certificate region to use when connecting. Use local dynamodb you can set fake value
 - AMAZON.IS_LOCAL_DB: Use Amazon DynamoDB Local or server.
 - AMAZON.DYNAMODB_URL: The local url if using Amazon DynamoDB Local

config/default.js

@@ -32,6 +32,7 @@ module.exports = {
   AMAZON: {
     AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID,
     AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY,
+    AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN,
     AWS_REGION: process.env.AWS_REGION || 'us-east-1',
     IS_LOCAL_DB: process.env.IS_LOCAL_DB ? process.env.IS_LOCAL_DB === 'true' : false,
     DYNAMODB_URL: process.env.DYNAMODB_URL || 'http://localhost:7777',

docs/swagger.yaml

@@ -237,6 +237,7 @@ paths:
             
             + updatedBy - Select the field updatedBy
             
+            + verified - Select the field verified
             
             The following fields are secured, without a valid token will not be in response
             
@@ -1400,6 +1401,8 @@ definitions:
           type: string
       status:
         type: string
+      verified:
+        type: boolean
       addresses:
         type: array
         items:

src/models/Member.js

@@ -30,6 +30,10 @@ const schema = new Schema({
         name: 'email-index'
       }]
   },
+  verified: {
+    type: Boolean,
+    required: false
+  },
   maxRating: {
     type: Object,
     required: false

src/models/index.js

@@ -4,11 +4,19 @@
 
 const config = require('config')
 const dynamoose = require('dynamoose')
+const AWS = require('aws-sdk')
 
 const awsConfig = {
   region: config.AMAZON.AWS_REGION
 }
+//Support AWS session token for local development against dev servers
 if (config.AMAZON.AWS_ACCESS_KEY_ID && config.AMAZON.AWS_SECRET_ACCESS_KEY) {
+  let credentials = new AWS.Credentials(config.AMAZON.AWS_ACCESS_KEY_ID,
+    config.AMAZON.AWS_SECRET_ACCESS_KEY,
+    config.AMAZON.AWS_SESSION_TOKEN)
+    awsConfig.credentials=credentials
+}
+else if (config.AMAZON.AWS_ACCESS_KEY_ID && config.AMAZON.AWS_SECRET_ACCESS_KEY) {
   awsConfig.accessKeyId = config.AMAZON.AWS_ACCESS_KEY_ID
   awsConfig.secretAccessKey = config.AMAZON.AWS_SECRET_ACCESS_KEY
 }

src/services/MemberService.js

@@ -16,7 +16,7 @@ const constants = require('../../app-constants')
 const esClient = helper.getESClient()
 
 const MEMBER_FIELDS = ['userId', 'handle', 'handleLower', 'firstName', 'lastName', 'tracks', 'status',
-  'addresses', 'description', 'email', 'homeCountryCode', 'competitionCountryCode', 'photoURL', 'maxRating',
+  'addresses', 'description', 'email', 'homeCountryCode', 'competitionCountryCode', 'photoURL', 'verified', 'maxRating',
   'createdAt', 'createdBy', 'updatedAt', 'updatedBy', 'emsiSkills']
 
 const INTERNAL_MEMBER_FIELDS = ['newEmail', 'emailVerifyToken', 'emailVerifyTokenDate', 'newEmailVerifyToken',
@@ -235,6 +235,7 @@ updateMember.schema = {
       stateCode: Joi.string().allow(''),
       type: Joi.string()
     })),
+    verified: Joi.bool(),
     homeCountryCode: Joi.string(),
     competitionCountryCode: Joi.string(),
     photoURL: Joi.string().uri().allow('').allow(null),