8000 fix: Always pass request throught parseRequest for raven-node (#1404) · lordnox/sentry-javascript@69bfcf6 · GitHub
[go: up one dir, main page]

Skip to content
This repository was archived by the owner on Jan 8, 2025. It is now read-only.

Commit 69bfcf6

Browse files
authored
fix: Always pass request throught parseRequest for raven-node (getsentry#1404)
1 parent dc96502 commit 69bfcf6

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

packages/raven-node/lib/client.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,22 +248,27 @@ extend(Raven.prototype, {
248248
so we only parse a `req` property if the `request` property is absent/empty (and hence we won't clobber)
249249
parseUser returns a partial kwargs object with a `request` property and possibly a `user` property
250250
*/
251-
kwargs.request = this._createRequestObject(
251+
var request = this._createRequestObject(
252252
globalContext.request,
253253
domainContext.request,
254254
kwargs.request
255255
);
256-
if (Object.keys(kwargs.request).length === 0) {
257-
var req = this._createRequestObject(
256+
delete kwargs.request;
257+
258+
if (Object.keys(request).length === 0) {
259+
request = this._createRequestObject(
258260
globalContext.req,
259261
domainContext.req,
260262
kwargs.req
261263
);
262-
if (Object.keys(req).length > 0) {
263-
var parseUser = Object.keys(kwargs.user).length === 0 ? this.parseUser : false;
264-
extend(kwargs, parsers.parseRequest(req, parseUser));
265-
delete kwargs.req;
266-
}
264+
delete kwargs.req;
265+
}
266+
267+
if (Object.keys(request).length > 0) {
268+
var parseUser = Object.keys(kwargs.user).length === 0 ? this.parseUser : false;
269+
extend(kwargs, parsers.parseRequest(request, parseUser));
270+
} else {
271+
kwargs.request = {};
267272
}
268273

269274
kwargs.modules = utils.getModules();

0 commit comments

Comments
 (0)
0