Skip to content
This repository has been archived by the owner on Apr 8, 2024. It is now read-only.

Commit

Permalink
Merge pull request #42 from uniquelyparticular/fix/installationMigration
Browse files Browse the repository at this point in the history 
Fix/installation migration
  • Loading branch information
@agrohs
agrohs authored Aug 2, 2019
2 parents 6b974c9 + 2749a4e commit 7664527
Show file tree
Hide file tree
Showing 3 changed files with 151 additions and 96 deletions.
39 changes: 22 additions & 17 deletions src/flags.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,46 @@ const ROLE_ADMIN = 'admin'
const ROLE_AGENT = 'agent'

/** ORDER FLAGS (Commerce Provider) **/
const FLAG_ORDER_HISTORY = 'order_history'
const FLAG_ORDER_DETAILS = 'order_details'
const FLAG_ORDER_FILTER = 'order_filter'
const FLAG_ORDER_PIN = 'order_pin'
const FLAG_ORDER_SORT = 'order_sort'
const FLAG_ORDER_PAYMENT = 'order_payment'
const FLAG_ORDER_REFUND = 'order_refund'
const FLAG_ORDER_CREATE = 'order_create'
const FLAG_ORDER_DUPLICATE = 'order_duplicate'
const FLAG_ORDER_MODIFY = 'order_modify'
const FLAG_ORDERS_LIST = 'orders_list' // FREE
const FLAG_ORDER_DETAILS = 'order_details' // FREE

const FLAG_ORDER_FILTER = 'order_filter' // STARTER
const FLAG_ORDER_PIN = 'order_pin' // STARTER
const FLAG_ORDER_SORT = 'order_sort' // STARTER

const FLAG_ORDER_TIMELINE = 'order_timeline' // PROFESIONAL

const FLAG_ORDER_PAYMENT = 'order_payment' // ENTERPRISE
const FLAG_ORDER_REFUND = 'order_refund' // ENTERPRISE
const FLAG_ORDER_CREATE = 'order_create' // ENTERPRISE
const FLAG_ORDER_DUPLICATE = 'order_duplicate' // ENTERPRISE
const FLAG_ORDER_MODIFY = 'order_modify' // ENTERPRISE

/** PAYMENT FLAGS (Payment or Commerce Provider) **/
const FLAG_PAYMENT_TRANSACTIONS = 'payment_transactions'
const FLAG_PAYMENT_TRANSACTIONS = 'payment_transactions' // PROFESSIONAL
const FLAG_PAYMENT_USER_INTERFACE = 'payment_user_interface' // TODO: implement
const FLAG_PAYMENT_STORED_INTRUMENTS = 'payment_stored_instruments' // TODO: implement

/** SHIPPING FLAGS (Shipping Provider) **/
const FLAG_SHIPPING_STATUS = 'shipping_status'
const FLAG_SHIPPING_LABEL = 'shipping_label' // TODO: implement
const FLAG_SHIPPING_STATUS = 'shipping_status' // PROFESSIONAL
const FLAG_SHIPPING_LABEL = 'shipping_label' // ENTERPRISE TODO: implement

/** SEARCH FLAGS (Search or Commerce Provider?) **/
const FLAG_SEARCH_CUSTOMERS = 'search_customers'
const FLAG_SEARCH_PRODUCTS = 'search_products' // TODO: implement
const FLAG_SEARCH_CUSTOMERS = 'search_customers' // STARTER
const FLAG_SEARCH_PRODUCTS = 'search_products' // ENTERPRISE TODO: implement

/** TAX FLAGS (Tax Provider?) **/
const FLAG_TAX_CALCULATOR = 'tax_calculator' // TODO: implement
const FLAG_TAX_CALCULATOR = 'tax_calculator' // ENTERPRISE TODO: implement

