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
13 changes: 10 additions & 3 deletions lib/api/1.1/northbound/workflows.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ di.annotate(workflowsRouterFactory,
'Http.Services.Api.Workflows',
'Services.Waterline',
'Errors',
'_'
'_',
'Sanitizer'
)
);

Expand All @@ -23,7 +24,8 @@ function workflowsRouterFactory (
workflowApiService,
waterline,
Errors,
_
_,
sanitizer
) {
var router = express.Router();

Expand Down Expand Up @@ -144,7 +146,12 @@ function workflowsRouterFactory (
*/

router.get('/workflows/:instanceId', rest(function (req) {
return waterline.graphobjects.needOne({ instanceId: req.params.instanceId });

return waterline.graphobjects.needOne({ instanceId: req.params.instanceId })
.then(function(graph) {
sanitizer.scrub(graph);
return graph;
});
}));

return router;
Expand Down
7 changes: 6 additions & 1 deletion lib/api/2.0/workflows.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ var workflowApiService = injector.get('Http.Services.Api.Workflows');
var Errors = injector.get('Errors');
var Constants = injector.get('Constants');
var _ = injector.get('_'); // jshint ignore:line
var sanitizer = injector.get('Sanitizer');

/**
* @api {get} /api/2.0/workflows GET /workflows
Expand Down Expand Up @@ -65,7 +66,11 @@ var workflowsPost = controller({success: 201}, function(req) {
*/

var workflowsGetByInstanceId = controller(function(req) {
return workflowApiService.getWorkflowByInstanceId(req.swagger.params.identifier.value);
return workflowApiService.getWorkflowByInstanceId(req.swagger.params.identifier.value)
.then(function(graph) {
sanitizer.scrub(graph);
return graph;
});
});

/**
Expand Down