servant-auth-token 0.5.3.0 → 0.5.4.0
raw patch · 8 files changed
+59/−37 lines, 8 filesdep ~servantdep ~servant-server
Dependency ranges changed: servant, servant-server
Files
- CHANGELOG.md +5/−0
- example/acid/servant-auth-token-example-acid.cabal +4/−4
- example/acid/src/API.hs +11/−3
- example/acid/src/Server.hs +16/−0
- example/leveldb/servant-auth-token-example-leveldb.cabal +5/−5
- example/persistent/servant-auth-token-example-persistent.cabal +7/−7
- servant-auth-token.cabal +3/−3
- stack.yaml +8/−15
CHANGELOG.md view
@@ -1,3 +1,8 @@+0.5.4.0+=======++* Bump versions for `lts-12.9`.+ 0.5.3.0 =======
example/acid/servant-auth-token-example-acid.cabal view
@@ -25,21 +25,21 @@ build-depends: base >= 4.7 && < 5 , acid-state >= 0.14 && < 0.15- , aeson >= 0.11 && < 1.3+ , aeson >= 0.11 && < 1.4 , aeson-injector >= 1.1 && < 1.2 , bytestring >= 0.10 && < 0.11- , exceptions >= 0.8 && < 0.9+ , exceptions >= 0.8 && < 0.11 , http-types >= 0.9 && < 0.13 , monad-control >= 1.0 && < 1.1 , monad-logger >= 0.3 && < 0.4 , mtl >= 2.2 && < 2.3 , optparse-applicative >= 0.12 && < 0.15 , safecopy >= 0.9 && < 0.10- , servant >= 0.9 && < 0.14+ , servant >= 0.9 && < 0.15 , servant-auth-token >= 0.5 && < 0.6 , servant-auth-token-acid >= 0.5 && < 0.6 , servant-auth-token-api >= 0.5 && < 0.6- , servant-server >= 0.12 && < 0.14+ , servant-server >= 0.12 && < 0.15 , text >= 1.2 && < 1.3 , time >= 1.6 && < 1.9 , transformers-base >= 0.4 && < 0.5
example/acid/src/API.hs view
@@ -5,6 +5,14 @@ import Servant.API import Servant.API.Auth.Token -type ExampleAPI = "test"- :> TokenHeader' '["test-permission"]- :> Get '[JSON] ()+-- Your application endpoints+type ExampleEndpoint = "test"+ :> TokenHeader' '["test-permission"]+ :> Get '[JSON] ()++type ExampleAPI =+ ExampleEndpoint+ -- This is required for actual testing+ :<|> AuthSigninPostMethod+ :<|> AuthTouchMethod+ :<|> AuthSignoutMethod
example/acid/src/Server.hs view
@@ -12,10 +12,13 @@ import Control.Monad.IO.Class import Control.Monad.Logger+import Data.Aeson.Unit+import Data.Aeson.WithField import Data.Proxy import Network.Wai import Network.Wai.Handler.Warp import Network.Wai.Middleware.RequestLogger+import Servant.API import Servant.API.Auth.Token import Servant.Server import Servant.Server.Auth.Token@@ -42,9 +45,22 @@ -- | Implementation of main server API exampleServer :: ServerT ExampleAPI ServerM exampleServer = testEndpoint+ -- Pass though requests directly to the library in these endpoints+ :<|> authSigninPostProxy+ :<|> authTouchProxy+ :<|> authSignoutProxy testEndpoint :: MToken' '["test-permission"] -> ServerM () testEndpoint token = do runAuth $ guardAuthToken token $logInfo "testEndpoint" return ()++authSigninPostProxy :: AuthSigninPostBody -> ServerM (OnlyField "token" SimpleToken)+authSigninPostProxy AuthSigninPostBody{..} = runAuth $ authSignin (Just authSigninBodyLogin) (Just authSigninBodyPassword) authSigninBodySeconds++authTouchProxy :: Maybe Seconds -> MToken' '[] -> ServerM Unit+authTouchProxy mexpire token = runAuth $ authTouch mexpire token++authSignoutProxy :: MToken' '[] -> ServerM Unit+authSignoutProxy mtoken = runAuth $ authSignout mtoken
example/leveldb/servant-auth-token-example-leveldb.cabal view
@@ -24,10 +24,10 @@ build-depends: base >= 4.7 && < 5 , acid-state >= 0.14 && < 0.15- , aeson >= 0.11 && < 1.3+ , aeson >= 0.11 && < 1.4 , aeson-injector >= 1.1 && < 1.2 , bytestring >= 0.10 && < 0.11- , exceptions >= 0.8 && < 0.9+ , exceptions >= 0.8 && < 0.11 , http-types >= 0.9 && < 0.13 , leveldb-haskell >= 0.6 && < 0.7 , monad-control >= 1.0 && < 1.1@@ -35,11 +35,11 @@ , mtl >= 2.2 && < 2.3 , optparse-applicative >= 0.12 && < 0.15 , safecopy >= 0.9 && < 0.10- , servant >= 0.12 && < 0.14+ , servant >= 0.12 && < 0.15 , servant-auth-token >= 0.5 && < 0.6 , servant-auth-token-api >= 0.5 && < 0.6- , servant-auth-token-leveldb >= 0.5 && < 0.6- , servant-server >= 0.12 && < 0.14+ , servant-auth-token-leveldb >= 0.6 && < 0.7+ , servant-server >= 0.12 && < 0.15 , text >= 1.2 && < 1.3 , time >= 1.6 && < 1.9 , transformers-base >= 0.4 && < 0.5
example/persistent/servant-auth-token-example-persistent.cabal view
@@ -23,22 +23,22 @@ default-language: Haskell2010 build-depends: base >= 4.7 && < 5- , aeson >= 0.11 && < 1.3+ , aeson >= 0.11 && < 1.4 , aeson-injector >= 1.1 && < 1.2 , bytestring >= 0.10 && < 0.11- , exceptions >= 0.8 && < 0.9+ , exceptions >= 0.8 && < 0.11 , http-types >= 0.9 && < 0.13 , monad-control >= 1.0 && < 1.1 , monad-logger >= 0.3 && < 0.4 , mtl >= 2.2 && < 2.3 , optparse-applicative >= 0.12 && < 0.15- , persistent >= 2.6 && < 2.8- , persistent-postgresql >= 2.6 && < 2.8- , servant >= 0.12 && < 0.14+ , persistent >= 2.6 && < 2.9+ , persistent-postgresql >= 2.6 && < 2.9+ , servant >= 0.12 && < 0.15 , servant-auth-token >= 0.5 && < 0.6 , servant-auth-token-api >= 0.5 && < 0.6- , servant-auth-token-persistent >= 0.6 && < 0.7- , servant-server >= 0.12 && < 0.14+ , servant-auth-token-persistent >= 0.7 && < 0.8+ , servant-server >= 0.12 && < 0.15 , text >= 1.2 && < 1.3 , time >= 1.6 && < 1.9 , transformers-base >= 0.4 && < 0.5
servant-auth-token.cabal view
@@ -1,5 +1,5 @@ name: servant-auth-token-version: 0.5.3.0+version: 0.5.4.0 synopsis: Servant based API and server for token based authorisation description: Please see README.md homepage: https://github.com/ncrashed/servant-auth-token#readme@@ -67,9 +67,9 @@ , http-api-data >= 0.3.5 && < 0.4 , mtl >= 2.2 && < 2.3 , pwstore-fast >= 2.4 && < 2.5- , servant >= 0.11 && < 0.14+ , servant >= 0.11 && < 0.15 , servant-auth-token-api >= 0.5 && < 0.6- , servant-server >= 0.11 && < 0.14+ , servant-server >= 0.11 && < 0.15 , text >= 1.2 && < 1.3 , time >= 1.5 && < 1.9 , transformers >= 0.4 && < 0.6
stack.yaml view
@@ -15,7 +15,7 @@ # resolver: # name: custom-snapshot # location: "./custom-snapshot.yaml"-resolver: lts-10.5+resolver: lts-12.9 # User packages to be built. # Various formats can be used as shown in the example below.@@ -40,11 +40,10 @@ - 'servant-auth-token-acid' - 'servant-auth-token-persistent' - 'servant-auth-token-leveldb'-- 'servant-auth-token-rocksdb'+#- 'servant-auth-token-rocksdb' - 'example/acid' - 'example/persistent'-- 'example/leveldb'-#- '../safecopy'+#- 'example/leveldb' #- '../servant-auth-token-api' # - location: # git: https://github.com/NCrashed/servant-auth-token-api.git@@ -60,17 +59,10 @@ # (e.g., acme-missiles-0.3) extra-deps: - acid-state-0.14.3-- http-types-0.12.1+- aeson-injector-1.1.1.0+- pwstore-fast-2.4.4 - rocksdb-haskell-1.0.1-- safecopy-store-0.9.6-- servant-0.13-- servant-auth-token-api-0.5.2.0-- servant-client-0.13-- servant-docs-0.11.2-- servant-server-0.13-- servant-swagger-1.1.5-- singleton-bool-0.1.3-- text-1.2.3.0+- servant-auth-token-api-0.5.3.0 # Override default flag values for local packages and extra-deps flags: {}@@ -79,12 +71,13 @@ extra-package-dbs: [] nix:- enable: false packages: - zlib - postgresql96 - rocksdb - leveldb+#nix:+# shell-file: shell.nix # Control whether we use the GHC we find on the path # system-ghc: true