swagger now includes UI

app/Main.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE AllowAmbiguousTypes #-}
 module Main where
 
 import Prelude as P
@@ -12,6 +13,8 @@ import Prelude as P
 import Servant
 import Servant.Server.Experimental.Auth
 import qualified Servant.OpenApi as OA
+import Servant.Swagger.UI
+import Servant.Swagger.UI.Core
 import Servant.RawM
 
 import Data.Set as S (empty)
@@ -24,6 +27,7 @@ import Data.IP
 import qualified Data.OpenApi as OA hiding (Server)
 import Data.Typeable
 import Data.Data (Typeable)
+import Data.Tagged
 
 import Database.PostgreSQL.Simple
 import Database.PostgreSQL.Simple.Migration
@@ -60,6 +64,7 @@ import Janitor
 -- import Middleware
 
 import Paths_mateamt (version)
+import Control.Monad.Except (runExceptT)
 
 main :: IO ()
 main = do
@@ -163,13 +168,21 @@ main = do
 app :: ReadState -> Application
 -- app conn = serveWithContext userApi genAuthServerContext (users conn)
 app initState = 
-  serveWithContext combinedAPI (genAuthServerContext (rsConnection initState)) $
+  serveWithContext combinedAPI (genAuthServerContext (rsConnection initState)) server
+  where
+    server :: Server CombinedAPI
+    server = appToServer initState mateAPI thisApi :<|>
+      swaggerSchemaUIServer mateSwagger
+
+appToServer initState myApi =
       hoistServerWithContext
-      combinedAPI
+        myApi
         authProxy
         (`runReaderT` initState)
-      ( mateSwagger :<|>
+
-        ( authGet :<|>
+thisApi :: ServerT MateAPI MateHandler
+thisApi =
+  authGet :<|>
   authSend :<|>
   authLogout :<|>
 
@@ -210,11 +223,9 @@ app initState =
   roleAssociationDelete :<|>
 
   metaGet
-        )
-      )
 
-mateSwagger :: ReaderT ReadState Handler OA.OpenApi
+mateSwagger :: OA.OpenApi
-mateSwagger = return $ OA.toOpenApi mateAPI
+mateSwagger = OA.toOpenApi mateAPI
   & OA.info.OA.title .~ "Mateamt API"
   & OA.info.OA.version .~ "1.0"
   & OA.info.OA.description ?~ "AN API to buy Mate and other products from your local Hackerspace or event."
@@ -229,7 +240,7 @@ swaggerAPI = Proxy
 combinedAPI :: Proxy CombinedAPI
 combinedAPI = Proxy
 
-type CombinedAPI = SwaggerAPI :<|> MateAPI
+type CombinedAPI = MateAPI :<|> SwaggerSchemaUI "swagger-ui" "swagger.json"
 
 authProxy :: Proxy '[ AuthHandler Request (Maybe (Int, AuthMethod)) ]
 authProxy = Proxy

mateamt.cabal

@@ -149,6 +149,8 @@ executable mateamt
     , servant-server
     , servant-rawm
     , servant-openapi3
+    , servant-swagger-ui
+    , servant-swagger-ui-core
     , warp
     , wai
     , wai-logger
@@ -158,6 +160,7 @@ executable mateamt
     , case-insensitive
     , iproute
     , clock
+    , tagged
 
   hs-source-dirs:   app
   default-language: Haskell2010

src/API.hs

@@ -16,8 +16,6 @@ import Data.Proxy
 import Servant.RawM
 import Servant.RawM.Server ()
 
-import Network.Wai (Application)
-
 -- internal imports
 
 import Types