mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

unified AuthToken type between webapp and tor

Browse source
This commit is contained in:
Joey Hess 2016-11-22 14:18:34 -04:00
parent 57a9484fbc
commit af4d919793
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
10 changed files with 120 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Assistant/Threads/WebApp.hs
View file

@ -39,6 +39,7 @@ import Assistant.WebApp.OtherRepos
import Assistant.WebApp.Repair
import Assistant.Types.ThreadedMonad
import Utility.WebApp
import Utility.AuthToken
import Utility.Tmp
import Utility.FileMode
import Git
@ -75,7 +76,7 @@ webAppThread assistantdata urlrenderer noannex cannotrun postfirstrun listenhost
#endif
webapp <- WebApp
<$> pure assistantdata
<*> genAuthToken
<*> genAuthToken 512
<*> getreldir
<*> pure staticRoutes
<*> pure postfirstrun

2
Assistant/WebApp.hs
View file

@ -14,7 +14,7 @@ import Assistant.WebApp.Types
import Assistant.Common
import Utility.NotificationBroadcaster
import Utility.Yesod
import Utility.WebApp
import Utility.AuthToken
import Data.Text (Text)
import Control.Concurrent

1
Assistant/WebApp/Notifications.hs
View file

@ -17,6 +17,7 @@ import Assistant.Types.Buddies
import Utility.NotificationBroadcaster
import Utility.Yesod
import Utility.WebApp
import Utility.AuthToken
import Data.Text (Text)
import qualified Data.Text as T

1
Assistant/WebApp/Types.hs
View file

@ -20,6 +20,7 @@ import Assistant.Ssh
import Assistant.Pairing
import Assistant.Types.Buddies
import Utility.NotificationBroadcaster
import Utility.AuthToken
import Utility.WebApp
import Utility.Yesod
import Types.Transfer