module.exports = [
ROLE_ADMIN,
ROLE_AGENT,
FLAG_ORDER_HISTORY,
FLAG_ORDERS_LIST,
FLAG_ORDER_DETAILS,
FLAG_ORDER_FILTER,
FLAG_ORDER_PIN,
FLAG_ORDER_SORT,
FLAG_ORDER_TIMELINE,
FLAG_ORDER_PAYMENT,
FLAG_ORDER_REFUND,
FLAG_ORDER_CREATE,
Expand Down
158 changes: 95 additions & 63 deletions src/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const {
decryptAES,
encryptAES,
cleanProviders,
getFeatureFlags,
getSavedData,
isNewThisPeriod,
saveProviderData,
createUsageRecords
Expand All @@ -23,15 +23,20 @@ const {
const { URL } = require('whatwg-url')
const cors = require('micro-cors')()

const _toJSON = error => {
return !error
const _toJSON = errorObj => {
const formattedError = !errorObj
? ''
: Object.getOwnPropertyNames(error).reduce(
: typeof errorObj === 'string'
? errorObj
: Object.getOwnPropertyNames(errorObj).reduce(
(jsonError, key) => {
return { ...jsonError, [key]: error[key] }
return { ...jsonError, [key]: errorObj[key] }
},
{ type: 'error' }
)
return {
error: formattedError
}
}

process.on('unhandledRejection', (reason, p) => {
Expand All @@ -44,19 +49,31 @@ process.on('unhandledRejection', (reason, p) => {
})

const notAuthorized = async (req, res) =>
send(res, 401, {
error: 'Referer or Origin not whitelisted'
})
send(
res,
401,
_toJSON({
type: 'notAuthorized',
message: 'Referer or Origin not whitelisted'
})
)
const notSupported = async (req, res) =>
send(res, 405, { error: 'Method not supported yet' })
send(
res,
405,
_toJSON({ type: 'notSupported', message: 'Method not supported yet' })
)
const notEncrypted = async (req, res) =>
send(res, 412, { error: 'Payload must contain encrypted body' })
const success = async (req, res, payload) => send(res, 200, payload)
const mocked = async (req, res) =>
success(req, res, {
newThisPeriod: false,
featureFlags: flags
})
send(
res,
412,
_toJSON({
type: 'notEncrypted',
message: 'Payload must contain encrypted body'
})
)
const success = async (req, res, encryptedPayload) =>
send(res, 200, encryptedPayload)

const prepareRegex = string => {
return string
Expand Down Expand Up @@ -116,22 +133,13 @@ const handleAuthorize = (req, res) => {
}
}

const handleError = (req, res, error) => {
console.warn('handleError.error', error)
// const jsonError = _toJSON(error)
// return send(res, error.statusCode || 500, jsonError)
//TODO!!!!!!!!!!!!!!!!!!!!!!
//TEMP!!!!!!!!!!!!!!!!!!!!!: swallow error
return mocked(req, res)
}

const getBody = async (req, res) => {
let rawBody = {}
try {
rawBody = await json(req)
// console.log('rawBody',rawBody)
} catch (error) {
console.error(error)
console.warn('getBody, error', error)
}

if (!rawBody.encrypted) {
Expand All @@ -144,6 +152,7 @@ const getBody = async (req, res) => {
const body = safeParse(
decryptAES(rawBody.encrypted, sharedSecret, initialVector)
)
console.log('body', body)

return { body, initialVector }
}
Expand All @@ -164,65 +173,70 @@ const processPost = async (req, res) => {
}
const { body, initialVector } = decrypted

// console.log('processPost, body',body)
console.log('processPost, body', body)
const { applicationId, collectionId, subscription, tracked } = body // collectionId = org, tracked = agent
// console.log('processPost, applicationId',applicationId)
// console.log('processPost, collectionId',collectionId)
// console.log('processPost, subscription',subscription)
// console.log('processPost, tracked',tracked)
console.log('processPost, applicationId', applicationId)
console.log('processPost, collectionId', collectionId)
console.log('processPost, subscription', subscription)
console.log('processPost, tracked', tracked)
const { items: subscriptionItems } = subscription
// console.log('processPost, subscriptionItems',subscriptionItems)
console.log('processPost, subscriptionItems', subscriptionItems)

if (
!initialVector ||
!applicationId ||
!collectionId ||
!subscription ||
!tracked ||
!subscriptionItems
) {
return send(res, 400, {
applicationId,
collectionId,
subscription,
tracked,
subscriptionItems
})
return send(
res,
400,
_toJSON({
type: 'requiredFields',
method: 'processPost',
fields: {
applicationId,
collectionId,
subscription,
tracked,
subscriptionItems
}
})
)
}

const responses = await Promise.all([
await isNewThisPeriod(applicationId, collectionId, subscription, tracked),
await getFeatureFlags(applicationId, collectionId, subscription)
]).catch(error => handleError(req, res, error))
// console.log('processPost, responses',responses)
await getSavedData(applicationId, collectionId, subscription)
])

const [newThisPeriod, { featureFlags, providers }] = responses
// console.log('processPost, newThisPeriod',newThisPeriod)
// console.log('processPost, featureFlags',providers)
// console.log('processPost, providers',providers)
console.log('processPost, newThisPeriod', newThisPeriod)
console.log('processPost, featureFlags', providers)
console.log('processPost, providers', providers)
const unencrypted = {
newThisPeriod,
featureFlags,
providers: cleanProviders(providers)
}
// console.log('processPost, unencrypted',unencrypted)

const payload = {
const encryptedPayload = {
encrypted: encryptAES(unencrypted, sharedSecret, initialVector)
}
// console.log('processPost, payload',payload)

if (newThisPeriod) {
await createUsageRecords(subscriptionItems).catch(error =>
handleError(req, res, error)
)
return success(req, res, payload)
await createUsageRecords(subscriptionItems)
return success(req, res, encryptedPayload)
} else {
return success(req, res, payload)
return success(req, res, encryptedPayload)
}
} catch (error) {
console.error('Error', error)
const jsonError = _toJSON(error)
return send(res, 500, jsonError)
console.error('processPost, error', error)
return send(res, 500, _toJSON(error))
}
}

Expand All @@ -243,15 +257,34 @@ const processPut = async (req, res) => {
// console.log('processPut, providers', providers)
// console.log('processPut, audit', audit)

if (!applicationId || !collectionId || !providers || !audit) {
return send(res, 400, { applicationId, collectionId, providers, audit })
if (
!initialVector ||
!applicationId ||
!collectionId ||
!providers ||
!audit
) {
return send(
res,
400,
_toJSON({
type: 'requiredFields',
method: 'processPut',
fields: {
applicationId,
collectionId,
providers,
audit
}
})
)
}

await saveProviderData(applicationId, collectionId, providers, audit).catch(
error => handleError(req, res, error)
)

const payload = {
const encryptedPayload = {
encrypted: encryptAES(
{
providers
Expand All @@ -261,19 +294,18 @@ const processPut = async (req, res) => {
)
}

return success(req, res, payload)
return success(req, res, encryptedPayload)
} catch (error) {
console.error('Error', error)
const jsonError = _toJSON(error)
return send(res, 500, jsonError)
console.error('processPut, error', error)
return send(res, 500, _toJSON(error))
}
}

module.exports = cors(
router(
options('/*', processOptions),
post('/*', processPost),
put('/*', processPut),
post('/*', processPost), // track
put('/*', processPut), // save
get('/*', notSupported),
patch('/*', notSupported),
del('/*', notSupported),
Expand Down
Loading

1 comment on commit 7664527

@vercel
Copy link

@vercel vercel bot commented on 7664527 Aug 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully aliased the URL https://demo-stripe-distinct-usage-tracking-ayuj99b48.now.sh to the following aliases:

Please sign in to comment.