Merge branch 'develop'

This merges the 1.3.0 changes

Author: Edholm

.gitignore

@@ -70,6 +70,7 @@ hs_err_pid*
 # Gradle:
 .idea/**/gradle.xml
 .idea/**/libraries
+.gradle
 
 # Mongo Explorer plugin:
 .idea/**/mongoSettings.xml

backend/build.gradle

@@ -19,7 +19,7 @@ buildscript {
 }
 
 plugins {
-  id("org.ajoberstar.grgit") version "2.0.1"
+  id("org.ajoberstar.grgit") version "2.1.0"
   id("net.researchgate.release") version "2.6.0"
 }
 
@@ -43,27 +43,31 @@ repositories {
 
 dependencies {
   compile("com.graphql-java:graphql-spring-boot-starter:4.0.0.M1")
-  compile("com.graphql-java:graphiql-spring-boot-starter:3.10.0")
   compile("com.graphql-java:graphql-java-tools:4.3.0")
+  compile("com.graphql-java:graphql-java:7.0")
   compile("org.springframework.boot:spring-boot-starter-web-services:$springBootVersion")
   compile("org.springframework.boot:spring-boot-starter-logging:$springBootVersion")
   compile("org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion")
   compile("org.springframework.boot:spring-boot-starter-cache:$springBootVersion")
   compile("org.springframework.boot:spring-boot-starter-security:$springBootVersion")
   compile("org.springframework.security:spring-security-jwt:1.0.9.RELEASE")
   compile("org.springframework.security.oauth:spring-security-oauth2:2.2.1.RELEASE")
-  compile("org.springframework.session:spring-session-data-mongodb:2.0.2.RELEASE")
-  compile("org.springframework.session:spring-session-core:2.0.2.RELEASE")
+
+  /* The below is fix for kotlin-reflect in 1.2.20 */
+  compile("org.springframework.data:spring-data-mongodb:2.0.3.RELEASE")
+  compile("org.springframework.data:spring-data-commons:2.0.3.RELEASE")
+
   compile("com.github.ben-manes.caffeine:caffeine:2.+")
-  compile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}")
-  compile("org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}")
-  compile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-  compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
-  compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.3")
-  compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.3")
-  compile("com.googlecode.libphonenumber:libphonenumber:8.4.2")
+  compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.4")
+  compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.4")
+  compile("com.googlecode.libphonenumber:libphonenumber:8.8.10")
   compile("com.google.guava:guava:23.6-jre")
   compile("net.sf.biweekly:biweekly:0.6.1")
+
+  compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
+  compile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
+  compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
+
   testCompile("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
   testCompile("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
   testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")

backend/gradle.properties

@@ -1 +1 @@
-version=1.2.5
+version=1.3.0

backend/src/main/kotlin/rocks/didit/sefilm/Application.kt

@@ -16,37 +16,32 @@ import org.springframework.cache.annotation.EnableCaching
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Primary
 import org.springframework.core.io.ClassPathResource
-import org.springframework.data.mongodb.core.convert.MongoCustomConversions
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
 import org.springframework.scheduling.annotation.EnableAsync
 import org.springframework.scheduling.annotation.EnableScheduling
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
-import org.springframework.session.data.mongo.AbstractMongoSessionConverter
-import org.springframework.session.data.mongo.JdkMongoSessionConverter
-import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession
 import org.springframework.web.client.RestTemplate
 import org.springframework.web.servlet.config.annotation.CorsRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
-import rocks.didit.sefilm.database.ImdbIdConverter
-import rocks.didit.sefilm.database.TmdbIdConverter
 import rocks.didit.sefilm.database.entities.BioBudord
 import rocks.didit.sefilm.database.entities.Location
 import rocks.didit.sefilm.database.repositories.BudordRepository
 import rocks.didit.sefilm.database.repositories.LocationRepository
 import rocks.didit.sefilm.database.repositories.MovieRepository
+import rocks.didit.sefilm.database.repositories.ShowingRepository
+import rocks.didit.sefilm.domain.Base64ID
 import rocks.didit.sefilm.domain.ExternalProviderErrorHandler
 import rocks.didit.sefilm.graphql.GraphqlExceptionHandler
 import rocks.didit.sefilm.services.SFService
+import rocks.didit.sefilm.services.SlugService
 import rocks.didit.sefilm.utils.MovieFilterUtil
+import rocks.didit.sefilm.web.controllers.CalendarController
 import java.math.BigDecimal
-import java.time.Duration
 
 @SpringBootApplication
-@EnableMongoHttpSession(maxInactiveIntervalInSeconds = 172800)  // 48 hours
-//@EnableMongoAuditing // TODO enable when it works together with EnableMongoHttpSession
 @EnableCaching
 @EnableWebSecurity
 @EnableAsync
@@ -59,39 +54,37 @@ class Application {
     const val API_BASE_PATH = "/api"
   }
 
-  @Bean
-  fun mongoSessionConverter(): AbstractMongoSessionConverter = JdkMongoSessionConverter(Duration.ofSeconds(43200))
-
-  @Bean
-  fun customMongoConverters(): MongoCustomConversions {
-    val converters = listOf(ImdbIdConverter(), TmdbIdConverter())
-    return MongoCustomConversions(converters)
-  }
-
   @Bean
   @Primary
-  fun getRestClient(): RestTemplate {
+  fun getRestClient(errorHandler: ExternalProviderErrorHandler): RestTemplate {
     val restClient = RestTemplate()
-    restClient.errorHandler = ExternalProviderErrorHandler()
+    restClient.errorHandler = errorHandler
     return restClient
   }
 
   @Bean
   fun getHttpEntityWithJsonAcceptHeader(): HttpEntity<Void> {
     val httpHeaders = HttpHeaders()
     httpHeaders.accept = listOf(MediaType.APPLICATION_JSON_UTF8)
-    httpHeaders.put("User-Agent", listOf("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36"))
+    httpHeaders.put(
+      "User-Agent",
+      listOf("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36")
+    )
     return HttpEntity(httpHeaders)
   }
 
   @Bean
-  fun corsConfigurer(): WebMvcConfigurer {
+  fun corsConfigurer(properties: Properties): WebMvcConfigurer {
     return object : WebMvcConfigurer {
       override fun addCorsMappings(registry: CorsRegistry) {
-        registry.addMapping("/**")
-          .allowedOrigins("http://localhost:3000", "https://bio.didit.rocks")
-          .allowedMethods("GET", "POST", "PUT", "DELETE", "HEAD")
-          .allowCredentials(true)
+        registry.addMapping("/graphql")
+          .allowedOrigins(properties.baseUrl.frontend, properties.baseUrl.api)
+          .allowedMethods("GET", "POST", "HEAD")
+          .allowCredentials(false)
+        registry.addMapping("${CalendarController.PATH}/**")
+          .allowedOrigins(properties.baseUrl.frontend, properties.baseUrl.api)
+          .allowedMethods("GET", "HEAD")
+          .allowCredentials(false)
       }
     }
   }
@@ -105,6 +98,20 @@ class Application {
     movieRepository.deleteAll(unwantedMovies)
   }
 
+  @Bean
+  fun createSlugsAndWebIds(showingRepository: ShowingRepository, slugService: SlugService) = ApplicationRunner {
+    val showingsWithMissingWebId = showingRepository
+      .findAll()
+      .filter {
+        it.webId == Base64ID.MISSING
+      }
+
+    val updatedShowings = showingsWithMissingWebId.map {
+      it.copy(webId = Base64ID.random(), slug = slugService.generateSlugFor(it))
+    }
+    showingRepository.saveAll(updatedShowings)
+  }
+
   @Bean
   fun trimMovieNames(movieRepository: MovieRepository, titleExtensions: MovieFilterUtil) = ApplicationRunner {
     movieRepository.findAll()
@@ -119,11 +126,15 @@ class Application {
       }
   }
 
+  private data class LocationAliasDTO(val sfId: String, val alias: List<String>)
+
   @Bean
-  fun seedInitialData(locationsRepo: LocationRepository,
-                      budordRepo: BudordRepository,
-                      sfService: SFService,
-                      properties: Properties) = ApplicationRunner {
+  fun seedInitialData(
+    locationsRepo: LocationRepository,
+    budordRepo: BudordRepository,
+    sfService: SFService,
+    properties: Properties
+  ) = ApplicationRunner {
     if (!properties.enableSeeding) {
       log.info("Seeding not enabled, ignoring...")
       return@ApplicationRunner
@@ -142,27 +153,35 @@ class Application {
     val locationsResource = ClassPathResource("seeds/locations.json")
     val locations: List<Location> = objectMapper.readValue(locationsResource.inputStream)
 
-    val cityAlias = properties.defaultCity
-    val locationsFromSF = sfService.getLocationsInCity(cityAlias)
+    val locationNameAliasResource = ClassPathResource("seeds/sf-location-aliases.json")
+    val locationNameAlias: List<LocationAliasDTO> = objectMapper.readValue(locationNameAliasResource.inputStream)
+
+    val defaultCity = properties.defaultCity
+    val locationsFromSF = sfService.getLocationsInCity(properties.defaultCity)
       .map {
-        Location(it.title,
+        Location(
+          it.title,
           it.address.city["alias"],
           it.address.city["name"],
           it.address.streetAddress,
           it.address.postalCode,
           it.address.postalAddress,
           BigDecimal(it.address.coordinates.latitude),
-          BigDecimal(it.address.coordinates.longitude))
+          BigDecimal(it.address.coordinates.longitude),
+          it.ncgId,
+          alias = locationNameAlias.firstOrNull() { alias -> alias.sfId == it.ncgId }?.alias ?: listOf()
+        )
       }
 
     locationsRepo.saveAll(locations)
     log.info("Seeded locations with ${locations.size} values")
 
-    log.info("Seeded ${locationsRepo.saveAll(locationsFromSF).count()} locations from SF for city: $cityAlias")
+    log.info("Seeded ${locationsRepo.saveAll(locationsFromSF).count()} locations from SF for city: $defaultCity")
   }
 
   @Bean
-  fun graphqlExecutionStrategy(graphqlExceptionHandler: GraphqlExceptionHandler) = AsyncExecutionStrategy(graphqlExceptionHandler)
+  fun graphqlExecutionStrategy(graphqlExceptionHandler: GraphqlExceptionHandler) =
+    AsyncExecutionStrategy(graphqlExceptionHandler)
 
   @Bean
   fun graphQLServletObjectMapperConfigurer(): ObjectMapperConfigurer {
@@ -183,8 +202,7 @@ class Application {
   }
 
   @Bean
-  fun schemaParserOptions(objConfigurer: com.coxautodev.graphql.tools.ObjectMapperConfigurer)
-    = SchemaParserOptions
+  fun schemaParserOptions(objConfigurer: com.coxautodev.graphql.tools.ObjectMapperConfigurer) = SchemaParserOptions
     .newOptions()
     .objectMapperConfigurer(objConfigurer)
     .build()

backend/src/main/kotlin/rocks/didit/sefilm/Exceptions.kt

@@ -7,40 +7,54 @@ import rocks.didit.sefilm.domain.UserID
 import java.util.*
 
 @ResponseStatus(HttpStatus.NOT_FOUND)
-class NotFoundException(what: String, userID: UserID? = null, showingId: UUID? = null) : KnownException("Could not find $what", userID, showingId)
+class NotFoundException(what: String, userID: UserID? = null, showingId: UUID? = null) :
+  KnownException("Could not find $what", userID, showingId)
 
 @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
-class MissingPhoneNumberException(userID: UserID) : KnownException("User is missing a phone number", userID)
+class MissingPhoneNumberException(userID: UserID) :
+  KnownException("You are missing a phone number.", userID)
 
 @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
 class MissingParametersException(what: String = "") : KnownException("Some required parameters were missing: " + what)
 
 @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
-class ExternalProviderException(msg: String) : KnownException("Unable to fetch information from external provider: $msg")
+class ExternalProviderException(msg: String) :
+  KnownException("Unable to fetch information from external provider: $msg")
 
 @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
 class MissingAPIKeyException(service: String) : KnownException("The service $service is missing an API key")
 
 @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
-class TicketsAlreadyBoughtException(userID: UserID, showingId: UUID) : KnownException("The action is not allowed since the tickets for this showing is already bought", userID, showingId)
+class TicketsAlreadyBoughtException(userID: UserID, showingId: UUID) :
+  KnownException("The action is not allowed since the tickets for this showing is already bought", userID, showingId)
 
-class TicketAlreadyInUserException(userID: UserID) : KnownException("One or more of your företagsbiljeter is already in use", userID)
+class TicketAlreadyInUserException(userID: UserID) :
+  KnownException("One or more of your företagsbiljeter is already in use", userID)
 
 @ResponseStatus(HttpStatus.BAD_REQUEST)
-class UserAlreadyAttendedException(userID: UserID) : KnownException("The user has already attended this showing", userID)
+class UserAlreadyAttendedException(userID: UserID) :
+  KnownException("The user has already attended this showing", userID)
 
 @ResponseStatus(HttpStatus.BAD_REQUEST)
 class TicketNotFoundException(ticketNumber: TicketNumber) : KnownException("Ticket " + ticketNumber + " not found")
 
 @ResponseStatus(HttpStatus.BAD_REQUEST)
 class DuplicateTicketException(msg: String = "") : KnownException("Found duplicate tickets" + msg)
 
+class TicketAlreadyUsedException(whichTicket: TicketNumber) :
+  KnownException("The ticket $whichTicket has already been used")
+
+class TicketExpiredException(whichTicket: TicketNumber) :
+  KnownException("The ticket $whichTicket has expired or will expire before the showing will be bought")
+
+class TicketInUseException(whichTicket: TicketNumber) :
+  KnownException("The ticket $whichTicket is already in use on a showing and cannot be removed")
+
 @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
 class SfTicketException(msg: String) : KnownException(msg)
 
-@ResponseStatus(HttpStatus.BAD_REQUEST)
-class BadRequestException(msg: String) : KnownException(msg)
-
-open class KnownException(msg: String,
-                          val whichUser: UserID? = null,
-                          val whichShowing: UUID? = null) : RuntimeException(msg)
+open class KnownException(
+  msg: String,
+  val whichUser: UserID? = null,
+  val whichShowing: UUID? = null
+) : RuntimeException(msg)

backend/src/main/kotlin/rocks/didit/sefilm/Extensions.kt

@@ -1,19 +1,19 @@
 package rocks.didit.sefilm
 
+import org.springframework.security.core.Authentication
 import org.springframework.security.core.context.SecurityContextHolder
-import org.springframework.security.oauth2.common.OAuth2AccessToken
 import rocks.didit.sefilm.domain.IMDbID
 import rocks.didit.sefilm.domain.TMDbID
 import rocks.didit.sefilm.domain.UserID
 
 internal fun currentLoggedInUser(): UserID {
-  val principal = SecurityContextHolder.getContext().authentication.principal as OpenIdConnectUserDetails
-  return UserID(principal.userId)
-}
+  val authentication: Authentication? = SecurityContextHolder.getContext().authentication
+  if (authentication?.isAuthenticated != true) {
+    throw IllegalStateException("Cannot get current user if user isn't authenticated")
+  }
 
-internal fun oauthAccessToken(): OAuth2AccessToken {
-  val principal = SecurityContextHolder.getContext().authentication.principal as OpenIdConnectUserDetails
-  return principal.accessToken
+  val principal = authentication.principal as OpenIdConnectUserDetails
+  return UserID(principal.userId)
 }
 
 internal fun String.toImdbId() = IMDbID.valueOf(this)

backend/src/main/kotlin/rocks/didit/sefilm/Properties.kt

@@ -12,7 +12,6 @@ class Properties {
   var defaultCity: String = "GB"
 
   var google = Google()
-  var login = Login()
 
   class Tmdb {
     var apikey: String? = null
@@ -23,15 +22,7 @@ class Properties {
 
   class Google {
     var clientId: String = ""
-    var clientSecret: String = ""
-    var accessTokenUri: String = ""
-    var userAuthorizationUri: String = ""
-    var redirectUri: String = ""
-  }
-
-  class Login {
-    var baseRedirectUri: String = "http://localhost:3000"
-    var defaultRedirectPath: String = "user"
+    var jwkUri: String = ""
   }
 
   class BaseUrl {