From 41ad43327af07535b6d07b068f749e919c5ca41e Mon Sep 17 00:00:00 2001
From: James Ayvaz <james.ayvaz@gmail.com>
Date: Sat, 23 Nov 2019 23:41:36 -0800
Subject: [PATCH 1/2] Updated to Kotlin 1.3.50 Updated to Ktor 1.2.5

---
 .idea/runConfigurations/Backend____Jetty.xml  |  2 +-
 backend/build.gradle                          | 23 +++++-----
 .../jetbrains/demo/thinkter/Application.kt    | 45 +++++++++++--------
 .../demo/thinkter/ApplicationPage.kt          | 10 +++--
 .../src/org/jetbrains/demo/thinkter/Delete.kt | 27 +++++++----
 .../src/org/jetbrains/demo/thinkter/Index.kt  | 40 ++++++++++-------
 .../org/jetbrains/demo/thinkter/Locations.kt  | 28 ++++++------
 .../src/org/jetbrains/demo/thinkter/Login.kt  | 43 ++++++++++++------
 .../jetbrains/demo/thinkter/PostThought.kt    | 42 ++++++++++++-----
 .../org/jetbrains/demo/thinkter/Register.kt   | 44 +++++++++++-------
 .../org/jetbrains/demo/thinkter/UserPage.kt   | 15 ++++---
 .../org/jetbrains/demo/thinkter/Utilities.kt  | 30 +++++++------
 .../jetbrains/demo/thinkter/ViewThought.kt    | 22 +++++----
 build.gradle                                  | 32 ++++++++++---
 frontend/build.gradle                         | 22 +++------
 .../src/org/jetbrains/common/coroutines.kt    | 21 ---------
 .../jetbrains/demo/thinkter/Application.kt    | 29 ++++++++----
 .../org/jetbrains/demo/thinkter/HomeView.kt   | 25 +++++++----
 .../src/org/jetbrains/demo/thinkter/Login.kt  | 29 +++++++-----
 .../demo/thinkter/NavBarComponent.kt          |  5 ++-
 .../demo/thinkter/NewThoughtComponent.kt      | 36 +++++++++------
 .../org/jetbrains/demo/thinkter/Polling.kt    |  5 ++-
 .../org/jetbrains/demo/thinkter/Register.kt   | 33 ++++++++------
 .../src/org/jetbrains/demo/thinkter/Rpc.kt    |  2 +-
 .../demo/thinkter/ViewThoughtComponent.kt     | 26 +++++++----
 .../src/org/jetbrains/react/ReactComponent.kt | 33 --------------
 .../org/jetbrains/react/ReactExtensions.kt    | 16 -------
 .../jetbrains/react/dom/ReactDOMBuilder.kt    | 18 +++++---
 gradle/wrapper/gradle-wrapper.properties      |  3 +-
 29 files changed, 398 insertions(+), 308 deletions(-)
 delete mode 100644 frontend/src/org/jetbrains/common/coroutines.kt

diff --git a/.idea/runConfigurations/Backend____Jetty.xml b/.idea/runConfigurations/Backend____Jetty.xml
index 17fe544..c1dde89 100644
--- a/.idea/runConfigurations/Backend____Jetty.xml
+++ b/.idea/runConfigurations/Backend____Jetty.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Backend :: Jetty" type="Application" factoryName="Application" singleton="true">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <extension name="org.jetbrains.fluid.java.FluidRunConfigurationExtension" fluid.enabledBundledTracers="false" fluid.enabledBundledTracers.list="" />
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.ktor.jetty.DevelopmentHost" />
+    <option name="MAIN_CLASS_NAME" value="io.ktor.server.jetty.EngineMain" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
diff --git a/backend/build.gradle b/backend/build.gradle
index 6097f03..724f8f1 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -1,24 +1,27 @@
 group = 'org.jetbrains.demo.thinkter'
 version = '0.0.1-SNAPSHOT'
 
+apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: 'application'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+//    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-
-    compile "org.jetbrains.ktor:ktor-locations:$ktor_version"
-    compile "org.jetbrains.ktor:ktor-html-builder:$ktor_version"
+    compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+    compile "io.ktor:ktor-locations:$ktor_version"
+    compile "io.ktor:ktor-html-builder:$ktor_version"
     compile "org.ehcache:ehcache:3.0.0.m4"
 
     compile "org.jetbrains.squash:squash-h2:$squash_version"
 
     testCompile("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
-    testCompile "org.jetbrains.ktor:ktor-test-host:$ktor_version"
+    testCompile "io.ktor:ktor-server-test-host:$ktor_version"
     testCompile "org.jsoup:jsoup:1.9.1"
 
-    compile "org.jetbrains.ktor:ktor-jetty:$ktor_version"
+    compile "io.ktor:ktor-gson:$ktor_version"
+    compile "io.ktor:ktor-server-jetty:$ktor_version"
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
 }
 
@@ -35,10 +38,8 @@ compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "1.8"
 }
 
-mainClassName = 'org.jetbrains.ktor.jetty.DevelopmentHost'
+mainClassName = 'io.ktor.server.jetty.EngineMain'
diff --git a/backend/src/org/jetbrains/demo/thinkter/Application.kt b/backend/src/org/jetbrains/demo/thinkter/Application.kt
index e5fb2b4..7d5ac62 100644
--- a/backend/src/org/jetbrains/demo/thinkter/Application.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/Application.kt
@@ -1,41 +1,48 @@
 package org.jetbrains.demo.thinkter
 
-import com.google.gson.*
-import org.jetbrains.demo.thinkter.dao.*
-import org.jetbrains.demo.thinkter.model.*
-import org.jetbrains.ktor.application.*
-import org.jetbrains.ktor.content.*
-import org.jetbrains.ktor.features.*
-import org.jetbrains.ktor.http.*
-import org.jetbrains.ktor.locations.*
-import org.jetbrains.ktor.logging.*
-import org.jetbrains.ktor.routing.*
-import org.jetbrains.ktor.sessions.*
-import org.jetbrains.ktor.transform.*
+import io.ktor.application.Application
+import io.ktor.application.call
+import io.ktor.application.install
+import io.ktor.features.*
+import io.ktor.gson.gson
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Locations
+import io.ktor.response.respond
+import io.ktor.routing.routing
+import io.ktor.sessions.SessionTransportTransformerMessageAuthentication
+import io.ktor.sessions.Sessions
+import io.ktor.sessions.cookie
+import org.jetbrains.demo.thinkter.dao.ThinkterDatabase
+
+const val SESSION_NAME: String = "SESSION_NAME"
 
 data class Session(val userId: String)
 
