feat: Remove unused controllers + add basic auth for actions

build.gradle

@@ -74,22 +74,15 @@ dependencies {
 	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
 	compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
     compile("org.springframework.boot:spring-boot-starter-data-mongodb")
-    compile("org.springframework.boot:spring-boot-starter-mail")
-    compile("org.springframework.boot:spring-boot-starter-thymeleaf")
     compile("org.springframework.boot:spring-boot-starter-security")
     compile("org.springframework.boot:spring-boot-starter-web")
-    compile("org.springframework.security.oauth:spring-security-oauth2")
     compile("com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonModuleVersion}")
     compile("me.ramswaroop.jbot:jbot:${jbotVersion}")
-    compile("io.springfox:springfox-swagger2:${swaggerVersion}")
-    compile("io.springfox:springfox-swagger-ui:${swaggerVersion}")
-    //Just for the login/logout demo START
-    compile("org.webjars:angularjs:1.4.3")
-    compile("org.webjars:jquery:2.1.1")
-    compile("org.webjars:bootstrap:3.2.0")
-    compile("org.webjars:webjars-locator")
+    compile 'com.google.api-client:google-api-client:1.25.0'
 
-	testCompile("org.springframework.boot:spring-boot-starter-test")
+
+
+    testCompile("org.springframework.boot:spring-boot-starter-test")
 	testCompile("org.springframework.security:spring-security-test")
 	testCompile("org.amshove.kluent:kluent:${kluentVersion}")
 	testCompile("com.nhaarman:mockito-kotlin-kt1.1:${mockitoVersion}")

src/main/kotlin/io/saagie/astonparking/AstonParkingApplication.kt

@@ -7,11 +7,6 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.scheduling.annotation.EnableAsync
 import org.springframework.scheduling.annotation.EnableScheduling
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
-import springfox.documentation.builders.PathSelectors
-import springfox.documentation.builders.RequestHandlerSelectors
-import springfox.documentation.spi.DocumentationType
-import springfox.documentation.spring.web.plugins.Docket
-import springfox.documentation.swagger2.annotations.EnableSwagger2
 import java.util.concurrent.Executor
 
 
@@ -33,19 +28,6 @@ class AstonParkingApplication {
 
 }
 
-@Configuration
-@EnableSwagger2
-class SwaggerConfig {
-    @Bean
-    fun api(): Docket {
-        return Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .apis(RequestHandlerSelectors.any())
-                .paths(PathSelectors.any())
-                .build();
-    }
-}
-
 fun main(args: Array<String>) {
     SpringApplication.run(AstonParkingApplication::class.java, *args)
 }

src/main/kotlin/io/saagie/astonparking/domain/User.kt

@@ -9,15 +9,9 @@ data class User(
         @JsonIgnore @Id val id: String?,
         val username: String,
         var email: String? = null,
-        var image_24: String? = null,
-        var image_32: String? = null,
-        var image_48: String? = null,
-        var image_72: String? = null,
-        var image_192: String? = null,
-        var image_512: String? = null,
         var creationDate: Date = Date.from(Instant.now()),
         var attribution: Int = 0,
-        var enable: Boolean = false,
+        var enable: Boolean = true,
         var activated: Boolean = false,
         var alreadySelected: Boolean = false,
         var hasFixedSpot: Boolean = false,

src/main/kotlin/io/saagie/astonparking/googleActions/Actions.kt

@@ -4,22 +4,22 @@ import com.google.actions.api.ActionRequest
 import com.google.actions.api.ActionResponse
 import com.google.actions.api.DialogflowApp
 import com.google.actions.api.ForIntent
-import io.saagie.astonparking.domain.Schedule
-import io.saagie.astonparking.domain.ScheduleSpot
+import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken
 import io.saagie.astonparking.service.DrawService
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
 import java.time.LocalDate
-import java.time.LocalDateTime
+
+
 
 @Component
 class Actions(private val drawService: DrawService) : DialogflowApp() {
-    
+
     @ForIntent("today spots")
     fun todaySpots(request: ActionRequest): ActionResponse {
         LOGGER.info("today spots.")
         val responseBuilder = getResponseBuilder(request)
-        with(drawService.getCurrentSchedules().firstOrNull { it.date == LocalDate.now() }) {
+        with(drawService.getSchedule(LocalDate.now())) {
             if (this == null) {
                 responseBuilder.add("No spots attributed today.")
             } else {
@@ -32,6 +32,7 @@ class Actions(private val drawService: DrawService) : DialogflowApp() {
                 ).joinToString(" ")
                 responseBuilder.add(message)
             }
+            responseBuilder.endConversation();
             return responseBuilder.build()
         }
     }
@@ -40,7 +41,7 @@ class Actions(private val drawService: DrawService) : DialogflowApp() {
     fun todayFreeSpots(request: ActionRequest): ActionResponse {
         LOGGER.info("today free spots.")
         val responseBuilder = getResponseBuilder(request)
-        with(drawService.getCurrentSchedules().firstOrNull { it.date == LocalDate.now() }) {
+        with(drawService.getSchedule(LocalDate.now())) {
             if (this == null) {
                 responseBuilder.add("No spots attributed today.")
             } else {
@@ -53,7 +54,7 @@ class Actions(private val drawService: DrawService) : DialogflowApp() {
                     responseBuilder.add(message)
                 }
             }
-
+            responseBuilder.endConversation();
             return responseBuilder.build()
         }
     }
@@ -63,7 +64,7 @@ class Actions(private val drawService: DrawService) : DialogflowApp() {
         LOGGER.info("today spot.")
         val responseBuilder = getResponseBuilder(request)
         val usernameParam = request.getParameter("username") as String
-        with(drawService.getCurrentSchedules().firstOrNull { it.date == LocalDate.now() }) {
+        with(drawService.getSchedule(LocalDate.now())) {
             if (this == null) {
                 responseBuilder.add("No spots attributed today.")
             } else {
@@ -76,10 +77,10 @@ class Actions(private val drawService: DrawService) : DialogflowApp() {
                     responseBuilder.add(message)
                 }
             }
+            responseBuilder.endConversation();
             return responseBuilder.build()
         }
     }
-
     companion object {
 
         private val LOGGER = LoggerFactory.getLogger(Actions::class.java)

src/main/kotlin/io/saagie/astonparking/googleActions/ActionsController.kt

@@ -37,16 +37,6 @@ class ActionsServlet(private val actionsApp: Actions) : HttpServlet() {
 
     }
 
-    @Throws(IOException::class)
-    @GetMapping("/actions")
-    override fun doGet(request: HttpServletRequest, response: HttpServletResponse) {
-        response.contentType = "text/plain"
-        response
-            .writer
-            .println(
-                "ActionsServlet is listening but requires valid POST request to respond with Action response.")
-    }
-
     private fun writeResponse(res: HttpServletResponse, asJson: String) {
         try {
             res.writer.write(asJson)