Commit 6633841d authored by Leonardo Menezes's avatar Leonardo Menezes
Browse files

integrated auth module into all controllers

parent 59b6155e

app/controllers/AliasesController.scala

+5 −1
Original line number Diff line number Diff line 
package controllers



import javax.inject.Inject



import controllers.auth.AuthenticationModule

import models.{Aliases, ElasticServer}

import play.api.libs.json.JsArray



import scala.concurrent.ExecutionContext.Implicits.global



class AliasesController extends BaseController {

class AliasesController @Inject()(val authentication: AuthenticationModule) extends BaseController {



  def getAliases = process { (request, client) =>

    client.getAliases(ElasticServer(request.host, request.authentication)).map { aliases =>

app/controllers/AnalysisController.scala

+4 −1
Original line number Diff line number Diff line 
package controllers



import javax.inject.Inject



import controllers.auth.AuthenticationModule

import models.analysis.{IndexAnalyzers, IndexFields, OpenIndices, Tokens}

import models.ElasticServer



import scala.concurrent.ExecutionContext.Implicits.global



class AnalysisController extends BaseController {

class AnalysisController @Inject()(val authentication: AuthenticationModule) extends BaseController {



  def getIndices = process { (request, client) =>

    client.getIndices(ElasticServer(request.host, request.authentication)).map { response =>

app/controllers/Application.scala

+5 −4
Original line number Diff line number Diff line 
package controllers



import play.api.mvc.{Action, Controller}

import play.api.http.MimeTypes

import com.google.inject.Inject

import controllers.auth.AuthenticationModule

import play.api.mvc.Controller



object Application extends Controller {

class Application @Inject()(val authentication: AuthenticationModule) extends Controller with AuthSupport {



  def index = Action {

  def index = AuthAction(authentication) { request =>

    Ok(views.html.Index())

  }

app/controllers/BaseController.scala

+6 −3
Original line number Diff line number Diff line 
package controllers



import controllers.auth.AuthenticationModule

import elastic.ElasticClient

import exceptions.MissingRequiredParamException

import models.CerebroRequest

import play.api.Logger

import play.api.libs.json.Json

import play.api.mvc.{Action, Controller, Result}

import play.api.mvc.{Controller, Result}



import scala.concurrent.Future

import scala.util.control.NonFatal



trait BaseController extends Controller {

trait BaseController extends Controller with AuthSupport {



  val authentication: AuthenticationModule



  val client: ElasticClient = ElasticClient
@@ -18,7 +21,7 @@ trait BaseController extends Controller { 


  type RequestProcessor = (CerebroRequest, ElasticClient) => Future[Result]



  final def process(processor: RequestProcessor) = Action.async(parse.json) { request =>

  final def process(processor: RequestProcessor) = AuthAction(authentication).async(parse.json) { request =>

    try {

      processor(CerebroRequest(request.body), client)

    } catch {

app/controllers/CatController.scala

+4 −2
Original line number Diff line number Diff line 
package controllers



import models.analysis.{IndexAnalyzers, IndexFields, OpenIndices, Tokens}

import javax.inject.Inject



import controllers.auth.AuthenticationModule

import models.ElasticServer



import scala.concurrent.ExecutionContext.Implicits.global



class CatController extends BaseController {

class CatController @Inject()(val authentication: AuthenticationModule) extends BaseController {



  def get = process { (request, client) =>

    val api = request.get("api")