git.iko.soy/typeable/servant
on master help sign in
Fix compiler errors in servant-examples.
cf59abdArian van Putten
servant-examples/digest-auth/digest-auth.hsnew file+33
compare with master
unifiedsplit
@@ -0,0 +1,33 @@
1+{-#LANGUAGE DataKinds, TypeOperators, OverloadedStrings #-}
2+module Main where
3+
4+import Data.Text
5+import Data.ByteString (ByteString)
6+import Data.Proxy
7+import Servant.API
8+import Servant.API.Authentication
9+import Servant.Server
10+import Servant.Server.Internal.Authentication
11+import Network.Wai.Handler.Warp
12+
13+
14+data User = User
15+ { username :: ByteString
16+ , ha1 :: ByteString -- ^ MD5(username:realm:password)
17+ }
18+
19+
20+-- | A table with just one user. namely "username:foo:password"
21+table = [("username", User "username" "22f93fe54b9edf660a2f85310adc8a56")]
22+
23+type API = AuthProtect (DigestAuth "foo") User 'Strict :> "foo" :> Get '[JSON] Text
24+
25+api :: Server API
26+api = digestAuthStrict ha1 lookupUser (const . return $ "hello")
27+
28+lookupUser :: DigestAuth "foo" -> IO (Maybe User)
29+lookupUser authData = return . lookup (daUsername authData) $ table
30+
31+
32+main :: IO ()
33+main = run 8080 (serve (Proxy :: Proxy API) api)
servant-examples/tutorial/T9.hs+5−4
@@ -16,6 +16,7 @@ import Servant.JS
16import System.Random
16import System.Random
17
17
18import qualified Data.Text as T
18import qualified Data.Text as T
19+import qualified Data.Text.IO as TIO
19import qualified Language.Javascript.JQuery as JQ
20import qualified Language.Javascript.JQuery as JQ
20
21
21data Point = Point
22data Point = Point
@@ -91,14 +92,14 @@ server' :: Server API'
91server' = server
92server' = server
92 :<|> serveDirectory "tutorial/t9"
93 :<|> serveDirectory "tutorial/t9"
93
94
94−apiJS :: String
95+apiJS :: Text
95apiJS = jsForAPI api jquery
96apiJS = jsForAPI api jquery
96
97
97writeJSFiles :: IO ()
98writeJSFiles :: IO ()
98writeJSFiles = do
99writeJSFiles = do
99− writeFile "tutorial/t9/api.js" apiJS
100+ TIO.writeFile "tutorial/t9/api.js" apiJS
100− jq <- readFile =<< JQ.file
101+ jq <- TIO.readFile =<< JQ.file
101− writeFile "tutorial/t9/jq.js" jq
102+ TIO.writeFile "tutorial/t9/jq.js" jq
102
103
103app :: Application
104app :: Application
104app = serve api' server'
105app = serve api' server'