summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-27 16:36:05 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-27 16:41:35 -0400
commit27a301bf619edf027633d5f6267cad9806b4dbe8 (patch)
treeb6cf925a89e7f42cc8ec839e763fe6a810d943b2 /Assistant
parenta1c0d5a346aebf4a6f24ca28b98934283f6b9ec6 (diff)
webapp: full wormhole pairing UI (untested)
This commit was sponsored by Riku Voipio.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/WebApp.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs
index 928d0cdd3..dfb631bc6 100644
--- a/Assistant/Threads/WebApp.hs
+++ b/Assistant/Threads/WebApp.hs
@@ -36,6 +36,7 @@ import Assistant.WebApp.Documentation
import Assistant.WebApp.Control
import Assistant.WebApp.OtherRepos
import Assistant.WebApp.Repair
+import Assistant.WebApp.Pairing
import Assistant.Types.ThreadedMonad
import Utility.WebApp
import Utility.AuthToken
@@ -82,6 +83,7 @@ webAppThread assistantdata urlrenderer noannex cannotrun postfirstrun listenhost
<*> pure cannotrun
<*> pure noannex
<*> pure listenhost'
+ <*> newWormholePairingState
setUrlRenderer urlrenderer $ yesodRender webapp (pack "")
app <- toWaiAppPlain webapp
app' <- ifM debugEnabled