+@KtorExperimentalLocationsAPI
 fun Application.main() {
     val storage = ThinkterDatabase(/*JDBCConnection.Companion.create(H2Dialect, pool)*/)
 
     install(DefaultHeaders)
     install(CallLogging)
     install(ConditionalHeaders)
-    install(PartialContentSupport)
+    install(PartialContent)
     install(Compression)
     install(Locations)
     install(StatusPages) {
-        exception<NotImplementedError> { call.respond(HttpStatusCode.NotImplemented) }
+        exception<NotImplementedError> { call.respond(HttpStatusCode.NotImplemented, "${it.message}") }
     }
 
-    withSessions<Session> {
-        withCookieByValue {
-            settings = SessionCookiesSettings(transformers = listOf(SessionCookieTransformerMessageAuthentication(hashKey)))
+    install(Sessions) {
+        cookie<Session>(SESSION_NAME) {
+            transform(SessionTransportTransformerMessageAuthentication(hashKey))
         }
     }
 
-    transform.register<RpcData> {
-        TextContent(Gson().toJson(it), ContentType.Application.Json)
+    install(ContentNegotiation) {
+        gson {
+            setPrettyPrinting()
+        }
     }
 
     routing {
diff --git a/backend/src/org/jetbrains/demo/thinkter/ApplicationPage.kt b/backend/src/org/jetbrains/demo/thinkter/ApplicationPage.kt
index 7479793..913a9d2 100644
--- a/backend/src/org/jetbrains/demo/thinkter/ApplicationPage.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/ApplicationPage.kt
@@ -1,7 +1,9 @@
 package org.jetbrains.demo.thinkter
 
+import io.ktor.html.Placeholder
+import io.ktor.html.Template
+import io.ktor.html.insert
 import kotlinx.html.*
-import org.jetbrains.ktor.html.*
 
 class ApplicationPage : Template<HTML> {
     val caption = Placeholder<TITLE>()
@@ -21,8 +23,8 @@ class ApplicationPage : Template<HTML> {
             insert(head)
             link("https://fonts.googleapis.com/icon?family=Material+Icons", rel = "stylesheet")
 
-            link(rel = LinkRel.stylesheet, type=LinkType.textCss, href = "http://yui.yahooapis.com/pure/0.6.0/pure-min.css")
-            link(rel = LinkRel.stylesheet, type=LinkType.textCss, href = "http://yui.yahooapis.com/pure/0.6.0/grids-responsive-min.css")
+            link(rel = LinkRel.stylesheet, type = LinkType.textCss, href = "http://yui.yahooapis.com/pure/0.6.0/pure-min.css")
+            link(rel = LinkRel.stylesheet, type = LinkType.textCss, href = "http://yui.yahooapis.com/pure/0.6.0/grids-responsive-min.css")
 
         }
         body {
@@ -45,7 +47,7 @@ class ApplicationPage : Template<HTML> {
                 }
             }
             div { id = "content" }
-            script(src = "frontend/frontend.bundle.js")
+            script(src = "frontend/frontend.bundle.js", block = {})
         }
     }
 }
diff --git a/backend/src/org/jetbrains/demo/thinkter/Delete.kt b/backend/src/org/jetbrains/demo/thinkter/Delete.kt
index 21254fb..29969a2 100644
--- a/backend/src/org/jetbrains/demo/thinkter/Delete.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/Delete.kt
@@ -1,16 +1,25 @@
+@file:Suppress("ImplicitThis")
+
 package org.jetbrains.demo.thinkter
 
-import org.jetbrains.demo.thinkter.dao.*
-import org.jetbrains.demo.thinkter.model.*
-import org.jetbrains.ktor.application.*
-import org.jetbrains.ktor.http.*
-import org.jetbrains.ktor.locations.*
-import org.jetbrains.ktor.routing.*
-import org.jetbrains.ktor.sessions.*
 
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.get
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.sessions.get
+import io.ktor.sessions.sessions
+import org.jetbrains.demo.thinkter.dao.ThinkterStorage
+import org.jetbrains.demo.thinkter.model.PostThoughtToken
+import org.jetbrains.demo.thinkter.model.RpcData
+
+@KtorExperimentalLocationsAPI
 fun Route.delete(dao: ThinkterStorage, hashFunction: (String) -> String) {
     get<ThoughtDelete> {
-        val user = call.sessionOrNull<Session>()?.let { dao.user(it.userId) }
+        val user = call.sessions.get<Session>()?.let { dao.user(it.userId) }
         val date = System.currentTimeMillis()
 
         if (user == null) {
@@ -22,7 +31,7 @@ fun Route.delete(dao: ThinkterStorage, hashFunction: (String) -> String) {
     }
 
     post<ThoughtDelete> {
-        val user = call.sessionOrNull<Session>()?.let { dao.user(it.userId) }
+        val user = call.sessions.get<Session>()?.let { dao.user(it.userId) }
         val thought = dao.getThought(it.id)
 
         if (user == null || thought.userId != user.userId || !call.verifyCode(it.date, user, it.code, hashFunction)) {
diff --git a/backend/src/org/jetbrains/demo/thinkter/Index.kt b/backend/src/org/jetbrains/demo/thinkter/Index.kt
index 63ece58..4de9926 100644
--- a/backend/src/org/jetbrains/demo/thinkter/Index.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/Index.kt
@@ -1,31 +1,41 @@
 package org.jetbrains.demo.thinkter
 
-import org.jetbrains.demo.thinkter.dao.*
-import org.jetbrains.demo.thinkter.model.*
-import org.jetbrains.ktor.application.*
-import org.jetbrains.ktor.html.*
-import org.jetbrains.ktor.http.*
-import org.jetbrains.ktor.locations.*
-import org.jetbrains.ktor.response.*
-import org.jetbrains.ktor.routing.*
-import org.jetbrains.ktor.sessions.*
-import java.time.*
+import io.ktor.application.call
+import io.ktor.html.respondHtmlTemplate
+import io.ktor.http.ContentType
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.get
+import io.ktor.response.ApplicationSendPipeline
+import io.ktor.response.etag
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.routing.accept
+import io.ktor.routing.get
+import io.ktor.sessions.get
+import io.ktor.sessions.sessions
+import org.jetbrains.demo.thinkter.dao.ThinkterStorage
+import org.jetbrains.demo.thinkter.model.IndexResponse
+import org.jetbrains.demo.thinkter.model.PollResponse
+import org.jetbrains.demo.thinkter.model.Thought
+import java.time.LocalDateTime
+import java.time.ZoneId
 
+@KtorExperimentalLocationsAPI
 fun Route.index(storage: ThinkterStorage) {
-    contentType(ContentType.Text.Html) {
-        get<Index> {
+    accept(ContentType.Text.Html) {
+        get {
             call.respondHtmlTemplate(ApplicationPage()) {
                 caption { +"Thinkter" }
             }
         }
     }
-    contentType(ContentType.Application.Json) {
+    accept(ContentType.Application.Json) {
         get<Index> {
-            val user = call.sessionOrNull<Session>()?.let { storage.user(it.userId) }
+            val user = call.sessions.get<Session>()?.let { storage.user(it.userId) }
             val top = storage.top(10).map(storage::getThought)
             val latest = storage.latest(10).map(storage::getThought)
 
-            call.response.pipeline.intercept(ApplicationResponsePipeline.After) {
+            call.response.pipeline.intercept(ApplicationSendPipeline.After) {
                 val etagString = user?.userId + "," + top.joinToString { it.id.toString() } + latest.joinToString { it.id.toString() }
                 call.response.etag(etagString)
             }
diff --git a/backend/src/org/jetbrains/demo/thinkter/Locations.kt b/backend/src/org/jetbrains/demo/thinkter/Locations.kt
index 7b3a668..d0e84a0 100644
--- a/backend/src/org/jetbrains/demo/thinkter/Locations.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/Locations.kt
@@ -1,35 +1,37 @@
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package org.jetbrains.demo.thinkter
 
-import org.jetbrains.ktor.locations.*
+import io.ktor.locations.Location
 
 
-@location("/")
-class Index()
+@Location("/")
+class Index
 
-@location("/poll")
+@Location("/poll")
 class Poll(val lastTime: String = "")
 
-@location("/post-new")
+@Location("/post-new")
 data class PostThought(val text: String = "", val date: Long = 0L, val code: String = "", val replyTo: Int? = null)
 
-@location("/thought/{id}/delete")
+@Location("/thought/{id}/delete")
 data class ThoughtDelete(val id: Int, val date: Long, val code: String)
 
-@location("/thought/{id}")
+@Location("/thought/{id}")
 data class ViewThought(val id: Int)
 
-@location("/user/{user}")
+@Location("/user/{user}")
 @Deprecated("")
 data class UserPage(val user: String)
 
-@location("/user/{user}/thoughts")
+@Location("/user/{user}/thoughts")
 data class UserThoughts(val user: String)
 
-@location("/register")
+@Location("/register")
 data class Register(val userId: String = "", val displayName: String = "", val email: String = "", val password: String = "", val error: String = "")
 
-@location("/login")
+@Location("/login")
 data class Login(val userId: String = "", val password: String = "", val error: String = "")
 
-@location("/logout")
-class Logout()
\ No newline at end of file
+@Location("/logout")
+class Logout
\ No newline at end of file
diff --git a/backend/src/org/jetbrains/demo/thinkter/Login.kt b/backend/src/org/jetbrains/demo/thinkter/Login.kt
index acaffd1..5567fe9 100644
--- a/backend/src/org/jetbrains/demo/thinkter/Login.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/Login.kt
@@ -1,16 +1,25 @@
 package org.jetbrains.demo.thinkter
 
-import org.jetbrains.demo.thinkter.dao.*
-import org.jetbrains.demo.thinkter.model.*
-import org.jetbrains.ktor.application.*
-import org.jetbrains.ktor.http.*
-import org.jetbrains.ktor.locations.*
-import org.jetbrains.ktor.routing.*
-import org.jetbrains.ktor.sessions.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.Parameters
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.get
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.sessions.clear
+import io.ktor.sessions.get
+import io.ktor.sessions.sessions
+import io.ktor.sessions.set
+import org.jetbrains.demo.thinkter.dao.ThinkterStorage
+import org.jetbrains.demo.thinkter.model.LoginResponse
 
+@KtorExperimentalLocationsAPI
 fun Route.login(dao: ThinkterStorage, hash: (String) -> String) {
     get<Login> {
-        val user = call.sessionOrNull<Session>()?.let { dao.user(it.userId) }
+        val user = call.sessions.get<Session>()?.let { dao.user(it.userId) }
         if (user == null) {
             call.respond(HttpStatusCode.Forbidden)
         } else {
@@ -18,22 +27,28 @@ fun Route.login(dao: ThinkterStorage, hash: (String) -> String) {
         }
     }
     post<Login> {
+        val parameters = call.receive<Parameters>()
+        val form = Login(
+                userId = parameters["userId"] ?: "",
+                password = parameters["password"] ?: "",
+                error = parameters["error"] ?: ""
+        )
         val login = when {
-            it.userId.length < 4 -> null
-            it.password.length < 6 -> null
-            !userNameValid(it.userId) -> null
-            else -> dao.user(it.userId, hash(it.password))
+            form.userId.length < 4 -> null
+            form.password.length < 6 -> null
+            !userNameValid(form.userId) -> null
+            else -> dao.user(form.userId, hash(form.password))
         }
 
         if (login == null) {
             call.respond(LoginResponse(error = "Invalid username or password"))
         } else {
-            call.session(Session(login.userId))
+            call.sessions.set(Session(login.userId))
             call.respond(LoginResponse(login))
         }
     }
     post<Logout> {
-        call.clearSession()
+        call.sessions.clear<Session>()
         call.respond(HttpStatusCode.OK)
     }
 }
diff --git a/backend/src/org/jetbrains/demo/thinkter/PostThought.kt b/backend/src/org/jetbrains/demo/thinkter/PostThought.kt
index f4153f6..01bb5a3 100644
--- a/backend/src/org/jetbrains/demo/thinkter/PostThought.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/PostThought.kt
@@ -1,16 +1,24 @@
 package org.jetbrains.demo.thinkter
 
-import org.jetbrains.demo.thinkter.dao.*
-import org.jetbrains.demo.thinkter.model.*
-import org.jetbrains.ktor.application.*
-import org.jetbrains.ktor.http.*
-import org.jetbrains.ktor.locations.*
-import org.jetbrains.ktor.routing.*
-import org.jetbrains.ktor.sessions.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.Parameters
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.get
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.sessions.get
+import io.ktor.sessions.sessions
+import org.jetbrains.demo.thinkter.dao.ThinkterStorage
+import org.jetbrains.demo.thinkter.model.PostThoughtResult
+import org.jetbrains.demo.thinkter.model.PostThoughtToken
 
+@KtorExperimentalLocationsAPI
 fun Route.postThought(dao: ThinkterStorage, hashFunction: (String) -> String) {
     get<PostThought> {
-        val user = call.sessionOrNull<Session>()?.let { dao.user(it.userId) }
+        val user = call.sessions.get<Session>()?.let { dao.user(it.userId) }
 
         if (user == null) {
             call.respond(HttpStatusCode.Forbidden)
@@ -21,12 +29,22 @@ fun Route.postThought(dao: ThinkterStorage, hashFunction: (String) -> String) {
         }
     }
     post<PostThought> {
-        val user = call.sessionOrNull<Session>()?.let { dao.user(it.userId) }
-        if (user == null || !call.verifyCode(it.date, user, it.code, hashFunction)) {
+        val user = call.sessions.get<Session>()?.let { dao.user(it.userId) }
+        if (user == null) {
             call.respond(HttpStatusCode.Forbidden)
         } else {
-            val id = dao.createThought(user.userId, it.text, it.replyTo)
-            call.respond(PostThoughtResult(dao.getThought(id)))
+            val parameters = call.receive<Parameters>()
+            val form = PostThought(
+                    text = parameters["text"] ?: "",
+                    date = (parameters["date"] ?: "0").toLong(),
+                    code = parameters["code"] ?: ""
+            )
+            if (!call.verifyCode(form.date, user, form.code, hashFunction)) {
+                call.respond(HttpStatusCode.Forbidden)
+            } else {
+                val id = dao.createThought(user.userId, form.text, form.replyTo)
+                call.respond(PostThoughtResult(dao.getThought(id)))
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/backend/src/org/jetbrains/demo/thinkter/Register.kt b/backend/src/org/jetbrains/demo/thinkter/Register.kt
index 0752763..c109783 100644
--- a/backend/src/org/jetbrains/demo/thinkter/Register.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/Register.kt
@@ -1,24 +1,39 @@
 package org.jetbrains.demo.thinkter
 
-import org.jetbrains.demo.thinkter.dao.*
-import org.jetbrains.demo.thinkter.model.*
-import org.jetbrains.ktor.application.*
-import org.jetbrains.ktor.http.*
-import org.jetbrains.ktor.locations.*
-import org.jetbrains.ktor.routing.*
-import org.jetbrains.ktor.sessions.*
-import org.jetbrains.ktor.util.*
+import io.ktor.application.application
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.Parameters
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.get
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.sessions.get
+import io.ktor.sessions.sessions
+import io.ktor.sessions.set
+import org.jetbrains.demo.thinkter.dao.ThinkterStorage
+import org.jetbrains.demo.thinkter.model.LoginResponse
+import org.jetbrains.demo.thinkter.model.User
 
+@KtorExperimentalLocationsAPI
 fun Route.register(dao: ThinkterStorage, hashFunction: (String) -> String) {
-    post<Register> { form ->
-        val vm = call.request.content.get<ValuesMap>()
-
-        val user = call.sessionOrNull<Session>()?.let { dao.user(it.userId) }
+    post<Register> {
+        val user = call.sessions.get<Session>()?.let { dao.user(it.userId) }
         if (user != null) {
             call.redirect(LoginResponse(user))
         } else {
+            val parameters = call.receive<Parameters>()
+            val form = Register(
+                    userId = parameters["userId"] ?: "",
+                    displayName = parameters["displayName"] ?: "",
+                    email = parameters["email"] ?: "",
+                    password = parameters["password"] ?: "",
+                    error = parameters["error"] ?: ""
+            )
             if (form.password.length < 6) {
-                call.respond(LoginResponse(error = "Password should be at least 6 characters long"))
+                call.respond(LoginResponse(error = "Password should be at least 6 characters long ${form.password.length}"))
             } else if (form.userId.length < 4) {
                 call.respond(LoginResponse(error = "Login should be at least 4 characters long"))
             } else if (!userNameValid(form.userId)) {
@@ -41,8 +56,7 @@ fun Route.register(dao: ThinkterStorage, hashFunction: (String) -> String) {
                         call.respond(LoginResponse(error = "Failed to register"))
                     }
                 }
-
-                call.session(Session(newUser.userId))
+                call.sessions.set(Session(newUser.userId))
                 call.respond(LoginResponse(newUser))
             }
         }
diff --git a/backend/src/org/jetbrains/demo/thinkter/UserPage.kt b/backend/src/org/jetbrains/demo/thinkter/UserPage.kt
index a97c0e9..45c3577 100644
--- a/backend/src/org/jetbrains/demo/thinkter/UserPage.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/UserPage.kt
@@ -1,12 +1,15 @@
 package org.jetbrains.demo.thinkter
 
-import org.jetbrains.demo.thinkter.dao.*
-import org.jetbrains.demo.thinkter.model.*
-import org.jetbrains.ktor.application.*
-import org.jetbrains.ktor.http.*
-import org.jetbrains.ktor.locations.*
-import org.jetbrains.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import org.jetbrains.demo.thinkter.dao.ThinkterStorage
+import org.jetbrains.demo.thinkter.model.UserThoughtsResponse
 
+@KtorExperimentalLocationsAPI
 fun Route.userPage(dao: ThinkterStorage) {
     get<UserThoughts> {
         val viewUser = dao.user(it.user)
diff --git a/backend/src/org/jetbrains/demo/thinkter/Utilities.kt b/backend/src/org/jetbrains/demo/thinkter/Utilities.kt
index 315983b..ca86810 100644
--- a/backend/src/org/jetbrains/demo/thinkter/Utilities.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/Utilities.kt
@@ -1,17 +1,21 @@
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package org.jetbrains.demo.thinkter
 
-import org.jetbrains.demo.thinkter.dao.*
-import org.jetbrains.demo.thinkter.model.*
-import org.jetbrains.ktor.application.*
-import org.jetbrains.ktor.http.*
-import org.jetbrains.ktor.locations.*
-import org.jetbrains.ktor.request.*
-import org.jetbrains.ktor.response.*
-import org.jetbrains.ktor.util.*
-import java.net.*
-import java.util.concurrent.*
-import javax.crypto.*
-import javax.crypto.spec.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.feature
+import io.ktor.http.HttpHeaders
+import io.ktor.locations.Locations
+import io.ktor.request.header
+import io.ktor.request.host
+import io.ktor.request.port
+import io.ktor.response.respondRedirect
+import io.ktor.util.hex
+import org.jetbrains.demo.thinkter.model.User
+import java.net.URI
+import java.util.concurrent.TimeUnit
+import javax.crypto.Mac
+import javax.crypto.spec.SecretKeySpec
 
 val hashKey = hex("6819b57a326945c1968f45236589")
 val hmacKey = SecretKeySpec(hashKey, "HmacSHA1")
@@ -24,7 +28,7 @@ fun hash(password: String): String {
 fun ApplicationCall.refererHost() = request.header(HttpHeaders.Referrer)?.let { URI.create(it).host }
 
 suspend fun ApplicationCall.redirect(location: Any) {
-    val host = request.host() ?: "localhost"
+    val host = request.host()
     val portSpec = request.port().let { if (it == 80) "" else ":$it" }
     val address = host + portSpec
 
diff --git a/backend/src/org/jetbrains/demo/thinkter/ViewThought.kt b/backend/src/org/jetbrains/demo/thinkter/ViewThought.kt
index 9a58018..ff66c8a 100644
--- a/backend/src/org/jetbrains/demo/thinkter/ViewThought.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/ViewThought.kt
@@ -1,19 +1,23 @@
 package org.jetbrains.demo.thinkter
 
-import org.jetbrains.demo.thinkter.dao.*
-import org.jetbrains.demo.thinkter.model.*
-import org.jetbrains.ktor.application.*
-import org.jetbrains.ktor.locations.*
-import org.jetbrains.ktor.routing.*
-import org.jetbrains.ktor.sessions.*
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.sessions.get
+import io.ktor.sessions.sessions
+import org.jetbrains.demo.thinkter.dao.ThinkterStorage
+import org.jetbrains.demo.thinkter.model.ViewThoughtResponse
 
+@KtorExperimentalLocationsAPI
 fun Route.viewThought(dao: ThinkterStorage, hashFunction: (String) -> String) {
-    get<ViewThought> {
-        val user = call.sessionOrNull<Session>()?.let { dao.user(it.userId) }
+    get<ViewThought> { viewThought ->
+        val user = call.sessions.get<Session>()?.let { dao.user(it.userId) }
         val date = System.currentTimeMillis()
         val code = if (user != null) call.securityCode(date, user, hashFunction) else null
 
-        call.respond(ViewThoughtResponse(dao.getThought(it.id), date, code))
+        call.respond(ViewThoughtResponse(dao.getThought(viewThought.id), date, code))
     }
 }
 
diff --git a/build.gradle b/build.gradle
index c5c2887..c690d75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,19 @@
 group = 'org.jetbrains.demo.thinkter'
 version = '0.0.1-SNAPSHOT'
 
+ext {
+    kotlin_version = "1.3.50"
+    html_version = "0.6.12"
+    ktor_version = "1.2.5"
+    kotlin_coroutines_version = "1.3.2"
+    kotlin_frontend_version = "0.0.45"
+    squash_version = "0.2.2"
+    appengine_version = '1.9.60'
+    appengine_plugin_version = '1.3.4'
+    gce_logback_version = '0.60.0-alpha'
+}
+
+
 subprojects { p ->
     p.buildscript {
         ext.kotlin_version = "1.1.51"
@@ -12,17 +25,24 @@ subprojects { p ->
         }
         
         dependencies {
-            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-            classpath "org.jetbrains.kotlin:kotlin-frontend-plugin:0.0.23"
+            classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+            classpath("org.jetbrains.kotlin:kotlin-frontend-plugin:$kotlin_frontend_version")
         }
     }
 }
 
 subprojects {
-    ext.kotlin_version = "1.1.51"
-    ext.html_version = "0.6.6"
-    ext.ktor_version = "0.3.0"
-    ext.squash_version = "0.2.2"
+    ext {
+        kotlin_version = "$kotlin_version"
+        html_version = "$html_version"
+        ktor_version = "$ktor_version"
+        kotlin_coroutines_version = "$kotlin_coroutines_version"
+        kotlin_frontend_version = "$kotlin_frontend_version"
+        squash_version = "$squash_version"
+        appengine_version = "$appengine_version"
+        appengine_plugin_version = "$appengine_plugin_version"
+        gce_logback_version = "$gce_logback_version"
+    }
 
     repositories {
         mavenLocal()
diff --git a/frontend/build.gradle b/frontend/build.gradle
index f1e7422..fcc3de4 100644
--- a/frontend/build.gradle
+++ b/frontend/build.gradle
@@ -5,13 +5,11 @@ apply plugin: 'kotlin2js'
 apply plugin: 'kotlin-dce-js'
 apply plugin: 'org.jetbrains.kotlin.frontend'
 
-repositories {
-    jcenter()
-}
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
+    compile("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version")
+//    compile("org.jetbrains.kotlin:kotlin-test-js:$kotlin_version")
+    compile("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$kotlin_coroutines_version")
     compile("org.jetbrains.kotlinx:kotlinx-html-js:$html_version")
 }
 
@@ -22,9 +20,9 @@ kotlinFrontend {
     sourceMaps = false
 
     npm {
-        replaceVersion("kotlinx-html-js", "1.1.0")
-        replaceVersion("kotlinx-html-shared", "1.1.0")
-        replaceVersion("kotlin-js-library", "1.1.0")
+        replaceVersion("kotlinx-html-js", "$html_version")
+        replaceVersion("kotlinx-html-shared", "$html_version")
+        replaceVersion("kotlin-js-library", "$kotlin_version")
 
         dependency("react")
         dependency("react-dom")
@@ -35,7 +33,7 @@ kotlinFrontend {
         devDependency("css-loader")
         devDependency("style-loader")
         devDependency("babel-loader")
-        devDependency("babel-core")
+        devDependency("@babel/core")
         devDependency("karma")
     }
 
@@ -65,9 +63,3 @@ sourceSets {
         resources.srcDirs += "testResources"
     }
 }
-
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
diff --git a/frontend/src/org/jetbrains/common/coroutines.kt b/frontend/src/org/jetbrains/common/coroutines.kt
deleted file mode 100644
index c7f7ce9..0000000
--- a/frontend/src/org/jetbrains/common/coroutines.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package kotlinx.coroutines.experimental
-
-import kotlin.coroutines.experimental.*
-import kotlin.js.Promise
-
-suspend fun <T> Promise<T>.await() = suspendCoroutine<T> { cont ->
-    then({ value -> cont.resume(value) },
-        { exception -> cont.resumeWithException(exception) })
-}
-
-fun <T> async(block: suspend () -> T): Promise<T> = Promise<T> { resolve, reject ->
-    block.startCoroutine(object : Continuation<T> {
-        override val context: CoroutineContext get() = EmptyCoroutineContext
-        override fun resume(value: T) { resolve(value) }
-        override fun resumeWithException(exception: Throwable) { reject(exception) }
-    })
-}
-
-fun launch(block: suspend () -> Unit) {
-    async(block).catch { exception -> console.log("Failed with $exception") }
-}
\ No newline at end of file
diff --git a/frontend/src/org/jetbrains/demo/thinkter/Application.kt b/frontend/src/org/jetbrains/demo/thinkter/Application.kt
index 4bd04b9..947633a 100644
--- a/frontend/src/org/jetbrains/demo/thinkter/Application.kt
+++ b/frontend/src/org/jetbrains/demo/thinkter/Application.kt
@@ -1,12 +1,22 @@
 package org.jetbrains.demo.thinkter
 
-import kotlinx.html.*
-import kotlinx.html.js.*
-import org.jetbrains.demo.thinkter.model.*
-import react.*
-import react.dom.*
-import kotlin.browser.*
-import kotlinx.coroutines.experimental.async
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import kotlinx.html.div
+import kotlinx.html.h1
+import kotlinx.html.js.onClickFunction
+import kotlinx.html.nav
+import org.jetbrains.demo.thinkter.model.Thought
+import org.jetbrains.demo.thinkter.model.User
+import react.RProps
+import react.RState
+import react.ReactComponentNoProps
+import react.ReactComponentSpec
+import react.dom.ReactDOM
+import react.dom.ReactDOMBuilder
+import react.dom.ReactDOMComponent
+import react.dom.render
+import kotlin.browser.document
 
 fun main(args: Array<String>) {
     runtime.wrappers.require("pure-blog.css")
@@ -20,6 +30,7 @@ fun main(args: Array<String>) {
 
 class Application : ReactDOMComponent<ReactComponentNoProps, ApplicationPageState>() {
     companion object : ReactComponentSpec<Application, ReactComponentNoProps, ApplicationPageState>
+
     val polling = Polling()
 
     init {
@@ -135,10 +146,10 @@ class Application : ReactDOMComponent<ReactComponentNoProps, ApplicationPageStat
     }
 
     private fun checkUserSession() {
-        async {
+        GlobalScope.async {
             val user = checkSession()
             onUserAssigned(user)
-        }.catch {
+        }.runCatching {
             setState {
                 selected = MainView.Home
             }
diff --git a/frontend/src/org/jetbrains/demo/thinkter/HomeView.kt b/frontend/src/org/jetbrains/demo/thinkter/HomeView.kt
index 4f42a87..5ee845c 100644
--- a/frontend/src/org/jetbrains/demo/thinkter/HomeView.kt
+++ b/frontend/src/org/jetbrains/demo/thinkter/HomeView.kt
@@ -1,10 +1,17 @@
 package org.jetbrains.demo.thinkter
 
-import kotlinx.html.*
-import org.jetbrains.demo.thinkter.model.*
-import react.*
-import react.dom.*
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.html.div
+import kotlinx.html.h2
+import kotlinx.html.h3
+import kotlinx.html.p
+import org.jetbrains.demo.thinkter.model.Thought
+import react.RProps
+import react.RState
+import react.ReactComponentSpec
+import react.dom.ReactDOMBuilder
+import react.dom.ReactDOMComponent
 
 class HomeView : ReactDOMComponent<HomeView.Props, HomeView.State>() {
     companion object : ReactComponentSpec<HomeView, Props, State>
@@ -13,8 +20,8 @@ class HomeView : ReactDOMComponent<HomeView.Props, HomeView.State>() {
         state = State(emptyList(), emptyList(), true, Polling.NewMessages.None)
     }
 
-    override fun componentWillMount() {
-        super.componentWillMount()
+    override fun componentDidMount() {
+        super.componentDidMount()
 
         props.polling.listeners.add(pollerHandler)
         loadHome()
@@ -48,7 +55,7 @@ class HomeView : ReactDOMComponent<HomeView.Props, HomeView.State>() {
     }
 
     private fun loadHome() {
-        launch {
+        GlobalScope.launch {
             val r = index()
             props.polling.start()
             setState {
@@ -59,7 +66,7 @@ class HomeView : ReactDOMComponent<HomeView.Props, HomeView.State>() {
         }
     }
 
-    private val pollerHandler = { m : Polling.NewMessages ->
+    private val pollerHandler = { m: Polling.NewMessages ->
         val oldMessages = state.newMessages
         setState {
             newMessages = m
diff --git a/frontend/src/org/jetbrains/demo/thinkter/Login.kt b/frontend/src/org/jetbrains/demo/thinkter/Login.kt
index 151cb31..3822a92 100644
--- a/frontend/src/org/jetbrains/demo/thinkter/Login.kt
+++ b/frontend/src/org/jetbrains/demo/thinkter/Login.kt
@@ -1,13 +1,16 @@
 package org.jetbrains.demo.thinkter
 
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
 import kotlinx.html.*
-import kotlinx.html.js.*
-import org.jetbrains.common.*
-import org.jetbrains.demo.thinkter.model.*
-import react.*
-import react.dom.*
-import kotlin.browser.*
-import kotlinx.coroutines.experimental.async
+import kotlinx.html.js.onChangeFunction
+import kotlinx.html.js.onClickFunction
+import org.jetbrains.common.inputValue
+import org.jetbrains.demo.thinkter.model.User
+import react.RState
+import react.ReactComponentSpec
+import react.dom.ReactDOMBuilder
+import react.dom.ReactDOMComponent
 
 class LoginComponent : ReactDOMComponent<UserProps, LoginFormState>() {
     companion object : ReactComponentSpec<LoginComponent, UserProps, LoginFormState>
@@ -69,10 +72,14 @@ class LoginComponent : ReactDOMComponent<UserProps, LoginFormState>() {
         setState {
             disabled = true
         }
-        async {
-            val user = login(state.login, state.password)
-            loggedIn(user)
-        }.catch { err -> loginFailed(err) }
+        try {
+            GlobalScope.async {
+                val user = login(state.login, state.password)
+                loggedIn(user)
+            }
+        } catch (err: Exception) {
+            loginFailed(err)
+        }
     }
 
     private fun loggedIn(user: User) {
diff --git a/frontend/src/org/jetbrains/demo/thinkter/NavBarComponent.kt b/frontend/src/org/jetbrains/demo/thinkter/NavBarComponent.kt
index 3c46bdc..867de98 100644
--- a/frontend/src/org/jetbrains/demo/thinkter/NavBarComponent.kt
+++ b/frontend/src/org/jetbrains/demo/thinkter/NavBarComponent.kt
@@ -1,11 +1,12 @@
 package org.jetbrains.demo.thinkter
 
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import kotlinx.html.*
 import kotlinx.html.js.*
 import org.jetbrains.demo.thinkter.model.*
 import react.*
 import react.dom.*
-import kotlinx.coroutines.experimental.launch
 
 class NavBarComponent : ReactDOMComponent<NavBarComponent.NavBarHandlerProps, NavBarComponent.NavBarState>() {
 
@@ -85,7 +86,7 @@ class NavBarComponent : ReactDOMComponent<NavBarComponent.NavBarHandlerProps, Na
     }
 
     private fun logout() {
-        launch {
+        GlobalScope.launch {
             logoutUser()
             props.logoutHandler()
         }
diff --git a/frontend/src/org/jetbrains/demo/thinkter/NewThoughtComponent.kt b/frontend/src/org/jetbrains/demo/thinkter/NewThoughtComponent.kt
index 738d2c3..b0c9af1 100644
--- a/frontend/src/org/jetbrains/demo/thinkter/NewThoughtComponent.kt
+++ b/frontend/src/org/jetbrains/demo/thinkter/NewThoughtComponent.kt
@@ -1,12 +1,18 @@
 package org.jetbrains.demo.thinkter
 
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
 import kotlinx.html.*
-import kotlinx.html.js.*
-import org.jetbrains.common.*
-import org.jetbrains.demo.thinkter.model.*
-import react.*
-import react.dom.*
-import kotlinx.coroutines.experimental.async
+import kotlinx.html.js.onChangeFunction
+import kotlinx.html.js.onClickFunction
+import org.jetbrains.common.inputValue
+import org.jetbrains.demo.thinkter.model.Thought
+import org.jetbrains.demo.thinkter.model.User
+import react.RProps
+import react.RState
+import react.ReactComponentSpec
+import react.dom.ReactDOMBuilder
+import react.dom.ReactDOMComponent
 
 class NewThoughtComponent : ReactDOMComponent<NewThoughtComponent.Props, NewThoughtComponent.State>() {
     companion object : ReactComponentSpec<NewThoughtComponent, Props, State>
@@ -27,7 +33,7 @@ class NewThoughtComponent : ReactDOMComponent<NewThoughtComponent.Props, NewThou
 
             props.replyTo?.let { replyTo ->
                 div {
-                    + "reply to ${replyTo.userId}"
+                    +"reply to ${replyTo.userId}"
                 }
             }
 
@@ -46,7 +52,7 @@ class NewThoughtComponent : ReactDOMComponent<NewThoughtComponent.Props, NewThou
             }
 
             button(classes = "pure-button pure-button-primary") {
-                + "Post"
+                +"Post"
 
                 onClickFunction = {
                     it.preventDefault()
@@ -57,11 +63,15 @@ class NewThoughtComponent : ReactDOMComponent<NewThoughtComponent.Props, NewThou
     }
 
     private fun doPostThought() {
-        async {
-            val token = postThoughtPrepare()
-            val thought = postThought(props.replyTo?.id, state.text, token)
-            onSubmitted(thought)
-        }.catch { err -> onFailed(err) }
+        try {
+            GlobalScope.async {
+                val token = postThoughtPrepare()
+                val thought = postThought(props.replyTo?.id, state.text, token)
+                onSubmitted(thought)
+            }
+        } catch (err: Exception) {
+            onFailed(err)
+        }
     }
 
     private fun onSubmitted(thought: Thought) {
diff --git a/frontend/src/org/jetbrains/demo/thinkter/Polling.kt b/frontend/src/org/jetbrains/demo/thinkter/Polling.kt
index 2f7af52..791d229 100644
--- a/frontend/src/org/jetbrains/demo/thinkter/Polling.kt
+++ b/frontend/src/org/jetbrains/demo/thinkter/Polling.kt
@@ -1,8 +1,9 @@
 package org.jetbrains.demo.thinkter
 
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import kotlin.browser.*
 import kotlin.js.*
-import kotlinx.coroutines.experimental.launch
 
 class Polling(val period: Int = 20000) {
     private var timerId = 0
@@ -27,7 +28,7 @@ class Polling(val period: Int = 20000) {
     }
 
     fun tick() {
-        launch {
+        GlobalScope.launch {
             val newMessagesText = pollFromLastTime(lastTime.toString())
             val newMessages = when {
                 newMessagesText == "0" || newMessagesText.isBlank() -> NewMessages.None
diff --git a/frontend/src/org/jetbrains/demo/thinkter/Register.kt b/frontend/src/org/jetbrains/demo/thinkter/Register.kt
index 1950b4c..9403a7f 100644
--- a/frontend/src/org/jetbrains/demo/thinkter/Register.kt
+++ b/frontend/src/org/jetbrains/demo/thinkter/Register.kt
@@ -1,13 +1,16 @@
 package org.jetbrains.demo.thinkter
 
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
 import kotlinx.html.*
-import kotlinx.html.js.*
-import org.jetbrains.common.*
-import org.jetbrains.demo.thinkter.model.*
-import react.*
-import react.dom.*
-import kotlin.browser.*
-import kotlinx.coroutines.experimental.async
+import kotlinx.html.js.onChangeFunction
+import kotlinx.html.js.onClickFunction
+import org.jetbrains.common.inputValue
+import org.jetbrains.demo.thinkter.model.User
+import react.RState
+import react.ReactComponentSpec
+import react.dom.ReactDOMBuilder
+import react.dom.ReactDOMComponent
 
 
 class RegisterComponent : ReactDOMComponent<UserProps, RegisterFormState>() {
@@ -73,7 +76,7 @@ class RegisterComponent : ReactDOMComponent<UserProps, RegisterFormState>() {
 
                 state.errorMessage?.takeIf(String::isNotEmpty)?.let { message ->
                     label {
-                        + message
+                        +message
                     }
                 }
 
@@ -94,12 +97,16 @@ class RegisterComponent : ReactDOMComponent<UserProps, RegisterFormState>() {
         setState {
             disabled = true
         }
-        async {
-            with(state) {
-                val user = register(login, password, displayName, email)
-                registered(user)
+        try {
+            GlobalScope.async {
+                with(state) {
+                    val user = register(login, password, displayName, email)
+                    registered(user)
+                }
             }
-        }.catch { err -> registrationFailed(err) }
+        } catch (err: Exception) {
+            registrationFailed(err)
+        }
     }
 
     private fun registered(user: User) {
diff --git a/frontend/src/org/jetbrains/demo/thinkter/Rpc.kt b/frontend/src/org/jetbrains/demo/thinkter/Rpc.kt
index 11bea90..4959184 100644
--- a/frontend/src/org/jetbrains/demo/thinkter/Rpc.kt
+++ b/frontend/src/org/jetbrains/demo/thinkter/Rpc.kt
@@ -1,6 +1,6 @@
 package org.jetbrains.demo.thinkter
 
-import kotlinx.coroutines.experimental.await
+import kotlinx.coroutines.await
 import org.jetbrains.demo.thinkter.model.*
 import org.w3c.dom.url.*
 import org.w3c.fetch.*
diff --git a/frontend/src/org/jetbrains/demo/thinkter/ViewThoughtComponent.kt b/frontend/src/org/jetbrains/demo/thinkter/ViewThoughtComponent.kt
index 51e635d..1701e22 100644
--- a/frontend/src/org/jetbrains/demo/thinkter/ViewThoughtComponent.kt
+++ b/frontend/src/org/jetbrains/demo/thinkter/ViewThoughtComponent.kt
@@ -1,13 +1,21 @@
 package org.jetbrains.demo.thinkter
 
-import kotlinx.html.*
-import kotlinx.html.js.*
-import org.jetbrains.demo.thinkter.model.*
-import react.*
-import react.dom.*
-import runtime.wrappers.*
-import kotlin.browser.*
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.html.a
+import kotlinx.html.div
+import kotlinx.html.js.onClickFunction
+import kotlinx.html.span
+import kotlinx.html.style
+import org.jetbrains.demo.thinkter.model.Thought
+import org.jetbrains.demo.thinkter.model.User
+import react.RProps
+import react.ReactComponentNoState
+import react.ReactComponentSpec
+import react.dom.ReactDOMBuilder
+import react.dom.ReactDOMComponent
+import runtime.wrappers.jsstyle
+import kotlin.browser.window
 
 class ViewThoughtComponent : ReactDOMComponent<ViewThoughtComponent.Props, ReactComponentNoState>() {
 
@@ -70,7 +78,7 @@ class ViewThoughtComponent : ReactDOMComponent<ViewThoughtComponent.Props, React
 
     private fun delete() {
         if (window.confirm("Do you want to delete the thought?")) {
-            launch {
+            GlobalScope.launch {
                 val token = postThoughtPrepare()
                 deleteThought(props.thought.id, token.date, token.code)
                 props.leave
diff --git a/frontend/src/org/jetbrains/react/ReactComponent.kt b/frontend/src/org/jetbrains/react/ReactComponent.kt
index 6b77bd6..b8b4e85 100644
--- a/frontend/src/org/jetbrains/react/ReactComponent.kt
+++ b/frontend/src/org/jetbrains/react/ReactComponent.kt
@@ -84,10 +84,6 @@ abstract class ReactComponent<P : RProps, S : RState> : ReactExtensionProvider {
 
     abstract fun render(): ReactElement?
 
-    open fun componentWillMount() {
-
-    }
-
     open fun componentDidMount() {
 
     }
@@ -104,14 +100,6 @@ abstract class ReactComponent<P : RProps, S : RState> : ReactExtensionProvider {
         return true
     }
 
-    open fun componentWillUpdate() {
-
-    }
-
-    open fun componentWillReceiveProps(nextProps: P) {
-
-    }
-
     override fun subscribe(listener: ReactComponentLifecycleListener) {
         wrapper.subscribers.add(listener)
     }
@@ -174,19 +162,6 @@ class ReactComponentWrapper<K, P : RProps, S : RState>(var props: P, val updater
         return delegate.shouldComponentUpdate(nextProps, nextState)
     }
 
-    @JsName("componentWillReceiveProps")
-    fun componentWillReceiveProps(nextProps: P) {
-        delegate.componentWillReceiveProps(nextProps)
-    }
-
-    @JsName("componentWillUpdate")
-    fun componentWillUpdate() {
-        subscribers.forEach {
-            it.reactComponentWillUpdate()
-        }
-        delegate.componentWillUpdate()
-    }
-
     @JsName("componentDidUpdate")
     fun componentDidUpdate(prevProps: P, prevState: S) {
         subscribers.forEach {
@@ -203,14 +178,6 @@ class ReactComponentWrapper<K, P : RProps, S : RState>(var props: P, val updater
         delegate.componentWillUnmount()
     }
 
-    @JsName("componentWillMount")
-    fun componentWillMount() {
-        subscribers.forEach {
-            it.reactComponentWillMount()
-        }
-        delegate.componentWillMount()
-    }
-
     @JsName("componentDidMount")
     fun componentDidMount() {
         subscribers.forEach {
diff --git a/frontend/src/org/jetbrains/react/ReactExtensions.kt b/frontend/src/org/jetbrains/react/ReactExtensions.kt
index 0e2cf47..68b2fa8 100644
--- a/frontend/src/org/jetbrains/react/ReactExtensions.kt
+++ b/frontend/src/org/jetbrains/react/ReactExtensions.kt
@@ -4,14 +4,10 @@ import kotlin.properties.*
 import kotlin.reflect.*
 
 interface ReactComponentLifecycleListener {
-    fun reactComponentWillUpdate()
-
     fun reactComponentDidUpdate(prevProps: RProps, prevState: RState)
 
     fun reactComponentWillUnmount()
 
-    fun reactComponentWillMount()
-
     fun reactComponentDidMount()
 }
 
@@ -23,10 +19,6 @@ interface ReactExtensionProvider {
 abstract class BaseReactExtension(val provider: ReactExtensionProvider) {
 
     private val listener = object : ReactComponentLifecycleListener {
-        override fun reactComponentWillUpdate() {
-            componentWillUpdate()
-        }
-
         override fun reactComponentDidUpdate(prevProps: RProps, prevState: RState) {
             componentDidUpdate(prevProps, prevState)
         }
@@ -36,10 +28,6 @@ abstract class BaseReactExtension(val provider: ReactExtensionProvider) {
             componentWillUnmount()
         }
 
-        override fun reactComponentWillMount() {
-            componentWillMount()
-        }
-
         override fun reactComponentDidMount() {
             componentDidMount()
         }
@@ -51,12 +39,8 @@ abstract class BaseReactExtension(val provider: ReactExtensionProvider) {
 
     open fun componentDidUpdate(prevProps: RProps, prevState: RState) {}
 
-    open fun componentWillUpdate() {}
-
     open fun componentWillUnmount() {}
 
-    open fun componentWillMount() {}
-
     open fun componentDidMount() {}
 }
 
diff --git a/frontend/src/org/jetbrains/react/dom/ReactDOMBuilder.kt b/frontend/src/org/jetbrains/react/dom/ReactDOMBuilder.kt
index c6f6e04..02e89c4 100644
--- a/frontend/src/org/jetbrains/react/dom/ReactDOMBuilder.kt
+++ b/frontend/src/org/jetbrains/react/dom/ReactDOMBuilder.kt
@@ -1,14 +1,16 @@
 package react.dom
 
 import kotlinx.html.*
-import org.w3c.dom.events.*
-import react.*
+import org.w3c.dom.events.Event
+import react.RProps
+import react.ReactBuilder
+import react.ReactElement
 
-class InnerHTML (
-    val __html: String
+class InnerHTML(
+        val __html: String
 )
 
-class DOMProps: RProps() {
+class DOMProps : RProps() {
     var dangerouslySetInnerHTML: InnerHTML? = null
 }
 
@@ -29,7 +31,7 @@ class ReactDOMBuilder : ReactBuilder(), TagConsumer<ReactElement?> {
     }
 */
 
-    override fun <P: RProps> createReactNode(type: Any, props: P) = Node(type, props)
+    override fun <P : RProps> createReactNode(type: Any, props: P) = Node(type, props)
 
     class DOMNode(val tagName: String) : Node<DOMProps>(tagName, DOMProps())
 
@@ -95,6 +97,10 @@ class ReactDOMBuilder : ReactBuilder(), TagConsumer<ReactElement?> {
         setProp(event, value)
     }
 
+    override fun onTagComment(content: CharSequence) {
+        // ignore
+    }
+
     override fun finalize(): ReactElement? {
         return result()
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 74bb778..06d0c4f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sat Nov 16 20:22:42 PST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

From 57bf0417a7071519f8eea38911d7e423a3693a35 Mon Sep 17 00:00:00 2001
From: ayvazj <james.ayvaz@gmail.com>
Date: Sat, 23 Nov 2019 23:57:15 -0800
Subject: [PATCH 2/2] Cleanup

---
 backend/build.gradle                                | 1 -
 backend/src/org/jetbrains/demo/thinkter/Register.kt | 2 +-
 frontend/build.gradle                               | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/build.gradle b/backend/build.gradle
index 724f8f1..99f8561 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -6,7 +6,6 @@ apply plugin: 'kotlin'
 apply plugin: 'application'
 
 dependencies {
-//    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
diff --git a/backend/src/org/jetbrains/demo/thinkter/Register.kt b/backend/src/org/jetbrains/demo/thinkter/Register.kt
index c109783..a6fa9ec 100644
--- a/backend/src/org/jetbrains/demo/thinkter/Register.kt
+++ b/backend/src/org/jetbrains/demo/thinkter/Register.kt
@@ -33,7 +33,7 @@ fun Route.register(dao: ThinkterStorage, hashFunction: (String) -> String) {
                     error = parameters["error"] ?: ""
             )
             if (form.password.length < 6) {
-                call.respond(LoginResponse(error = "Password should be at least 6 characters long ${form.password.length}"))
+                call.respond(LoginResponse(error = "Password should be at least 6 characters long"))
             } else if (form.userId.length < 4) {
                 call.respond(LoginResponse(error = "Login should be at least 4 characters long"))
             } else if (!userNameValid(form.userId)) {
diff --git a/frontend/build.gradle b/frontend/build.gradle
index fcc3de4..3741711 100644
--- a/frontend/build.gradle
+++ b/frontend/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'org.jetbrains.kotlin.frontend'
 
 dependencies {
     compile("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version")
-//    compile("org.jetbrains.kotlin:kotlin-test-js:$kotlin_version")
+    compile("org.jetbrains.kotlin:kotlin-test-js:$kotlin_version")
     compile("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$kotlin_coroutines_version")
     compile("org.jetbrains.kotlinx:kotlinx-html-js:$html_version")
 }