From 66ca4573e5503e9c86501e4fedb721208abf7101 Mon Sep 17 00:00:00 2001 From: To-om Date: Tue, 12 Mar 2019 16:29:34 +0100 Subject: [PATCH] #175 Add missing analyzerId field in json output --- app/org/thp/cortex/controllers/AnalyzerCtrl.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/org/thp/cortex/controllers/AnalyzerCtrl.scala b/app/org/thp/cortex/controllers/AnalyzerCtrl.scala index d79d2db9b..629fbe5bc 100644 --- a/app/org/thp/cortex/controllers/AnalyzerCtrl.scala +++ b/app/org/thp/cortex/controllers/AnalyzerCtrl.scala @@ -39,7 +39,7 @@ class AnalyzerCtrl @Inject() ( def get(analyzerId: String): Action[AnyContent] = authenticated(Roles.read).async { request ⇒ val isAdmin = request.roles.contains(Roles.orgAdmin) workerSrv.getForUser(request.userId, analyzerId) - .map(a => renderer.toOutput(OK, analyzerJson(isAdmin)(a))) + .map(a ⇒ renderer.toOutput(OK, analyzerJson(isAdmin)(a))) } private val emptyAnalyzerDefinitionJson = Json.obj( @@ -66,9 +66,9 @@ class AnalyzerCtrl @Inject() ( private def analyzerJson(isAdmin: Boolean)(analyzer: Worker): JsObject = { if (isAdmin) - analyzer.toJson + ("configuration" → Json.parse(analyzer.configuration())) + analyzer.toJson + ("configuration" → Json.parse(analyzer.configuration())) + ("analyzerDefinitionId" → JsString(analyzer.workerDefinitionId())) else - analyzer.toJson + analyzer.toJson + ("analyzerDefinitionId" → JsString(analyzer.workerDefinitionId())) } def listForType(dataType: String): Action[AnyContent] = authenticated(Roles.read).async { request ⇒