summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2015-10-13 21:36:17 -0400
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2015-10-13 21:36:17 -0400
commitd03d0809cc25425ff2efe6bec7d506f128a6bf3c (patch)
treee4426ee233aee75bb20a0002dc360284a00551f4
parent797a81e3789ab2b6748e60cf76d63d46bad616e2 (diff)
Haskell cleanup.
-rw-r--r--src/Main.hs15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/Main.hs b/src/Main.hs
index 97c849c..1a491bd 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -5,7 +5,7 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE TemplateHaskell #-}
-module Main where
+module Main (main) where
import Control.Concurrent.MVar
import Control.Monad
@@ -20,7 +20,7 @@ import Network.Wai.Middleware.RequestLogger
import Servant
import System.Exit
import System.IO.Unsafe (unsafePerformIO)
-import Data.List.Split
+import Data.List.Split (splitOn)
import qualified Authentication
import Data
@@ -43,13 +43,13 @@ data RenameRequest = RenameRequest
instance FromJSON RenameRequest
instance ToJSON RenameError
-type WithAuthentication = Header "X-Token" String
+type AuthenticationHeader = Header "X-Token" String
type PhotoApi =
"albums"
- :> WithAuthentication
+ :> AuthenticationHeader
:> Get '[JSON] [Album]
:<|> "rename"
- :> WithAuthentication
+ :> AuthenticationHeader
:> ReqBody '[JSON] RenameRequest
:> Post '[JSON] (Either RenameError ())
@@ -81,15 +81,10 @@ server = albums
photoApi :: Proxy PhotoApi
photoApi = Proxy
-
-app :: Application
app = logStdoutDev $ serve photoApi server
port = 8081
-settings :: Settings
settings = setHost "*6" . setPort 8081 $ defaultSettings
-
-main :: IO ()
main = do
$initHFlags "photos"
print $ splitOn "," flags_allowed_users