Merge remote-tracking branch 'refs/remotes/origin/main' into feature/…

…gpt-integration

# Conflicts:
#	frontend/src/components/UserStories.vue
#	frontend/src/views/PrepareSessionPage.vue
#	frontend/src/views/SessionPage.vue

README.md

@@ -14,11 +14,13 @@
 
 WebApp to do Planning Poker with remote teams using external issue tracker as source of stories.
 
-Supported issue trackers:
+Supported issue trackers/platforms:
 
 - Atlassian JIRA on premise
 - Atlassian JIRA Cloud
 - Microsoft Azure DevOps
+- GitHub
+- GitLab
 - More connectors are planned
 
 ## Read more
@@ -43,6 +45,10 @@ How to contribute:
 
 Happy coding 🚀
 
+### Hacktoberfest 2023
+Many thanks all contributors supporting us during Hacktoberfest 2023!
+We are happy to announce that we had **20 PRs** where **15 PRs** have been merged successful during Hacktoberfest 🚀 
+
 ### Hacktoberfest 2022
 
 Many thanks all contributors supporting us during Hacktoberfest 2022!
@@ -77,9 +83,21 @@ docker-compose up -d
 ```shell
 docker-compose -f docker-compose.dev.yml up --build -d
 ```
+---
 
 ### Run Diveni locally
 
+- create an file ``.env`` in directory ``backend`` first with the following contents:
+```
+#URL the server is running on
+SERVER_URL=http://localhost:8080
+
+#The locale the frontend should be set to
+LOCALE=en
+```
+- detailed documentation on the ``.env`` file can be found in the [docs](https://github.com/Sybit-Education/Diveni/blob/main/docs/guide/install.md) (e.g., available configurations for adding issue trackers)
+
+
 #### Frontend
 - npm, vue2
 - switch to directory ``frontend`` first

backend/build.gradle

@@ -1,7 +1,7 @@
 
 plugins {
-    id 'org.springframework.boot' version '3.2.4'
-    id 'io.spring.dependency-management' version '1.1.4'
+    id 'org.springframework.boot' version '3.3.2'
+    id 'io.spring.dependency-management' version '1.1.6'
     id 'java'
     id 'jacoco'
     id "io.freefair.lombok" version "8.6"
@@ -23,10 +23,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
     implementation 'org.springframework.boot:spring-boot-starter-websocket'
-    implementation 'com.google.oauth-client:google-oauth-client:1.35.0'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
+    implementation 'com.google.oauth-client:google-oauth-client:1.36.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
     implementation 'com.google.api-client:google-api-client-gson:1.35.2'
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'org.springdoc:springdoc-openapi-ui:1.8.0'
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
     implementation 'org.json:json:20230227'

backend/src/main/java/io/diveni/backend/controller/WebsocketController.java

@@ -43,7 +43,7 @@ public class WebsocketController {
   @Autowired private WebSocketService webSocketService;
 
   @MessageMapping("/registerAdminUser")
-  public void registerAdminUser(AdminPrincipal principal) {
+  public synchronized void registerAdminUser(AdminPrincipal principal) {
     LOGGER.debug("--> registerAdminUser()");
     Session session =
         ControllerUtils.getSessionOrThrowResponse(databaseService, principal.getSessionID());
@@ -63,7 +63,7 @@ public void registerAdminUser(AdminPrincipal principal) {
   }
 
   @MessageMapping("/registerMember")
-  public void joinMember(MemberPrincipal principal) {
+  public synchronized void joinMember(MemberPrincipal principal) {
     LOGGER.debug("--> joinMember()");
     val session =
         ControllerUtils.getSessionOrThrowResponse(databaseService, principal.getSessionID());
@@ -86,7 +86,7 @@ public void joinMember(MemberPrincipal principal) {
   }
 
   @MessageMapping("/unregister")
-  public void removeMember(Principal principal) {
+  public synchronized void removeMember(Principal principal) {
     LOGGER.debug("--> removeMember()");
     if (principal instanceof MemberPrincipal) {
       webSocketService.removeMember((MemberPrincipal) principal);
@@ -120,7 +120,7 @@ public void removeMember(Principal principal) {
   }
 
   @MessageMapping("/kick-member")
-  public void kickMember(AdminPrincipal principal, @Payload String memberID) {
+  public synchronized void kickMember(AdminPrincipal principal, @Payload String memberID) {
     val session =
         ControllerUtils.getSessionOrThrowResponse(databaseService, principal.getSessionID())
             .removeMember(memberID);
@@ -132,7 +132,7 @@ public void kickMember(AdminPrincipal principal, @Payload String memberID) {
   }
 
   @MessageMapping("/closeSession")
-  public void closeSession(AdminPrincipal principal) {
+  public synchronized void closeSession(AdminPrincipal principal) {
     LOGGER.debug("--> closeSession()");
     val session =
         ControllerUtils.getSessionOrThrowResponse(databaseService, principal.getSessionID());
@@ -153,7 +153,7 @@ public void getMemberUpdate(AdminPrincipal principal) {
   }
 
   @MessageMapping("/startVoting")
-  public void startEstimation(AdminPrincipal principal, @Payload String message) {
+  public synchronized void startEstimation(AdminPrincipal principal, @Payload String message) {
     LOGGER.debug("--> startEstimation()");
     JSONObject jsonObject = new JSONObject(message);
     boolean stateOfHostVoting = jsonObject.getBoolean("hostVoting");
@@ -172,7 +172,7 @@ public void startEstimation(AdminPrincipal principal, @Payload String message) {
   }
 
   @MessageMapping("/votingFinished")
-  public void votingFinished(AdminPrincipal principal) {
+  public synchronized void votingFinished(AdminPrincipal principal) {
     LOGGER.debug("--> votingFinished()");
     val session =
         ControllerUtils.getSessionOrThrowResponse(databaseService, principal.getSessionID())

frontend/.eslintrc.js

@@ -15,6 +15,7 @@ module.exports = {
     ecmaVersion: 2020,
   },
   rules: {
+    "vue/no-v-model-argument": "off",
     "no-console": "off",
     "no-debugger": "off",
     noImplicitAny: 0,