Merge branch 'master' into issue-6674

.travis.yml

+language: java

src/main/java/de/thm/arsnova/aop/UserSessionAspect.java

@@ -37,6 +37,7 @@ public class UserSessionAspect {
 	 * @param socketId
 	 * @param session
 	 */
+	/* FIXME This is not working because of scoping problems
 	@AfterReturning(
 		pointcut="execution(public * de.thm.arsnova.services.SessionService.joinSession(..)) && args(keyword, socketId)",
 		returning="session"
@@ -45,4 +46,5 @@ public class UserSessionAspect {
 		userSessionService.setSession(session);
 		userSessionService.setSocketId(socketId);
 	}
+	*/
 }

src/main/java/de/thm/arsnova/services/SessionService.java

@@ -64,7 +64,6 @@ public class SessionService implements ISessionService {
 	}
 
 	@Override
-	@Authenticated
 	public final Session joinSession(final String keyword, final UUID socketId) {
 		/* Socket.IO solution */
 

src/main/java/de/thm/arsnova/services/UserService.java

@@ -142,8 +142,12 @@ public class UserService implements IUserService {
 		}
 		String session = user2sessionLegacy.get(user);
 		if (session == null) {
-			return false;
+			session = user2session.get(user);
+			if (session == null) {
+				return false;
+			}
 		}
+
 		return keyword.equals(session);
 	}