Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/controllers/webhooks/webhook-connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if (process.env.NODE_ENV !== 'production') {
require('dotenv').config()
}

import Stripe from '../../../shared/stripe/stripe'
import Stripe from '../../../client/payment/stripe'
import { payoutCreated } from '../../../modules/webhooks/payouts'
import { payoutUpdated } from '../../../modules/webhooks/payouts'
import { payoutFailed } from '../../../modules/webhooks/payouts'
Expand Down
2 changes: 1 addition & 1 deletion src/app/controllers/webhooks/webhook-platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if (process.env.NODE_ENV !== 'production') {
require('dotenv').config()
}

const stripe = require('../../../shared/stripe/stripe')()
const stripe = require('../../../client/payment/stripe').default()
const chargeSucceeded = require('../../../modules/webhooks/chargeSucceeded')
const checkoutSessionCompleted = require('../../../modules/webhooks/checkoutSessionCompleted')
const customerSourceCreated = require('../../../modules/webhooks/customerSourceCreated')
Expand Down
10 changes: 10 additions & 0 deletions src/client/payment/stripe.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import Stripe from 'stripe'

export default (): any => {
const passthroughFetch = (...args: Parameters<typeof fetch>) => fetch(...args)

return new Stripe(process.env.STRIPE_KEY || '', {
httpClient:
process.env.NODE_ENV === 'test' ? Stripe.createFetchHttpClient(passthroughFetch) : undefined
})
}
2 changes: 1 addition & 1 deletion src/modules/orders/orderBuilds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import requestPromise from 'request-promise'
import URLSearchParams from 'url-search-params'
import * as URL from 'url'
import Decimal from 'decimal.js'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()
import Sendmail from '../mail/mail'
import { userCustomerCreate } from '../users/userCustomerCreate'
Expand Down
2 changes: 1 addition & 1 deletion src/modules/orders/orderDetails/orderFetchInvoice.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Stripe from '../../../shared/stripe/stripe'
import Stripe from '../../../client/payment/stripe'
const stripe = Stripe()

export default async function orderFetchInvoice(sourceId: any) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/orders/orderRefund.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import models from '../../models'
import PaymentMail from '../mail/payment'
import requestPromise from 'request-promise'
import { handleAmount } from '../util/handle-amount/handle-amount'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/orders/orderUpdate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import requestPromise from 'request-promise'
import URLSearchParams from 'url-search-params'
import * as URL from 'url'

import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import Stripe from '../../shared/stripe/stripe'
import Stripe from '../../client/payment/stripe'

const stripe = Stripe()
const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/paymentRequests/paymentRequestBuilds.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Models from '../../models'
import createStripe from '../../shared/stripe/stripe'
import createStripe from '../../client/payment/stripe'
import PaymentRequestMail from '../mail/paymentRequest'

const db = Models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/paymentRequests/paymentRequestUpdate.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()
import Models from '../../models'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import requestPromise from 'request-promise'
import stripe from '../../shared/stripe/stripe'
import stripe from '../../client/payment/stripe'
import models from '../../models'

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/payouts/payoutRequest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import Stripe from '../../shared/stripe/stripe'
import Stripe from '../../client/payment/stripe'
import { handleAmount } from '../util/handle-amount/handle-amount'

const stripe = Stripe()
Expand Down
2 changes: 1 addition & 1 deletion src/modules/tasks/taskPayment.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import models from '../../models'
import TransferMail from '../mail/transfer'

import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/tasks/taskTransfer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/tasks/taskUpdate.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import models from '../../models'
import AssignMail from '../mail/assign'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()
import DeadlineMail from '../mail/deadline'
import { assignExists as assignExist } from '../assigns'
Expand Down
2 changes: 1 addition & 1 deletion src/modules/transfers/transferBuilds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import models from '../../models'

const currentModels = models as any
import requestPromise from 'request-promise'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()
import TransferMail from '../mail/transfer'

Expand Down
2 changes: 1 addition & 1 deletion src/modules/transfers/transferFetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import models from '../../models'

const currentModels = models as any
import requestPromise from 'request-promise'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

export async function transferFetch(id: number) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/transfers/transferUpdate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import models from '../../models'

const currentModels = models as any
import requestPromise from 'request-promise'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()
import TransferMail from '../mail/transfer'

Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userAccount.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userAccountBalance.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

