Design improvements - 1

build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "2.4.5"
+    id("org.springframework.boot") version "2.5.5"
     id("io.spring.dependency-management") version "1.0.11.RELEASE"
     idea
     kotlin("jvm") version "1.4.32"
@@ -20,7 +20,6 @@ repositories {
 }
 
 dependencies {
-    implementation("com.google.guava:guava:30.1.1-jre")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
     implementation("org.springframework.security:spring-security-rsocket")
     implementation("org.springframework.security:spring-security-messaging")

src/main/kotlin/de/thm/mni/ii/classroom/DigitalClassroomApplication.kt

@@ -3,11 +3,13 @@ package de.thm.mni.ii.classroom
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan
 import org.springframework.boot.runApplication
+import reactor.core.publisher.Hooks
 
 @SpringBootApplication
 @ConfigurationPropertiesScan("de.thm.mni.ii.classroom.properties")
 class DigitalClassroomApplication
 
 fun main(args: Array<String>) {
+    Hooks.onErrorDropped {}
     runApplication<DigitalClassroomApplication>(*args)
 }

src/main/kotlin/de/thm/mni/ii/classroom/controller/ClassroomApiController.kt

@@ -1,10 +1,12 @@
 package de.thm.mni.ii.classroom.controller
 
 import de.thm.mni.ii.classroom.model.classroom.User
+import de.thm.mni.ii.classroom.model.classroom.UserCredentials
 import de.thm.mni.ii.classroom.security.exception.UnauthorizedException
 import de.thm.mni.ii.classroom.security.jwt.ClassroomAuthentication
 import de.thm.mni.ii.classroom.security.jwt.ClassroomJwtService
 import de.thm.mni.ii.classroom.security.jwt.ClassroomTokenRepository
+import de.thm.mni.ii.classroom.services.ClassroomInstanceService
 import de.thm.mni.ii.classroom.util.component1
 import de.thm.mni.ii.classroom.util.component2
 import org.apache.commons.lang3.RandomStringUtils
@@ -20,17 +22,17 @@ import org.springframework.web.bind.annotation.ResponseStatus
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.server.ServerWebExchange
 import reactor.core.publisher.Mono
-import reactor.kotlin.core.publisher.switchIfEmpty
 
 @RestController
 @RequestMapping("/classroom-api")
 @CrossOrigin
 class ClassroomApiController(
-    val classroomTokenRepository: ClassroomTokenRepository,
-    val jwtService: ClassroomJwtService
+    private val classroomTokenRepository: ClassroomTokenRepository,
+    private val jwtService: ClassroomJwtService,
+    private val classroomInstanceService: ClassroomInstanceService
 ) {
 
-    private val logger = LoggerFactory.getLogger(this::class.java)
+    private val logger = LoggerFactory.getLogger(ClassroomApiController::class.java)
 
     /**
      * Does not return any value. This route is called with sessionToken, which is exchanged to a JWT
@@ -40,8 +42,11 @@ class ClassroomApiController(
     @GetMapping("/join")
     @ResponseStatus(HttpStatus.NO_CONTENT)
     fun joinClassroom(auth: ClassroomAuthentication, originalExchange: ServerWebExchange): Mono<ServerHttpResponse> {
-        return Mono.just(generateRefreshToken(auth.principal))
-            .map { refreshToken ->
+        return classroomInstanceService.getClassroomInstance(auth.getClassroomId())
+            .doOnNext { classroom ->
+                classroom.savePreAuthUserData(auth.principal as User)
+            }.map {
+                val refreshToken = generateRefreshToken(auth.principal)
                 // Set refresh_token header
                 val refreshTokenSet = setHeader("refresh_token", refreshToken, originalExchange)
                 // Set Authorization header
@@ -60,17 +65,11 @@ class ClassroomApiController(
     ): Mono<ServerHttpResponse> {
         return classroomTokenRepository
             .findRefreshToken(refreshToken)
-            .switchIfEmpty {
-                val ex = UnauthorizedException("Invalid refresh token provided by user ${auth.user?.fullName}")
-                logger.error("", ex)
-                Mono.error(ex)
-            }.filter { user ->
-                user == auth.user
-            }.switchIfEmpty {
-                val ex = UnauthorizedException("Owner of refresh token does not match requester!")
-                logger.error("", ex)
-                Mono.error(ex)
-            }.map { user ->
+            .switchIfEmpty(Mono.error(UnauthorizedException("Invalid refresh token provided by user ${auth.userCredentials?.fullName}")))
+            .filter { user ->
+                user == auth.userCredentials
+            }.switchIfEmpty(Mono.error(UnauthorizedException("Owner of refresh token does not match requester!")))
+            .map { user ->
                 val newRefreshToken = generateRefreshToken(user)
                 Pair(user, setHeader("refresh_token", newRefreshToken, originalExchange))
             }.flatMap { (user, exchange) ->
@@ -82,9 +81,9 @@ class ClassroomApiController(
             }
     }
 
-    private fun generateRefreshToken(user: User): String {
+    private fun generateRefreshToken(userCredentials: UserCredentials): String {
         val newRefreshToken = RandomStringUtils.randomAscii(30)
-        classroomTokenRepository.insertRefreshToken(newRefreshToken, user)
+        classroomTokenRepository.insertRefreshToken(newRefreshToken, userCredentials)
         return newRefreshToken
     }
 

src/main/kotlin/de/thm/mni/ii/classroom/controller/ConferenceController.kt

@@ -3,7 +3,7 @@ package de.thm.mni.ii.classroom.controller
 import de.thm.mni.ii.classroom.event.InvitationEvent
 import de.thm.mni.ii.classroom.model.classroom.ConferenceInfo
 import de.thm.mni.ii.classroom.model.classroom.JoinLink
-import de.thm.mni.ii.classroom.model.classroom.User
+import de.thm.mni.ii.classroom.model.classroom.UserCredentials
 import de.thm.mni.ii.classroom.services.ConferenceService
 import org.springframework.messaging.handler.annotation.MessageMapping
 import org.springframework.messaging.handler.annotation.Payload
@@ -15,32 +15,32 @@ import reactor.core.publisher.Mono
 class ConferenceController(private val conferenceService: ConferenceService) {
 
     @MessageMapping("socket/conference/create")
-    fun createConference(@AuthenticationPrincipal user: User, @Payload conferenceInfo: ConferenceInfo): Mono<ConferenceInfo> {
-        return conferenceService.createConference(user, conferenceInfo)
+    fun createConference(@AuthenticationPrincipal userCredentials: UserCredentials, @Payload conferenceInfo: ConferenceInfo): Mono<ConferenceInfo> {
+        return conferenceService.createConference(userCredentials, conferenceInfo)
     }
 
     @MessageMapping("socket/conference/join")
-    fun joinConference(@AuthenticationPrincipal user: User, @Payload conferenceInfo: ConferenceInfo): Mono<JoinLink> {
-        return conferenceService.joinConference(user, conferenceInfo)
+    fun joinConference(@AuthenticationPrincipal userCredentials: UserCredentials, @Payload conferenceInfo: ConferenceInfo): Mono<JoinLink> {
+        return conferenceService.joinConference(userCredentials, conferenceInfo)
     }
 
     @MessageMapping("socket/conference/join-user")
-    fun joinConferenceOfUser(@AuthenticationPrincipal joiningUser: User, @Payload conferencingUser: User): Mono<JoinLink> {
-        return conferenceService.joinConferenceOfUser(joiningUser, conferencingUser)
+    fun joinConferenceOfUser(@AuthenticationPrincipal joiningUserCredentials: UserCredentials, @Payload conferencingUserCredentials: UserCredentials): Mono<JoinLink> {
+        return conferenceService.joinConferenceOfUser(joiningUserCredentials, conferencingUserCredentials)
     }
 
     @MessageMapping("socket/conference/leave")
-    fun leaveConference(@AuthenticationPrincipal user: User, @Payload conferenceInfo: ConferenceInfo): Mono<Void> {
-        return conferenceService.leaveConference(user, conferenceInfo)
+    fun leaveConference(@AuthenticationPrincipal userCredentials: UserCredentials, @Payload conferenceInfo: ConferenceInfo): Mono<Void> {
+        return conferenceService.leaveConference(userCredentials, conferenceInfo)
     }
 
     @MessageMapping("socket/conference/end")
-    fun endConference(@AuthenticationPrincipal user: User, @Payload conferenceInfo: ConferenceInfo): Mono<Void> {
+    fun endConference(@AuthenticationPrincipal userCredentials: UserCredentials, @Payload conferenceInfo: ConferenceInfo): Mono<Void> {
         TODO("NOT YET IMPLEMENTED")
     }
 
     @MessageMapping("socket/conference/invite")
-    fun inviteToConference(@AuthenticationPrincipal user: User, @Payload invitationEvent: InvitationEvent): Mono<Void> {
-        return conferenceService.forwardInvitation(user, invitationEvent)
+    fun inviteToConference(@AuthenticationPrincipal userCredentials: UserCredentials, @Payload invitationEvent: InvitationEvent): Mono<Void> {
+        return conferenceService.forwardInvitation(userCredentials, invitationEvent)
     }
 }

src/main/kotlin/de/thm/mni/ii/classroom/controller/UserWebSocketController.kt

@@ -5,7 +5,7 @@ import de.thm.mni.ii.classroom.model.classroom.ClassroomInfo
 import de.thm.mni.ii.classroom.model.classroom.ConferenceInfo
 import de.thm.mni.ii.classroom.model.classroom.Ticket
 import de.thm.mni.ii.classroom.model.classroom.User
-import de.thm.mni.ii.classroom.model.classroom.UserDisplay
+import de.thm.mni.ii.classroom.model.classroom.UserCredentials
 import de.thm.mni.ii.classroom.services.ClassroomEventReceiverService
 import de.thm.mni.ii.classroom.services.ClassroomUserService
 import org.springframework.messaging.handler.annotation.MessageMapping
@@ -23,32 +23,32 @@ class UserWebSocketController(
     private val classroomEventReceiverService: ClassroomEventReceiverService
 ) {
     @ConnectMapping
-    fun connect(@AuthenticationPrincipal user: User, requester: RSocketRequester): Mono<Void> {
-        return userService.userConnected(user, requester)
+    fun connect(@AuthenticationPrincipal userCredentials: UserCredentials, requester: RSocketRequester): Mono<Void> {
+        return userService.userConnected(userCredentials, requester)
     }
 
     @MessageMapping("socket/classroom-event")
-    fun receiveEvent(@AuthenticationPrincipal user: User, @Payload event: ClassroomEvent) {
-        classroomEventReceiverService.classroomEventReceived(user, event)
+    fun receiveEvent(@AuthenticationPrincipal userCredentials: UserCredentials, @Payload event: ClassroomEvent) {
+        classroomEventReceiverService.classroomEventReceived(userCredentials, event)
     }
 
     @MessageMapping("socket/init-classroom")
-    fun initClassroom(@AuthenticationPrincipal user: User): Mono<ClassroomInfo> {
-        return userService.getClassroomInfo(user)
+    fun initClassroom(@AuthenticationPrincipal userCredentials: UserCredentials): Mono<ClassroomInfo> {
+        return userService.getClassroomInfo(userCredentials)
     }
 
     @MessageMapping("socket/init-tickets")
-    fun initTickets(@AuthenticationPrincipal user: User): Flux<Ticket> {
-        return userService.getTickets(user)
+    fun initTickets(@AuthenticationPrincipal userCredentials: UserCredentials): Flux<Ticket> {
+        return userService.getTickets(userCredentials)
     }
 
     @MessageMapping("socket/init-users")
-    fun initUsers(@AuthenticationPrincipal user: User): Flux<UserDisplay> {
-        return userService.getUserDisplays(user)
+    fun initUsers(@AuthenticationPrincipal userCredentials: UserCredentials): Flux<User> {
+        return userService.getUserDisplays(userCredentials)
     }
 
     @MessageMapping("socket/init-conferences")
-    fun initConferences(@AuthenticationPrincipal user: User): Flux<ConferenceInfo> {
-        return userService.getConferences(user)
+    fun initConferences(@AuthenticationPrincipal userCredentials: UserCredentials): Flux<ConferenceInfo> {
+        return userService.getConferences(userCredentials)
     }
 }

src/main/kotlin/de/thm/mni/ii/classroom/event/ConferenceEvent.kt

@@ -10,7 +10,6 @@ data class ConferenceEvent(
 enum class ConferenceAction {
     CREATE,
     CLOSE,
-    PUBLISH,
-    HIDE,
+    VISIBILITY,
     USER_CHANGE
 }

src/main/kotlin/de/thm/mni/ii/classroom/event/InvitationEvent.kt

@@ -1,10 +1,10 @@
 package de.thm.mni.ii.classroom.event
 
 import de.thm.mni.ii.classroom.model.classroom.ConferenceInfo
-import de.thm.mni.ii.classroom.model.classroom.User
+import de.thm.mni.ii.classroom.model.classroom.UserCredentials
 
 data class InvitationEvent(
-    val inviter: User,
-    val invitee: User,
+    val inviter: UserCredentials,
+    val invitee: UserCredentials,
     val conferenceInfo: ConferenceInfo
 ) : ClassroomEvent(InvitationEvent::class.simpleName!!)

src/main/kotlin/de/thm/mni/ii/classroom/event/UserEvent.kt

@@ -1,9 +1,9 @@
 package de.thm.mni.ii.classroom.event
 
-import de.thm.mni.ii.classroom.model.classroom.UserDisplay
+import de.thm.mni.ii.classroom.model.classroom.User
 
 data class UserEvent(
-    val user: UserDisplay,
+    val user: User,
     val userAction: UserAction
 ) : ClassroomEvent(UserEvent::class.simpleName!!)
 

src/main/kotlin/de/thm/mni/ii/classroom/exception/classroom/InvitationException.kt

@@ -1,7 +1,7 @@
 package de.thm.mni.ii.classroom.exception.classroom
 
 import de.thm.mni.ii.classroom.event.InvitationEvent
-import de.thm.mni.ii.classroom.model.classroom.User
+import de.thm.mni.ii.classroom.model.classroom.UserCredentials
 
-class InvitationException(user: User, invitationEvent: InvitationEvent) :
-    ClassroomException("Sender ${user.userId} does not match inviter ${invitationEvent.inviter.userId}!")
+class InvitationException(userCredentials: UserCredentials, invitationEvent: InvitationEvent) :
+    ClassroomException("Sender ${userCredentials.userId} does not match inviter ${invitationEvent.inviter.userId}!")

src/main/kotlin/de/thm/mni/ii/classroom/model/api/Attendees.kt

@@ -1,16 +1,16 @@
 package de.thm.mni.ii.classroom.model.api
 
-import de.thm.mni.ii.classroom.model.classroom.User
+import de.thm.mni.ii.classroom.model.classroom.UserCredentials
 import javax.xml.bind.annotation.XmlElement
 import javax.xml.bind.annotation.XmlRootElement
 import javax.xml.bind.annotation.XmlType
 
 @XmlRootElement(name = "attendees")
-class Attendees(users: Set<User>? = null) {
+class Attendees(userCredentials: Set<UserCredentials>? = null) {
 
     @Suppress("unused")
     @XmlElement(name = "attendee")
-    private val attendees = users?.map(::Attendee)
+    val attendees = userCredentials?.mapTo(HashSet(), ::Attendee)
 }
 
 @XmlType(
@@ -28,13 +28,13 @@ class Attendees(users: Set<User>? = null) {
 )
 
 @Suppress("unused")
-class Attendee(user: User? = null) {
-    @XmlElement private val userID: String? = user?.userId
-    @XmlElement private val fullName: String? = user?.fullName
-    @XmlElement private val role: String? = user?.userRole?.name
-    @XmlElement private val isPresenter = false
-    @XmlElement private val isListeningOnly = true
-    @XmlElement private val hasJoinedVoice = false
-    @XmlElement private val hasVideo = false
-    @XmlElement private val clientType = "CLASSROOM"
+class Attendee(userCredentials: UserCredentials? = null) {
+    @XmlElement val userID: String? = userCredentials?.userId
+    @XmlElement val fullName: String? = userCredentials?.fullName
+    @XmlElement val role: String? = userCredentials?.userRole?.name
+    @XmlElement val isPresenter = false
+    @XmlElement val isListeningOnly = true
+    @XmlElement val hasJoinedVoice = false
+    @XmlElement val hasVideo = false
+    @XmlElement val clientType = "CLASSROOM"
 }