Merge pull request #7 from javaBin/bruker-registrering

Bruker registrering

README.md

@@ -11,3 +11,11 @@ To start the application: Go to the backend folder and `gradle app:run` or run i
 
 ### Frontend
 TBD
+
+
+### TODO
+- [ ] Finish workshop endpoint
+- [ ] Add and finish user endpoint
+- [ ] Add and Finish registration endpoint
+- [ ] Add and Finish cancellation endpoint
+- [ ] Finish workshop wizard

backend/.gitignore

@@ -3,3 +3,5 @@
 
 # Ignore Gradle build output directory
 build
+
+.idea/

backend/app/build.gradle.kts

@@ -32,6 +32,7 @@ dependencies {
     val postgres_version = "42.7.1"
     val exposed_version = "0.41.1"
     val h2_version = "2.1.214"
+    val kotlinx_datetime_version = "0.2.1"
 
     // Use the Kotlin JUnit 5 integration.
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
@@ -82,13 +83,17 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
     implementation("com.github.seratch:kotliquery:1.9.0")
 
+    // Datetime
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version")
+
 
     // Database
     // https://mvnrepository.com/artifact/org.flywaydb/flyway-core - database migrations
     implementation("org.flywaydb:flyway-core:$flyway_version")
     implementation("org.flywaydb:flyway-database-postgresql:$flyway_version")
     implementation("org.jetbrains.exposed:exposed-core:$exposed_version")
     implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version")
+    implementation("org.jetbrains.exposed:exposed-java-time:$exposed_version")
     implementation("com.h2database:h2:$h2_version")
     // https://mvnrepository.com/artifact/com.zaxxer/HikariCP - connection pooling
     implementation("com.zaxxer:HikariCP:$hikari_version")

backend/app/src/main/kotlin/backend/App.kt

@@ -5,9 +5,12 @@ import backend.route.adminRoutes
 import backend.route.userRoutes
 import backend.repository.AdminRepository
 import backend.repository.UserRepository
+import backend.repository.WorkshopRepository
+import backend.route.workshopRoute
 import com.inventy.plugins.DatabaseFactory
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
+import io.ktor.server.auth.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
@@ -33,15 +36,23 @@ fun Application.module() {
 fun Application.configureRouting() {
     val userRepository = UserRepository()
     val adminRepository = AdminRepository()
+    val workshopRepository = WorkshopRepository()
 
     install(ContentNegotiation) {
         json()
     }
     routing {
         userRoutes(userRepository)
         adminRoutes(adminRepository, userRepository)
+        workshopRoute(workshopRepository)
         healthz()
 
+        authenticate ("auth0-user") {
+            get("/auth") {
+                call.respondText("Hello, world!")
+            }
+        }
+
         get {
             call.respondText("Hello, world!")
         }

backend/app/src/main/kotlin/backend/config/Auth.kt

@@ -15,12 +15,13 @@ fun Application.configureAuth() {
         val containsAudience = credential.payload.audience.contains(environment.config.property("auth0.audience").getString())
 
         if (containsAudience) {
-            val userRepository = UserRepository()
+            return CustomPrincipal(credential.payload, 1)
+            /*val userRepository = UserRepository()
 
             val subject = credential.payload.subject
             val providerId = subject.split("|")[1]
             val provider = userRepository.findProviderById(providerId) ?: throw Exception("Provider not found")
-            return CustomPrincipal(credential.payload, provider.userId)
+            return CustomPrincipal(credential.payload, provider.userId)*/
         }
 
         return null
@@ -33,7 +34,11 @@ fun Application.configureAuth() {
         .build()
 
     install(Authentication) {
-        jwt("auth0") {
+        jwt("auth0-user") {
+            verifier(jwkProvider, issuer)
+            validate { credential -> validateCreds(credential) }
+        }
+        jwt("auth0-admin") {
             verifier(jwkProvider, issuer)
             validate { credential -> validateCreds(credential) }
         }

backend/app/src/main/kotlin/backend/config/DatabaseFactory.kt

@@ -35,7 +35,7 @@ class DatabaseFactory(
         if (embedded) {
             return HikariDataSource().apply {
                 dataSourceClassName = JdbcDataSource::class.qualifiedName
-                addDataSourceProperty("url", "jdbc:h2:mem:inventy;DB_CLOSE_DELAY=-1")
+                addDataSourceProperty("url", "jdbc:h2:mem:workshop;DB_CLOSE_DELAY=-1")
                 addDataSourceProperty("user", "root")
                 addDataSourceProperty("password", "")
                 maximumPoolSize = 10

backend/app/src/main/kotlin/backend/dto/WorkshopDTO.kt

@@ -3,5 +3,5 @@ package backend.dto
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class WorkshopDTO(val title: String, val teacherName: String)
+data class WorkshopDTO(val title: String, val description: String)
 

backend/app/src/main/kotlin/backend/model/Workshop.kt

@@ -1,3 +1,22 @@
 package backend.model
 
-class Workshop(override val id: Int, val title: String, val teacherName: String) : Model
+import backend.dto.WorkshopDTO
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
+import java.time.Instant
+
+@Serializable
+class Workshop(
+    override val id: Int,
+    val title: String,
+    val description: String,
+    @Contextual
+    val startTime: Instant,
+    @Contextual
+    val endTime: Instant,
+    val capacity: Int
+    ) : Model {
+    constructor(id: Int, title: String, description: String) : this(id, title, description, Instant.now(),  Instant.now(), 30)
+    fun toDTO() = WorkshopDTO(title, description)
+
+}

backend/app/src/main/kotlin/backend/repository/AdminRepository.kt

@@ -8,7 +8,7 @@ class AdminRepository {
     val userMap = TestData.userMap
     val registrationMap = TestData.registrationMap
     val workshopMap = TestData.workshopMap
-
+/*
     fun getWorkshops(): List<AdminWorkshopDTO> {
         return workshopMap.map { workshop ->
             val registrations =
@@ -41,4 +41,5 @@ class AdminRepository {
                 }
         return AdminWorkshopDTO(workshop.title, workshop.teacherName, registrations)
     }
+    */
 }

backend/app/src/main/kotlin/backend/repository/UserOwnedRepository.kt

@@ -0,0 +1,16 @@
+package backend.repository
+
+import backend.config.CustomPrincipal
+import io.ktor.server.auth.*
+
+class UserOwnedRepository {
+    open class UserOwnedRepository(val userId: Long) {
+        companion object {
+            inline fun <T, reified R: UserOwnedRepository> userContext(auth: AuthenticationContext, block: (repository: R) -> T): T {
+                val principal = auth.principal<CustomPrincipal>()
+                val repository = R::class.java.getDeclaredConstructor(Long::class.java).newInstance(principal!!.userId)
+                return block(repository)
+            }
+        }
+    }
+}