type UserAccountBalanceParams = {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userAccountCountries.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()
import { userAccount as getUserAccount } from './userAccount'

Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userAccountCreate.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userAccountDelete.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userBankAccount.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userBankAccountCreate.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()
import { currencyMap } from '../util/currency-map'

Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userBankAccountUpdate.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userCustomer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userCustomerCreate.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/users/userCustomerUpdate.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import models from '../../models'
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/util/customer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import stripeModule from '../../shared/stripe/stripe'
import stripeModule from '../../client/payment/stripe'
const stripe = stripeModule()
import models from '../../models'

Expand Down
2 changes: 1 addition & 1 deletion src/modules/walletOrders/walletOrderBuilds.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import stripe from '../../shared/stripe/stripe'
import stripe from '../../client/payment/stripe'
import models from '../../models'
import { createOrUpdateCustomer } from '../util/customer'

Expand Down
2 changes: 1 addition & 1 deletion src/modules/walletOrders/walletOrderFetch.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import stripe from '../../shared/stripe/stripe'
import stripe from '../../client/payment/stripe'
import models from '../../models'

const currentModels = models as any
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/balanceAvailable.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const i18n = require('i18n')
const moment = require('moment')
const SendMail = require('../mail/mail')
const WalletMail = require('../mail/wallet')
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')

module.exports = async function balanceAvailable(event, req, res) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/chargeFailed.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const i18n = require('i18n')
const moment = require('moment')
const SendMail = require('../mail/mail')
const WalletMail = require('../mail/wallet')
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')

module.exports = async function chargeFailed(event, paid, status, req, res) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-console */
import Stripe from '../../../../shared/stripe/stripe'
import Stripe from '../../../../client/payment/stripe'
import Models from '../../../../models'
import { closeDisputeForPaymentRequest } from '../../../../services/payments/disputes/disputeService'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Stripe from '../../../../shared/stripe/stripe'
import Stripe from '../../../../client/payment/stripe'
import { handleChargeRefundedIssue } from './chargeRefundedIssue'
import { handleChargeRefundedPaymentRequest } from './chargeRefundedPaymentRequest'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Models from '../../../../models'
import PaymentRequestMail from '../../../mail/paymentRequest'
import Stripe from '../../../../shared/stripe/stripe'
import Stripe from '../../../../client/payment/stripe'
import { handleAmount } from '../../../util/handle-amount/handle-amount'

const stripe = Stripe()
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/checkoutSessionCompleted.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
if (process.env.NODE_ENV !== 'production') {
require('dotenv').config()
}
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const models = require('../../models')
const { handleAmount } = require('../util/handle-amount/handle-amount')
const PaymentRequestMail = require('../mail/paymentRequest')
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/customerSourceCreated.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const i18n = require('i18n')
const moment = require('moment')
const SendMail = require('../mail/mail')
const WalletMail = require('../mail/wallet')
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')

module.exports = async function customerSourceCreated(event, req, res) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/invoiceCreated.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const i18n = require('i18n')
const moment = require('moment')
const SendMail = require('../mail/mail')
const WalletMail = require('../mail/wallet')
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')

module.exports = async function invoiceCreated(event, req, res) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/invoiceFinalized.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const i18n = require('i18n')
const moment = require('moment')
const SendMail = require('../mail/mail')
const WalletMail = require('../mail/wallet')
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')

module.exports = async function invoiceFinalized(event, req, res) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/invoicePaid.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const i18n = require('i18n')
const moment = require('moment')
const SendMail = require('../mail/mail')
const WalletMail = require('../mail/wallet')
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')

module.exports = async function invoicePaid(event, req, res) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/invoicePaymentFailed.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const i18n = require('i18n')
const moment = require('moment')
const SendMail = require('../mail/mail')
const WalletMail = require('../mail/wallet')
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')

module.exports = async function invoicePaymentFailed(event, req, res) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/invoicePaymentSucceeded.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const i18n = require('i18n')
const moment = require('moment')
const SendMail = require('../mail/mail')
const WalletMail = require('../mail/wallet')
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')

module.exports = async function invoicePaymentSucceeded(event, req, res) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/webhooks/invoiceUpdated.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const i18n = require('i18n')
const moment = require('moment')
const SendMail = require('../mail/mail')
const WalletMail = require('../mail/wallet')
const stripe = require('../../shared/stripe/stripe')()
const stripe = require('../../client/payment/stripe').default()
const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')

module.exports = async function invoiceUpdated(event, req, res) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Models from '../../../../models'
import i18n from 'i18n'
import SendMail from '../../../mail/mail'
import initStripe from '../../../../shared/stripe/stripe'
import initStripe from '../../../../client/payment/stripe'

const models = Models as any
const stripe = initStripe()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import createStripe from '../../../../shared/stripe/stripe'
import createStripe from '../../../../client/payment/stripe'
import { transferReversedPaymentRequest } from './transferReversedPaymentRequest'
import { transferReversedIssue } from './transferReversedIssue'

Expand Down
2 changes: 1 addition & 1 deletion src/mutations/user/updateUser/updateUserAccount.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Stripe from '../../../shared/stripe/stripe'
import Stripe from '../../../client/payment/stripe'
import { type UserParameters } from './updateUser'

const stripe = Stripe()
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/payouts/payout_sync.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Op } from 'sequelize'
import Models from '../../models'
import Stripe from '../../shared/stripe/stripe'
import Stripe from '../../client/payment/stripe'

const models = Models as any
const stripe = Stripe()
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/reports/revenue-reports/lib/stripe.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import StripeFactory from '../../../../shared/stripe/stripe'
import StripeFactory from '../../../../client/payment/stripe'
import { Charge, Transfer } from './types'

export const stripe: any = StripeFactory()
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const Promise = require('bluebird')
const url = require('url')
const requestPromise = require('request-promise')
const i18n = require('i18n')
const stripe = require('../shared/stripe/stripe')()
const stripe = require('../client/payment/stripe').default()
const SendMail = require('../modules/mail/mail')

i18n.configure({
Expand Down
Loading