Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Firebase function: Add check if rawBody exist in request #1211

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 13 additions & 9 deletions lib/make-middleware.js
Expand Up @@ -9,12 +9,12 @@ var MulterError = require('./multer-error')
var FileAppender = require('./file-appender')
var removeUploadedFiles = require('./remove-uploaded-files')

function drainStream (stream) {
function drainStream(stream) {
stream.on('readable', stream.read.bind(stream))
}

function makeMiddleware (setup) {
return function multerMiddleware (req, res, next) {
function makeMiddleware(setup) {
return function multerMiddleware(req, res, next) {
if (!is(req, ['multipart'])) return next()

var options = setup()
Expand Down Expand Up @@ -42,7 +42,7 @@ function makeMiddleware (setup) {
var pendingWrites = new Counter()
var uploadedFiles = []

function done (err) {
function done(err) {
if (isDone) return
isDone = true

Expand All @@ -53,16 +53,16 @@ function makeMiddleware (setup) {
onFinished(req, function () { next(err) })
}

function indicateDone () {
function indicateDone() {
if (readFinished && pendingWrites.isZero() && !errorOccured) done()
}

function abortWithError (uploadError) {
function abortWithError(uploadError) {
if (errorOccured) return
errorOccured = true

pendingWrites.onceZero(function () {
function remove (file, cb) {
function remove(file, cb) {
storage._removeFile(req, file, cb)
}

Expand All @@ -75,7 +75,7 @@ function makeMiddleware (setup) {
})
}

function abortWithCode (code, optionalField) {
function abortWithCode(code, optionalField) {
abortWithError(new MulterError(code, optionalField))
}

Expand Down Expand Up @@ -174,7 +174,11 @@ function makeMiddleware (setup) {
indicateDone()
})

req.pipe(busboy)
if (req.rawBody) {
busboy.end(req.rawBody)
} else {
req.pipe(busboy);
}
}
}

Expand Down