Merge pull request #71 from Algoteers/feature/server-sendgrid

Feature/server sendgrid + Teams 0.0.25
This commit is contained in:
Barry Low authored and GitHub committed 2018-11-09 04:10:20 -08:00
commit 5235f6c65e
11 files changed
+5078 -4772

No files matched your search

+4767 -4767
View File
File diff suppressed because it is too large. Load diff
+3 -3
View File
@@ -23,7 +23,7 @@
"devDependencies": {
"@advancedalgos/events-client": "0.0.2",
"@advancedalgos/key-vault-client": "^0.0.20",
"@advancedalgos/teams-client": "0.0.24",
"@advancedalgos/teams-client": "0.0.25",
"@advancedalgos/users-client": "^0.0.18",
"@advancedalgos/web-components": "0.0.13",
"@babel/core": "^7.1.2",
@@ -90,9 +90,9 @@
"npm": "^6.4.1",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"prop-types": "^15.6.2",
"react": "^16.5.2",
"react": "^16.6.1",
"react-apollo": "^2.2.4",
"react-dom": "^16.5.2",
"react-dom": "^16.6.1",
"react-redux": "^5.1.0",
"react-router-dom": "^4.3.1",
"redux": "^4.0.1",
+7
View File
@@ -14,3 +14,10 @@ AUTH0_AUDIENCE=auth0-audience
AUTH0_ISSUER=auth0-issuer
AACLOUD_ID=aacloud-id
RECAPTCHA=<RECAPTCHA_KEY>
SG_APIKEY=<SENDGRID_API_KEY>
SG_APIKEY_CONTACTS=<SENDGRID_API_KEY_CONTACTS>
SG_SIGNUP_EMAILID=<SENDGRID_SIGNUP_EMAILID>
SG_CONTACT_EMAILID=<SENDGRID_CONTACT_EMAILID>
+5
View File
@@ -3862,6 +3862,11 @@
"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
"integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
},
"lodash.merge": {
"version": "4.6.1",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
"integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ=="
},
"lodash.once": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+1
View File
@@ -36,6 +36,7 @@
"graphql": "^14.0.2",
"graphql-tools": "^4.0.0",
"jwks-rsa": "^1.3.0",
"lodash.merge": "^4.6.1",
"node-fetch": "^2.2.0",
"winston": "^3.1.0"
}
+5 -2
View File
@@ -9,6 +9,8 @@ import axios from 'axios'
import { createTransformedRemoteSchema } from './createRemoteSchema'
import { teams, events } from './links'
import { typeDef as masterSchema } from './schema'
import masterResolvers from './resolvers'
import logger from './logger'
async function getUserId (authId) {
@@ -58,8 +60,9 @@ async function run () {
process.env.KEYVAULT_API_URL,
process.env.KEYVAULT_API_PRESHARED)
var schemas = []
var schemas = [masterSchema]
var resolvers = {}
resolvers = Object.assign(resolvers, masterResolvers)
if (transformedTeamsSchema) {
schemas.push(transformedTeamsSchema)
@@ -154,7 +157,7 @@ async function run () {
schema,
context,
formatError: error => {
logger.error('An error ocurred inside a module: ' + error)
logger.error(`An error ocurred inside a module: ${JSON.stringify(error)}`)
return error
},
formatResponse: response => {
+10
View File
@@ -0,0 +1,10 @@
import merge from 'lodash.merge'
import { SendgridMutations } from './mutation'
const resolvers = {
Mutation: {
...SendgridMutations
}
}
export default resolvers
+3
View File
@@ -0,0 +1,3 @@
import SendgridMutations from './sendgrid'
export { SendgridMutations }
+251
View File
@@ -0,0 +1,251 @@
import axios from 'axios'
import jwt from 'jsonwebtoken'
import { ApolloError } from 'apollo-server-express'
import logger from '../../logger'
const API_KEY = process.env.SG_APIKEY
const API_KEY_CONTACTS = process.env.SG_APIKEY_CONTACTS
const dev = process.env.NODE_ENV === 'development' ? true : false
let origin = 'https://app.advancedalgos.net'
if (dev){
origin = 'http://localhost:3100'
}
export default {
async master_NewsletterSignup(parent, { email }, ctx, info) {
const token = jwt.sign({ email: email }, API_KEY, { expiresIn: '1d' })
let origin = 'https://advancedalgos.net'
const params = '/email-verification?token='
if (dev){
origin = 'http://localhost:4100'
}
const headers = {
'Content-Type': 'application/json',
'Access-Control-Allow-Origin' : origin,
'Access-Control-Allow-Credentials': 'true'
}
const data = JSON.stringify({
"personalizations": [
{
"to": [
{
"email": email
}
],
dynamic_template_data: {
"aaverifylink": origin + params + token,
"subject": 'VERIFY YOUR INTEREST in Advanced Algos'
},
"subject": 'VERIFY YOUR INTEREST in Advanced Algos'
}
],
"from": {
"email": "feedback@advancedalgos.net",
"name": "Advanced Algos Team"
},
"reply_to": {
"email": "feedback@advancedalgos.net",
"name": "Advanced Algos Team"
},
"template_id": process.env.SG_SIGNUP_EMAILID
})
const sendVerify = axios({
method: 'post',
url: 'https://api.sendgrid.com/v3/mail/send',
data: data,
headers:{
'content-type': 'application/json',
'authorization': 'Bearer ' + API_KEY
}
})
.then(function (response) {
logger.info('Sendgrid sendVerify response:')
logger.info(response)
if (response.status >= 200 && response.status < 300) {
return 'SUCCESS'
} else {
throw response.data.errors[0].message
}
})
.catch(function (error) {
logger.error('Sendgrid sendVerify Error:')
logger.error(error)
throw new ApolloError(`Sendgrid sendVerify Error: ${error.response.data.errors[0].message}`, 404)
})
return sendVerify
},
async master_NewsletterSignupVerify(parent, { token }, ctx, info){
let origin = 'https://app.advancedalgos.net'
if (dev){
origin = 'http://localhost:4100'
}
const headers = {
'Content-Type': 'application/json',
'Access-Control-Allow-Origin' : origin,
'Access-Control-Allow-Credentials': 'true'
}
let verifiedToken
try {
verifiedToken = jwt.verify(token, API_KEY, {maxAge: '1d'})
} catch(err) {
logger.error('Sendgrid verifiedToken Error:')
logger.error(err)
if (err.name === 'TokenExpiredError'){
throw new ApolloError('Error: Token Expired. Please resubmit email address.', 400)
} else {
throw new ApolloError(`Error: ${err.message}`, 400)
}
}
logger.info('Sendgrid verifySignup verifiedToken: ')
logger.info(verifiedToken)
const email = verifiedToken.email
const subscribe = axios({
method: 'post',
url: 'https://api.sendgrid.com/v3/contactdb/recipients',
data: [{"email": email}],
headers:{
'content-type': 'application/json',
'authorization': 'Bearer ' + API_KEY_CONTACTS
}
})
.then(response => {
logger.info('Sendgrid verifySignup subscribe: ')
logger.info(response)
const recipients = response.data.persisted_recipients
if (recipients.length > 0 ){
const addToList = axios({
method: 'post',
url: 'https://api.sendgrid.com/v3/contactdb/lists/4068018/recipients/' + recipients[0],
headers:{
'content-type': 'application/json',
'authorization': 'Bearer ' + API_KEY_CONTACTS
}
})
.then(response => {
logger.info('Sendgrid verifySignup addToList: ')
logger.info(response)
if (response.status >= 200 && response.status < 300) {
return 'SUCCESS'
} else {
throw response.data.errors[0].message
}
})
.catch(error => {
logger.error('Sendgrid verifySignUp subscribe Error:')
logger.error(error)
throw `Email SignUp Error: ${error}`
})
return addToList
} else{
return response.data.errors[0].message
}
})
.then(response => {
return response
})
.catch(error => {
logger.error('Sendgrid verifySubscribe Error:')
logger.error(error)
throw new ApolloError(`Sendgrid verifySubscribe Error: ${error.response.data.errors[0].message}`, 404)
})
return subscribe
},
async master_Contact(parent, { email, subject, message, recaptcha }, ctx, info) {
let origin = 'https://advancedalgos.net'
if (dev){
origin = 'http://localhost:4000'
}
const headers = {
'Content-Type': 'application/json',
'Access-Control-Allow-Origin' : origin,
'Access-Control-Allow-Credentials': 'true'
}
const toEmail = 'feedback@advancedalgos.net'
const data = JSON.stringify({
"personalizations": [
{
"to": [
{
"email": email
}
],
dynamic_template_data: {
"aacontactname": name,
"aacontactemail": email,
"aacontactbody": message
},
"subject": `AA Corporate Site Contact - Message from ${name}`
}
],
"from": {
"email": email,
"name": name
},
"reply_to": {
"email": email,
"name": name
},
"template_id": process.env.SG_CONTACT_EMAILID
})
const checkCaptcha = axios({
method: 'post',
url: 'https://www.google.com/recaptcha/api/siteverify',
params: {
secret: process.env.RECAPTCHA,
response: recaptcha
}
})
.then(function (response) {
logger.info(response.data)
if (response.status >= 200 && response.status < 300 && response.data.success) {
context.log('presend SendGrid')
return axios({
method: 'post',
url: 'https://api.sendgrid.com/v3/mail/send',
data: data,
headers:{
'content-type': 'application/json',
'authorization': 'Bearer ' + API_KEY
}
})
.then(function (response) {
logger.info('Sendgrid Contact response: ')
logger.info(response)
if (response.status >= 200 && response.status < 300) {
return `Contact email sent`
} else {
throw response.data.errors[0].message
}
})
.catch(function (error) {
logger.error(`sendgrid Error: ${JSON.stringify(error)}`)
throw `Contact email send error: ${error.response.data.errors[0].message}`
})
}else{
throw response.data
}
})
.then(function(response){
return response
})
.catch(function (error) {
logger.error('Sendgrid Contact RECAPTCHA Error:')
logger.error(error)
throw new ApolloError(`Sendgrid Contact RECAPTCHA Error: ${error.response.data.errors[0].message}`, 404)
})
return checkCaptcha
}
}
+11
View File
@@ -0,0 +1,11 @@
export const typeDef = `
type Mutation {
master_NewsletterSignup(email: String!): String
master_NewsletterSignupVerify(token: String!): String
master_Contact(email: String!, subject: String!, Message: String!, recaptcha: String!): String
}
schema {
mutation: Mutation
}
`
+15
View File
@@ -1,3 +1,18 @@
import fs from 'fs'
import path from 'path'
export const mergeDirectoryModules = dirpath =>
fs
.readdirSync(dirpath, 'utf8')
.filter(filename => !/^[_|index.]/.test(filename))
.reduce(
(acc, filename) => ({
...acc,
...require(path.resolve(dirpath, filename)).default,
}),
{}
)
export const capitalize = (string) => {
return (string).charAt(0).toUpperCase() + (string).slice(1)
}