Skip to content

Commit ae0b6fe

Browse files
authored
Merge pull request #83 from Moesif/fix-merge-tags
Fix merge tags
2 parents 0a67e4b + 911ae09 commit ae0b6fe

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

lib/governanceRulesManager.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ function recursivelyReplaceValues(tempObjectOrVal, mergeTagValues, ruleVariables
104104

105105
tempString = tempString.replace('{{' + varName + '}}', replacementValue);
106106
});
107+
108+
return tempString;
107109
}
108110

109111
if (isNil(tempObjectOrVal)) {
@@ -142,6 +144,9 @@ function modifyResponseForOneRule(rule, responseHolder, mergeTagValues) {
142144
}
143145

144146
if (rule.block) {
147+
// also need to set this in case it is missing.
148+
// blocked body is always json
149+
responseHolder.headers['Content-Type'] = 'application/json';
145150
// in case of rule block, we replace the status and body.
146151
const ruleResBody = safeGet(rule, 'response.body');
147152
const replacedBody = recursivelyReplaceValues(ruleResBody, mergeTagValues, ruleVariables);
@@ -424,7 +429,10 @@ GovernanceRulesManager.prototype.applyRuleList = function (
424429
);
425430
const mergeTagValues = ruleValuePair && ruleValuePair.values;
426431
try {
427-
return modifyResponseForOneRule(currentRule, prevResponseHolder, mergeTagValues);
432+
self.log('modify file response for one rule, prev responseHolder ', { prevResponseHolder, currentRule, mergeTagValues });
433+
const resultResponseHolder = modifyResponseForOneRule(currentRule, prevResponseHolder, mergeTagValues);
434+
self.log('finished modify response', { resultResponseHolder });
435+
return resultResponseHolder;
428436
} catch (err) {
429437
self.log('error applying rule ' + currentRule._id + ' ' + err.toString());
430438
return prevResponseHolder;

lib/outgoingRecorder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,4 @@ function _createOutgoingRecorder(saveEvent, moesifOptions, logger) {
123123
};
124124
}
125125

126-
module.exports = _createOutgoingRecorder;
126+
module.exports = _createOutgoingRecorder;

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "moesif-nodejs",
3-
"version": "3.5.3",
3+
"version": "3.5.5",
44
"description": "Monitoring agent to log API calls to Moesif for deep API analytics",
55
"main": "lib/index.js",
66
"typings": "dist/index.d.ts",

0 commit comments

Comments
 (0)