github-mirrors/odc-analyzer
1
0
Fork 0
mirror of https://github.com/ysoftdevs/odc-analyzer.git synced 2026-01-16 16:47:13 +01:00
Code Issues 2 Packages Projects Releases Wiki Activity

Added support for brand

Browse Source
This commit is contained in:
Šesták Vít
2017-06-21 13:06:35 +02:00
parent b00857368a
commit ffabc8a4e5
27 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/Application.scala
View File

@@ -6,6 +6,7 @@ import com.github.nscala_time.time.Imports._
import com.google.inject.Inject
import com.google.inject.name.Named
import models._
import modules.TemplateCustomization
import play.api.Logger
import play.api.data.Forms._
import play.api.data._
@@ -55,7 +56,8 @@ class Application @Inject() (
libraryTagAssignmentsService: LibraryTagAssignmentsService,
protected val dbConfigProvider: DatabaseConfigProvider,
val messagesApi: MessagesApi,
val env: AuthEnv
val env: AuthEnv,
val templateCustomization: TemplateCustomization
) extends AuthenticatedController with HasDatabaseConfigProvider[models.profile.type]{
import ApplicationFormats._

2
app/controllers/AuthController.scala
View File

@@ -7,6 +7,7 @@ import com.mohiva.play.silhouette.api._
import com.mohiva.play.silhouette.api.util.Clock
import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
import models.User
import modules.TemplateCustomization
import play.api.data.Form
import play.api.data.Forms.{email => _, _}
import play.api.i18n.{Messages, MessagesApi}
@@ -20,6 +21,7 @@ final case class LoginRequest(username: String, password: String, rememberMe: Bo
class AuthController @Inject() (
val messagesApi: MessagesApi,
val env: Environment[User, CookieAuthenticator],
val templateCustomization: TemplateCustomization,
clock: Clock,
credentialsVerificationService: CredentialsVerificationService,
userService: UserService

7
app/controllers/AuthenticatedController.scala
View File

@@ -2,8 +2,10 @@ package controllers
import com.mohiva.play.silhouette.api.Silhouette
import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
import com.typesafe.config.Config
import models.User
import play.api.mvc.{Result, RequestHeader, Results}
import modules.TemplateCustomization
import play.api.mvc.{RequestHeader, Result, Results}
import views.html.DefaultRequest
import scala.concurrent.Future
@@ -19,6 +21,7 @@ trait AuthenticatedControllerLowPriorityImplicits[T, C]{
abstract class AuthenticatedController extends Silhouette[User, CookieAuthenticator] with AuthenticatedControllerLowPriorityImplicits[User, CookieAuthenticator]{
protected implicit def templateCustomization: TemplateCustomization
override protected def onNotAuthenticated(request: RequestHeader): Option[Future[Result]] = Some(Future.successful(Redirect(
routes.AuthController.signIn(request.path+"?"+request.rawQueryString)
@@ -30,4 +33,6 @@ abstract class AuthenticatedController extends Silhouette[User, CookieAuthentica
def AdminAction: SecuredActionBuilder = ???
protected implicit def mainTemplateData: MainTemplateData = MainTemplateData.createMainTemplateData
}

6
app/controllers/DependencyCheckReportsProcessor.scala
View File

@@ -6,7 +6,7 @@ import com.google.inject.name.Named
import com.ysoft.odc.Checks._
import com.ysoft.odc._
import com.ysoft.odc.statistics.FailedProjects
import modules.{LogSmell, LogSmellChecks}
import modules.{LogSmell, LogSmellChecks, TemplateCustomization}
import org.joda.time.DateTimeConstants
import play.api.Logger
import play.api.i18n.{I18nSupport, MessagesApi}
@@ -25,8 +25,10 @@ final class DependencyCheckReportsProcessor @Inject() (
dependencyCheckReportsParser: DependencyCheckReportsParser,
@Named("missing-GAV-exclusions") missingGAVExclusions: MissingGavExclusions,
@Named("log-smells") logSmells: LogSmellChecks,
val messagesApi: MessagesApi
val messagesApi: MessagesApi,
templateCustomization: TemplateCustomization
) extends I18nSupport {
private implicit def mainTemplateData: MainTemplateData = MainTemplateData.createMainTemplateData(templateCustomization)
private def parseDateTime(dt: String): DateTime = {
if(dt.forall(_.isDigit)){

9
app/controllers/MainTemplateData.scala Normal file
View File

@@ -0,0 +1,9 @@
package controllers
import modules.TemplateCustomization
object MainTemplateData{
implicit def createMainTemplateData(implicit templateCustomization: TemplateCustomization): MainTemplateData = MainTemplateData(templateCustomization)
}
case class MainTemplateData(templateCustomization: TemplateCustomization)

4
app/controllers/Notifications.scala
View File

@@ -7,6 +7,7 @@ import com.ysoft.concurrent.FutureLock._
import com.ysoft.odc.statistics.{FailedProjects, LibDepStatistics}
import com.ysoft.odc.{Absolutizer, ArtifactFile, ArtifactItem, SetDiff}
import models.{EmailMessageId, ExportedVulnerability}
import modules.TemplateCustomization
import play.api.i18n.MessagesApi
import play.api.libs.Crypto
import play.api.mvc.Action
@@ -27,7 +28,8 @@ class Notifications @Inject()(
emailExportServiceOption: Option[EmailExportService],
odcService: OdcService,
absolutizer: Absolutizer,
val env: AuthEnv
val env: AuthEnv,
val templateCustomization: TemplateCustomization
)(implicit val messagesApi: MessagesApi, executionContext: ExecutionContext) extends AuthenticatedController {
private val versions = Map[String, Int]()

4
app/controllers/Statistics.scala
View File

@@ -9,6 +9,7 @@ import com.ysoft.odc._
import controllers.DependencyCheckReportsParser.ResultWithSelection
import controllers.api.{ApiConfig, ApiController}
import models.LibraryTag
import modules.TemplateCustomization
import org.joda.time.DateTime
import play.api.i18n.MessagesApi
import play.api.libs.json._
@@ -73,7 +74,8 @@ class Statistics @Inject()(
vulnerabilityNotificationService: VulnerabilityNotificationService,
issueTrackerServiceOption: Option[IssueTrackerService],
protected val apiConfig: ApiConfig,
val env: AuthEnv
val env: AuthEnv,
val templateCustomization: TemplateCustomization
)(implicit val messagesApi: MessagesApi, executionContext: ExecutionContext) extends AuthenticatedController with ApiController {
private val versions = Map[String, Int]()