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
@@ -162,59 +167,65 @@ main = do
 
 app :: ReadState -> Application
 -- app conn = serveWithContext userApi genAuthServerContext (users conn)
-app initState =
+app initState = 
-  serveWithContext combinedAPI (genAuthServerContext (rsConnection initState)) $
+  serveWithContext combinedAPI (genAuthServerContext (rsConnection initState)) server
-    hoistServerWithContext
+  where
-      combinedAPI
+    server :: Server CombinedAPI
-      authProxy
+    server = appToServer initState mateAPI thisApi :<|>
-      (`runReaderT` initState)
+      swaggerSchemaUIServer mateSwagger
-      ( mateSwagger :<|>
-        ( authGet :<|>
-          authSend :<|>
-          authLogout :<|>
 
-          authManageList :<|>
+appToServer initState myApi =
-          authManageNewAuth :<|>
+      hoistServerWithContext
-          authManageDeleteAuth :<|>
+        myApi
+        authProxy
+        (`runReaderT` initState)
 
-          userNew :<|>
+thisApi :: ServerT MateAPI MateHandler
-          userGet :<|>
+thisApi =
-          userUpdate :<|>
+  authGet :<|>
-          userList :<|>
+  authSend :<|>
-          userRecharge :<|>
+  authLogout :<|>
-          userTransfer :<|>
 
-          productNew :<|>
+  authManageList :<|>
-          productOverview :<|>
+  authManageNewAuth :<|>
-          productStockRefill :<|>
+  authManageDeleteAuth :<|>
-          productStockUpdate :<|>
-          productList :<|>
-          productShortList :<|>
 
-          buy :<|>
+  userNew :<|>
+  userGet :<|>
+  userUpdate :<|>
+  userList :<|>
+  userRecharge :<|>
+  userTransfer :<|>
 
-          journalShow :<|>
+  productNew :<|>
-          journalCheck :<|>
+  productOverview :<|>
+  productStockRefill :<|>
+  productStockUpdate :<|>
+  productList :<|>
+  productShortList :<|>
 
-          avatarGet :<|>
+  buy :<|>
-          avatarInsert :<|>
-          avatarUpdate :<|>
-          avatarList :<|>
 
-          roleList :<|>
+  journalShow :<|>
-          roleNew :<|>
+  journalCheck :<|>
-          roleUpdate :<|>
-          roleDelete :<|>
-          roleAssociationList :<|>
-          roleAssociationSubmit :<|>
-          roleAssociationDelete :<|>
 
-          metaGet
+  avatarGet :<|>
-        )
+  avatarInsert :<|>
-      )
+  avatarUpdate :<|>
+  avatarList :<|>
 
-mateSwagger :: ReaderT ReadState Handler OA.OpenApi
+  roleList :<|>
-mateSwagger = return $ OA.toOpenApi mateAPI
+  roleNew :<|>
+  roleUpdate :<|>
+  roleDelete :<|>
+  roleAssociationList :<|>
+  roleAssociationSubmit :<|>
+  roleAssociationDelete :<|>
+
+  metaGet
+
+mateSwagger :: OA.OpenApi
+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