From b2397406adcd2a9b01f3a8089d1b7c5dff4baf4b Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Sat, 28 Oct 2017 18:55:37 +0200
Subject: [PATCH] Handle wrong login on websocket
---
PlayWallServer.iml | 5 +++--
pom.xml | 9 ++++++++-
.../scala/de/tobias/playpad/server/PlayPadServer.scala | 7 +------
.../server/server/project/sync/ProjectSyncHandler.scala | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/PlayWallServer.iml b/PlayWallServer.iml
index 573336c..7f3dfa7 100644
--- a/PlayWallServer.iml
+++ b/PlayWallServer.iml
@@ -12,7 +12,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.13.0-M2" level="project" />
+ <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.4" level="project" />
<orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.4.v20170414" level="project" />
@@ -30,11 +30,12 @@
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.4.v20170414" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.4.v20170414" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.4.v20170414" level="project" />
+ <orderEntry type="library" name="Maven: com.sparkjava:spark-debug-tools:0.5" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.0.13" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.0.13" level="project" />
<orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-core:5.0" level="project" />
<orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-jdbc:5.0" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:6.0.5" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.2" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4835d86..c56f1c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,13 +87,20 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>LATEST</version>
+ <version>2.12.4</version>
</dependency>
+
<dependency>
<groupId>com.sparkjava</groupId>
<artifactId>spark-core</artifactId>
<version>2.6.0</version>
</dependency>
+ <dependency>
+ <groupId>com.sparkjava</groupId>
+ <artifactId>spark-debug-tools</artifactId>
+ <version>0.5</version>
+ </dependency>
+
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
diff --git a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
index 273b690..de3d8fc 100644
--- a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
+++ b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
@@ -16,7 +16,6 @@ import de.tobias.playpad.server.server.project.sync.ProjectSyncHandler
import de.tobias.playpad.server.settings.SettingsHandler
import de.tobias.playpad.server.transformer.JsonTransformer
import spark.Spark._
-import spark.route.RouteOverview
/**
* Created by tobias on 29.01.17.
@@ -82,12 +81,8 @@ object PlayPadServer extends App {
get("/sessions", new SessionGet(accountDao), new JsonTransformer)
// DEBUG
- exception(classOf[Exception], (exception, _, _) => {
- exception.printStackTrace()
- halt(500, s"internal error: ${exception.getLocalizedMessage}")
- })
+ // DebugScreen.enableDebugScreen()
- RouteOverview.enableRouteOverview()
SettingsHandler.saver.save(settings, settingsPath)
Runtime.getRuntime.addShutdownHook(new Thread(() => {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
index 3e54d12..4a9b442 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
@@ -63,7 +63,7 @@ import scala.collection.{Map, mutable}
this.sessions += (s.getAccount -> new mutable.HashSet[Session]())
}
this.sessions(s.getAccount) += serverSession
- case None => serverSession.close(500, "Invalid Key")
+ case None => serverSession.disconnect()
}
}
--
GitLab