Fix websocket issues (#116)

* Always send current item

* Possible fix for account confirmation error

* Remove authentication for GET Poll endpoint

* Fix cucumber test

* Update UserStepDefinitions.kt

* Update Livepoll.postman_collection.json

Author: Niklas-23

postman/Livepoll.postman_collection.json

@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "98a6fefc-8013-405c-ac74-c578a47251b5",
+		"_postman_id": "b83df12e-5482-4bc6-baa9-c95b38afdbb2",
 		"name": "Livepoll",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
 	},
@@ -2199,8 +2199,8 @@
 									"            headers: 'Cookie:'+pm.environment.get(\"cookies\")\r",
 									"        }, function(error, response) {\r",
 									"    pm.test(\"Poll item does not exist anymore\", function() {\r",
-									"        pm.expect(response).to.have.property('code', 403)\r",
-									"        pm.expect(response).to.have.property('status', 'Forbidden')\r",
+									"        pm.expect(response).to.have.property('code', 404)\r",
+									"        pm.expect(response).to.have.property('status', 'Not Found')\r",
 									"    })\r",
 									"})\r",
 									"\r",

src/main/kotlin/de/livepoll/api/config/SecurityConfig.kt

@@ -27,6 +27,7 @@ class SecurityConfig(
             .antMatchers("/v1/account/register").permitAll()
             .antMatchers("/v1/account/confirm").permitAll()
             .antMatchers("/v1/account/login").permitAll()
+            .antMatchers("/v1/polls/{id:[\\d]+}").permitAll()
             .antMatchers("/v1/websocket/**").permitAll()
             .antMatchers("/actuator/**").permitAll()
             //.antMatchers("/admin").hasRole("ADMIN") // TODO: introduce ROLE_ADMIN authority later on

src/main/kotlin/de/livepoll/api/controller/PollController.kt

@@ -36,8 +36,7 @@ class PollController(
 
     @ApiOperation(value = "Get poll", tags = ["Poll"])
     @GetMapping("/{id}")
-    fun getPoll(@PathVariable(name = "id") pollId: Long, @AuthenticationPrincipal user: User): PollDtoOut {
-        accountService.checkAuthorizationByPollId(pollId)
+    fun getPoll(@PathVariable(name = "id") pollId: Long): PollDtoOut {
         return pollService.getPoll(pollId)
     }
 

src/main/kotlin/de/livepoll/api/service/AccountService.kt

@@ -13,6 +13,7 @@ import de.livepoll.api.util.jwtCookie.CookieCipher
 import de.livepoll.api.util.jwtCookie.CookieUtil
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.dao.DataAccessException
+import org.springframework.dao.EmptyResultDataAccessException
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
@@ -86,14 +87,19 @@ class AccountService(
      * @param token the token string to confirm the new account
      */
     fun confirmAccount(token: String): Boolean {
-        val verificationToken = verificationTokenRepository.findByToken(token)
-        if (verificationToken.expiryDate.after(Date())) {
-            val user = userRepository.findByUsername(verificationToken.username)
-            user?.isAccountEnabled = true
-            verificationTokenRepository.delete(verificationToken)
-            return true
+        try {
+            val verificationToken = verificationTokenRepository.findByToken(token)
+            if (verificationToken.expiryDate.after(Date())) {
+                val user = userRepository.findByUsername(verificationToken.username)
+                user?.isAccountEnabled = true
+                verificationTokenRepository.delete(verificationToken)
+                return true
+            }
+            return false
+        } catch (ex:EmptyResultDataAccessException) {
+            return false
         }
-        return false
+
     }
 
     private fun calculateExpiryDate() = Calendar.getInstance()

src/main/kotlin/de/livepoll/api/service/PollService.kt

@@ -180,10 +180,10 @@ class PollService(
             }
 
             if (this.currentItem != null) {
-                webSocketService.sendCurrentItem(this.slug, this.id, this.currentItem)
                 webSocketService.sendItemWithAnswers(this.currentItem!!)
             }
 
+            webSocketService.sendCurrentItem(this.slug, this.id, this.currentItem)
             return pollRepository.saveAndFlush(this).toDtoOut()
         }
     }

src/test/kotlin/de/livepoll/api/cucumber/stepdefinitions/UserStepDefinitions.kt

@@ -1,9 +1,11 @@
 package de.livepoll.api.cucumber.stepdefinitions
 
 import de.livepoll.api.cucumber.CucumberIntegrationTest
+import de.livepoll.api.entity.db.OpenTextItem
 import de.livepoll.api.entity.db.Poll
 import de.livepoll.api.entity.db.PollItem
 import de.livepoll.api.entity.db.User
+import de.livepoll.api.repository.OpenTextItemRepository
 import de.livepoll.api.repository.PollRepository
 import de.livepoll.api.repository.UserRepository
 import io.cucumber.java.en.And
@@ -20,11 +22,13 @@ private const val LOGOUT_ENDPOINT = "/v1/account/logout"
 
 class UserStepDefinitions(
     private val pollRepository: PollRepository,
-    private val userRepository: UserRepository
+    private val userRepository: UserRepository,
+    private val openTextItemRepository: OpenTextItemRepository
 ) : CucumberIntegrationTest(userRepository) {
 
     private val USER_ENDPOINT = "/v1/user"
     private val POLL_ENDPOINT = "/v1/polls"
+    private val POLL_ITEM_ENDPOINT = "/v1/poll-items"
 
     lateinit var status: HttpStatus
     var alreadyConfirmed = false
@@ -87,8 +91,9 @@ class UserStepDefinitions(
                 )
             )
         }
-        val id = pollRepository.findBySlug("different_user_test_slug")!!.id
-        val url = "${SERVER_URL}:$port$POLL_ENDPOINT/${id}"
+        val poll = pollRepository.findBySlug("different_user_test_slug")!!
+        val id = openTextItemRepository.saveAndFlush(OpenTextItem(0, poll, "question", 0, mutableListOf())).id
+        val url = "${SERVER_URL}:$port$POLL_ITEM_ENDPOINT/${id}"
         try {
             val pollResponseEntity = makeGetRequestWithSessionCookie<Any>(url, SessionCookieUtil.sessionCookie)
             assertThat(pollResponseEntity.statusCode).isEqualTo(HttpStatus.FORBIDDEN)