WIP ghcjs

stylish-haskell changes
Overrides for ghcjs
2018-12-19 00:24:11 +02:00 · 2018-12-15 23:31:30 +02:00 · 2018-11-14 00:20:00 +02:00 · 2018-11-13 00:21:20 +02:00 · 2018-11-12 23:56:30 +02:00 · 2018-11-12 23:40:04 +02:00
45 changed files with 1074 additions and 478 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,6 @@
 dist/
 config/config.dhall
+/ctags
+/TAGS
+/result*
+/backend/config
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,12 @@
+language: nix
+
+os:
+  - linux
+
+before_script:
+  - mkdir -m 0755 -p /nix/var/nix/{profiles,gcroots}/per-user/$USER
+  - mkdir -p ~/.config/nixpkgs
+
+script:
+  - nix-build ./release.nix --option trusted-public-keys "masser-ebook-manager.cachix.org-1:mtFSkQ2MO5MvjUpulZoFKjKUIa8g8CTcdPVuJaPKS1w= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" --option binary-caches "https://cache.nixos.org https://masser-ebook-manager.cachix.org" -A ghc.backend -A ghc.frontend
+  - nix-build ./release.nix --option trusted-public-keys "masser-ebook-manager.cachix.org-1:mtFSkQ2MO5MvjUpulZoFKjKUIa8g8CTcdPVuJaPKS1w= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" --option binary-caches "https://cache.nixos.org https://masser-ebook-manager.cachix.org" -A ghcjs.frontend
--- a/backend/ChangeLog.md
+++ b/backend/ChangeLog.md
@ -0,0 +1,5 @@
+# Revision history for backend
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
--- a/backend/LICENSE
+++ b/backend/LICENSE
@ -0,0 +1,30 @@
+Copyright (c) 2018, Mats Rauhala
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Mats Rauhala nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/backend/Setup.hs
+++ b/backend/Setup.hs
@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
--- a/backend/backend.cabal
+++ b/backend/backend.cabal
@ -1,7 +1,7 @@
-- Initial ebook-manager.cabal generated by cabal init.  For further
+-- Initial backend.cabal generated by cabal init.  For further
 -- documentation, see http://haskell.org/cabal/users-guide/

-name:                ebook-manager
+name:                backend
 version:             0.1.0.0
 -- synopsis:
 -- description:
@ -15,7 +15,7 @@ build-type:          Simple
 extra-source-files:  ChangeLog.md
 cabal-version:       >=1.10

-executable ebook-manager
+executable backend
  main-is:             Main.hs
  other-modules:       Devel.Main
                     , API
@ -23,8 +23,6 @@ executable ebook-manager
                     , API.Catalogue
                     , API.Channels
                     , API.Users
-                     , Configuration
-                     , Data.Versioned
                     , Database
                     , Database.Book
                     , Database.Channel
@ -38,7 +36,66 @@ executable ebook-manager
                     , Types
                     , View
  -- other-extensions:
-  build-depends:       base >=4.10 && <4.11
+  build-depends:       base >=4.10
+                     , exceptions
+                     , monad-control
+                     , common
+                     , aeson
+                     , asn1-data
+                     , asn1-types
+                     , bytestring
+                     , classy-prelude
+                     , cryptonite
+                     , dhall
+                     , directory
+                     , foreign-store
+                     , generic-lens
+                     , http-api-data
+                     , http-media
+                     , jose
+                     , lens
+                     , lucid
+                     , memory
+                     , monad-logger
+                     , mtl
+                     , pandoc
+                     , pandoc-types
+                     , pem
+                     , process
+                     , resource-pool
+                     , selda
+                     , selda-postgresql
+                     , servant
+                     , servant-auth
+                     , servant-auth-server
+                     , servant-auth-docs
+                     , servant-docs
+                     , servant-lucid
+                     , servant-multipart
+                     , servant-server
+                     , text
+                     , transformers
+                     , wai
+                     , warp
+                     , x509
+                     , x509-store
+                     , xml-conduit
+                     , xml-hamlet
+  hs-source-dirs:      src
+  default-language:    Haskell2010
+  default-extensions:  DeriveGeneric
+                     , NoImplicitPrelude
+                     , OverloadedStrings
+                     , RecordWildCards
+
+test-suite spec
+  type:                exitcode-stdio-1.0
+  main-is:             Spec.hs
+  hs-source-dirs:      src
+  build-depends:       base >=4.10
+                     , exceptions
+                     , monad-control
+                     , common
                     , aeson
                     , asn1-data
                     , asn1-types
@ -68,21 +125,24 @@ executable ebook-manager
                     , servant-auth
                     , servant-auth-server
                     , servant-docs
+                     , servant-auth-docs
                     , servant-lucid
                     , servant-multipart
                     , servant-server
                     , text
                     , transformers
-                     , uuid
                     , wai
                     , warp
                     , x509
                     , x509-store
                     , xml-conduit
                     , xml-hamlet
-  hs-source-dirs:      src
+                     , validity
+                     , genvalidity-hspec
+                     , genvalidity-property
+                     , genvalidity-text
+                     , hspec
  default-extensions:  DeriveGeneric
                     , NoImplicitPrelude
                     , OverloadedStrings
                     , RecordWildCards
-  default-language:    Haskell2010
--- a/backend/src/API.hs
+++ b/backend/src/API.hs
@ -0,0 +1,48 @@
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE DeriveGeneric         #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE QuasiQuotes           #-}
+{-# LANGUAGE RecordWildCards       #-}
+{-# LANGUAGE TemplateHaskell       #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE TypeOperators         #-}
+module API (API, handler) where
+
+
+import           Servant
+import           Servant.HTML.Lucid (HTML)
+import           Types
+
+import           View
+
+import qualified API.Books          as Books
+import qualified API.Catalogue      as Catalogue
+import qualified API.Channels       as Channels
+import qualified API.Users          as Users
+
+data Index = Index
+
+type API = Users.API
+      :<|> "api" :> "current" :> Channels.API
+      :<|> "api" :> "current" :> Books.API
+      :<|> "api" :> "1" :> Catalogue.VersionedAPI 1
+      :<|> "api" :> "current" :> Catalogue.VersionedAPI 1
+
+handler :: ServerT API AppM
+handler = Users.handler
+    :<|> Channels.handler
+    :<|> Books.handler
+    :<|> Catalogue.handler
+    :<|> Catalogue.handler
+
+instance ToHtml Index where
+  toHtml _ = do
+    h1_ [class_ "title"] "Home page"
+    p_ [class_ "subtitle"] "Hello world"
+  toHtmlRaw = toHtml
+
+indexHandler :: AppM (AppView Index)
+indexHandler = mkView "Home" Index
--- a/backend/src/API/Books.hs
+++ b/backend/src/API/Books.hs
@ -0,0 +1,129 @@
+{-# LANGUAGE DataKinds                  #-}
+{-# LANGUAGE DeriveGeneric              #-}
+{-# LANGUAGE DuplicateRecordFields      #-}
+{-# LANGUAGE FlexibleInstances          #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE MultiParamTypeClasses      #-}
+{-# LANGUAGE NamedFieldPuns             #-}
+{-# LANGUAGE NoImplicitPrelude          #-}
+{-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE QuasiQuotes                #-}
+{-# LANGUAGE RecordWildCards            #-}
+{-# LANGUAGE TemplateHaskell            #-}
+{-# LANGUAGE TypeApplications           #-}
+{-# LANGUAGE TypeFamilies               #-}
+{-# LANGUAGE TypeOperators              #-}
+module API.Books where
+
+import           ClassyPrelude
+import           Control.Lens
+import           Control.Monad.Catch       (MonadThrow, throwM)
+import           Control.Monad.Trans.Maybe
+import           Crypto.Hash               (digestFromByteString)
+import           Data.Aeson
+import           Data.ByteArray            (convert)
+import           Data.Generics.Product
+import           Database
+import           Database.Book
+import           Database.Channel
+import           Database.Tag
+import qualified Datastore                 as DS
+import           Servant                   hiding (contentType)
+import           Servant.Auth              as SA
+import qualified Servant.Docs              as Docs
+import           Server.Auth
+import           Types
+
+data JsonBook = JsonBook { identifier  :: BookID
+                         , contentType :: Text
+                         , title       :: Text
+                         , description :: Maybe Text
+                         , channels    :: [Text]
+                         , tags        :: [Text] }
+              deriving (Generic, Show, Eq)
+
+instance Docs.ToSample JsonBook where
+  toSamples _ = [("Book", JsonBook 13 "epub" "title" (Just "Description") [] [])]
+
+instance Docs.ToSample PostBook where
+  toSamples _ = [("Book", PostBook "epub" "title" (Just "Description") [] [])]
+
+data PostBook = PostBook { contentType :: Text
+                         , title       :: Text
+                         , description :: Maybe Text
+                         , channels    :: [Text]
+                         , tags        :: [Text] }
+              deriving (Generic, Show, Eq)
+
+
+instance ToJSON JsonBook
+instance FromJSON JsonBook
+instance ToJSON PostBook
+instance FromJSON PostBook
+
+type API = Auth '[SA.BasicAuth, SA.JWT] SafeUser :> BaseAPI
+
+instance Docs.ToCapture (Capture "book_id" BookID) where
+  toCapture _ = Docs.DocCapture "book_id" "The book id"
+
+type BaseAPI = "books" :> Get '[JSON] [JsonBook]
+       :<|> "books" :> ReqBody '[JSON] PostBook :> Post '[JSON] JsonBook
+       :<|> "books" :> Capture "book_id" BookID :> "meta" :> ReqBody '[JSON] JsonBook :> Put '[JSON] JsonBook
+       :<|> "books" :> Capture "book_id" BookID :> ReqBody '[OctetStream] FileContent :> Put '[JSON] NoContent
+       :<|> GetBook
+
+newtype FileContent = FileContent { getFileContent :: ByteString } deriving (MimeUnrender OctetStream, MimeRender OctetStream )
+
+instance Docs.ToSample FileContent where
+  toSamples _ = [("File contents", FileContent "bytes here and there")]
+
+type GetBook = "books" :> Capture "book_id" BookID :> Get '[OctetStream] FileContent
+
+handler :: ServerT API AppM
+handler user = listBooksHandler user
+          :<|> postBookMetaHandler user
+          :<|> putBookMetaHandler user
+          :<|> putBookContentHandler user
+          :<|> getBookContentHandler user
+
+getBookContentHandler :: AuthResult SafeUser -> BookID -> AppM FileContent
+getBookContentHandler auth bookId = requireBookOwner auth bookId $ \SafeUser{username} -> do
+  content <- runMaybeT $ do
+    Book{contentHash=mHash} <- MaybeT $ runDB (getBook bookId username)
+    contentHash <- MaybeT $ return (mHash >>= digestFromByteString . unHex)
+    FileContent <$> MaybeT (DS.get contentHash)
+  maybe (throwM err404) return content
+
+requireBookOwner :: AuthResult SafeUser -> BookID -> (SafeUser -> AppM a) -> AppM a
+requireBookOwner auth bookId f = flip requireLoggedIn auth $ \u@SafeUser{username} -> do
+  exists <- runDB $ bookExists bookId
+  unless exists $ throwM err404
+  runDB (isBookOwner bookId username) >>= \o -> if o then f u else throwM err403
+
+putBookContentHandler :: AuthResult SafeUser -> BookID -> FileContent -> AppM NoContent
+putBookContentHandler auth bookId fc = requireBookOwner auth bookId $ \SafeUser{username} -> do
+  let content = getFileContent fc
+  key <- HashDigest . convert <$> DS.put content
+  runDB (setContent bookId username key)
+  return NoContent
+
+postBookMetaHandler :: AuthResult SafeUser -> PostBook -> AppM JsonBook
+postBookMetaHandler auth PostBook{..} = flip requireLoggedIn auth $ \SafeUser{username} -> do
+  mIdentifier <- runDB $ insertBook InsertBook{owner=username,..}
+  maybe (throwM err403{errBody="Could not insert book"}) (\identifier -> pure JsonBook{..}) mIdentifier
+
+
+putBookMetaHandler :: AuthResult SafeUser -> BookID -> JsonBook -> AppM JsonBook
+putBookMetaHandler auth bookId JsonBook{..}
+  | bookId == identifier = requireBookOwner auth bookId $ \SafeUser{username=owner} ->
+        maybe (throwM err403) (return . view (super @JsonBook)) =<< runDB (updateBook UpdateBook{..})
+  | otherwise = throwM err403
+
+listBooksHandler :: AuthResult SafeUser -> AppM [JsonBook]
+listBooksHandler = requireLoggedIn $ \user -> do
+  runDB (usersBooks (view (field @"username") user) >>= mapM augment)
+    where
+      augment Book{identifier=bookId,contentType,title,description} = do
+        channels <- fmap (view (field @"channel")) <$> booksChannels bookId
+        tags <- fmap (view (field @"tag")) <$> booksTags bookId
+        pure JsonBook{identifier=bookId,..}
--- a/backend/src/API/Catalogue.hs
+++ b/backend/src/API/Catalogue.hs
@ -16,15 +16,19 @@
 {-# Language ScopedTypeVariables #-}
 module API.Catalogue (VersionedAPI, handler) where

-import Types
-import Servant
-import ClassyPrelude
-import GHC.TypeLits
-import Server.Auth
-import Servant.Auth as SA
-import Servant.XML
+import qualified API.Books
+import           ClassyPrelude
+import           Database
+import           Database.Book (Book(..))
 import qualified Database.Channel as Channel
-import Database
+import           GHC.TypeLits
+import           Servant hiding (contentType)
+import           Servant.Auth as SA
+import qualified Servant.Docs as Docs
+import           Servant.XML
+import           Server.Auth
+import           System.IO.Unsafe (unsafePerformIO)
+import           Types

 -- This is my first try on going to versioned apis, things might change
 -- I think my rule of thumb is that you can add new things as you want, but
@ -38,7 +42,7 @@ newtype Rel = Rel { unRel :: Text } deriving (IsString, Show)

 data Pagination = Pagination { previous :: Maybe Rel
                             , next :: Maybe Rel }
-                deriving (Show)
+                deriving (Show, Generic)

 newtype SubSection = SubSection Rel deriving (Show)
 newtype Acquisition = Acquisition Rel deriving (Show)
@ -62,6 +66,20 @@ deriving instance Show (Entry 1)
 deriving instance Generic (Catalog 1)
 deriving instance Generic (Entry 1)

+instance Docs.ToSample (Entry 1) where
+  toSamples _ = [("Entry", EntryV1 "title" "identifier" docsTime "content" (Left (SubSection (Rel "sub"))))]
+instance Docs.ToSample UTCTime where
+  toSamples _ = [("time", docsTime)]
+instance Docs.ToSample Rel where
+  toSamples _ = [("Relative link", Rel "next")]
+instance Docs.ToSample Pagination
+instance Docs.ToSample (Catalog 1) -- where
+  -- toSamples _ = [("catalog", CatalogV1 docsTime (Rel "prev") (Rel "next") (Pagination (Just "previous") (Just "next")) [])]
+
+docsTime :: UTCTime
+docsTime = unsafePerformIO getCurrentTime
+  
+
 instance ToNode SubSection where
  toNode (SubSection rel) = [xml|<link type="application/atom+xml;profile=opds-catalog;kind=acquisition" rel="subsection" href="#{unRel rel}">|]

@ -96,30 +114,57 @@ instance ToNode (Catalog 1) where

 class Monad m => VersionedCatalog m (v :: Nat) where
  getChannels :: SafeUser -> m (Catalog v)
+  getBooks :: Channel.ChannelID -> SafeUser -> m (Catalog v)

 instance VersionedCatalog AppM 1 where
-  getChannels SafeUser{username} = do
-    updated <- liftIO getCurrentTime
-    let self = Rel ("/api/current/" <> selfUrl)
-        -- I'm not sure if this safe link approach is really useable with this
-        -- api hierarchy since I can't access the topmost api from here. Also
-        -- authentication would bring a little bit of extra effort as well
-        selfUrl = pack . uriPath . linkURI $ safeLink (Proxy @(BaseAPI 1)) (Proxy @(RootCatalog 1))
-        start = self
-        pagination = Pagination Nothing Nothing
-    entries <- map (fromChannel updated) <$> runDB (Channel.userChannels username)
-    pure CatalogV1{..}
-    where
-      fromChannel :: UTCTime -> Channel.Channel -> Entry 1
-      fromChannel updated Channel.Channel{..} =
-        let url = pack . uriPath . linkURI $ safeLink (Proxy @(BaseAPI 1)) (Proxy @(ChannelCatalog 1)) identifier
-            self = Rel ("/api/current/" <> url)
-        in EntryV1 channel channel updated channel (Left $ SubSection self)
+  getChannels = getChannelsV1
+  getBooks = getBooksV1
+
+relUrl :: Link -> Rel
+relUrl x = Rel ("/api/current/" <> (pack . uriPath . linkURI $ x))
+
+getBooksV1 :: Channel.ChannelID -> SafeUser -> AppM (Catalog 1)
+getBooksV1 channelID SafeUser{username} = do
+  updated <- liftIO getCurrentTime
+  let self = relUrl selfUrl
+      start = relUrl startUrl
+      selfUrl = safeLink (Proxy @(BaseAPI 1)) (Proxy @(ChannelCatalog 1)) channelID
+      startUrl = safeLink (Proxy @(BaseAPI 1)) (Proxy @(RootCatalog 1))
+      pagination = Pagination Nothing Nothing
+  entries <- map (toEntry updated) <$> runDB (Channel.channelBooks username channelID)
+  pure CatalogV1{..}
+  where
+    toEntry updated Book{description,title,identifier=bookId} =
+      let content = fromMaybe "no content" description
+          identifier = pack . show $ bookId
+          link = Right (Acquisition (relUrl (safeLink (Proxy @API.Books.BaseAPI) (Proxy @API.Books.GetBook) bookId)))
+      in EntryV1{..}
+
+getChannelsV1 :: SafeUser -> AppM (Catalog 1)
+getChannelsV1 SafeUser{username} = do
+  updated <- liftIO getCurrentTime
+  let self = relUrl selfUrl
+      -- I'm not sure if this safe link approach is really useable with this
+      -- api hierarchy since I can't access the topmost api from here. Also
+      -- authentication would bring a little bit of extra effort as well
+      selfUrl = safeLink (Proxy @(BaseAPI 1)) (Proxy @(RootCatalog 1))
+      start = self
+      pagination = Pagination Nothing Nothing
+  entries <- map (fromChannel updated) <$> runDB (Channel.userChannels username)
+  pure CatalogV1{..}
+  where
+    fromChannel :: UTCTime -> Channel.Channel -> Entry 1
+    fromChannel updated Channel.Channel{..} =
+      let url = safeLink (Proxy @(BaseAPI 1)) (Proxy @(ChannelCatalog 1)) identifier
+          self = relUrl url
+      in EntryV1 channel channel updated channel (Left $ SubSection self)

 type VersionedAPI (v :: Nat) = Auth '[SA.BasicAuth, SA.JWT] SafeUser :> BaseAPI v

-type RootCatalog (v :: Nat) = "catalog" :> Get '[XML] (Catalog v)
-type ChannelCatalog (v :: Nat) = "catalog" :> "channel" :> Capture "channel_id" Channel.ChannelID :> Get '[XML] (Catalog v)
+type CatalogContent = '[XML, OPDS]
+
+type RootCatalog (v :: Nat) = "catalog" :> Get CatalogContent (Catalog v)
+type ChannelCatalog (v :: Nat) = "catalog" :> "channel" :> Capture "channel_id" Channel.ChannelID :> Get CatalogContent (Catalog v)
 type BaseAPI (v :: Nat) = RootCatalog v
                    :<|> ChannelCatalog v

@ -127,6 +172,8 @@ handler :: forall v. VersionedCatalog AppM v => ServerT (VersionedAPI v) AppM
 handler auth = catalogRoot :<|> catalogChannels
  where
    catalogChannels :: Channel.ChannelID -> AppM (Catalog v)
-    catalogChannels _ = throwM err403{errBody="Not implemented"}
+    -- Channel specific catalog returns tags inside the catalog
+    catalogChannels identifier = flip requireLoggedIn auth (getBooks identifier)
    catalogRoot :: AppM (Catalog v)
+    -- catalog root returns channels
    catalogRoot = flip requireLoggedIn auth getChannels
--- a/backend/src/API/Channels.hs
+++ b/backend/src/API/Channels.hs
@ -1,40 +1,47 @@
-{-# Language DataKinds #-}
-{-# Language TypeFamilies #-}
-{-# Language TypeOperators #-}
-{-# Language NoImplicitPrelude #-}
-{-# Language MultiParamTypeClasses #-}
-{-# Language OverloadedStrings #-}
-{-# Language TemplateHaskell #-}
-{-# Language QuasiQuotes #-}
-{-# Language RecordWildCards #-}
-{-# Language DeriveGeneric #-}
-{-# Language FlexibleInstances #-}
-{-# Language TypeApplications #-}
-{-# Language DataKinds #-}
-{-# Language DuplicateRecordFields #-}
-{-# Language NamedFieldPuns #-}
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE DeriveGeneric         #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE NamedFieldPuns        #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE QuasiQuotes           #-}
+{-# LANGUAGE RecordWildCards       #-}
+{-# LANGUAGE TemplateHaskell       #-}
+{-# LANGUAGE TypeApplications      #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE TypeOperators         #-}
 module API.Channels (API, handler, JsonChannel(..)) where

-import Servant
-import Types
-import ClassyPrelude
-import Server.Auth
-import Servant.Auth as SA
-import Control.Monad.Logger
-import Database
-import Database.Channel
-import Data.Aeson
-import Control.Lens
-import Data.Generics.Product
+import           ClassyPrelude
+import           Control.Lens
+import           Control.Monad.Catch   (MonadThrow, throwM)
+import           Control.Monad.Logger
+import           Data.Aeson
+import           Data.Generics.Product
+import           Database
+import           Database.Channel
+import           Servant
+import           Servant.Auth          as SA
+import qualified Servant.Docs          as Docs
+import           Server.Auth
+import           Types

-data JsonChannel = JsonChannel { channel :: Text
+data JsonChannel = JsonChannel { channel    :: Text
                               , visibility :: Visibility }
                 deriving (Show, Generic)
 data UpdateChannel = UpdateChannel { identifier :: ChannelID
-                                   , channel :: Text
+                                   , channel    :: Text
                                   , visibility :: Visibility }
                 deriving (Show, Generic)

+instance Docs.ToSample JsonChannel where
+  toSamples _ = [("Channel", JsonChannel "channel" Private)]
+
+instance Docs.ToSample UpdateChannel where
+  toSamples _ = [("Channel", UpdateChannel 13 "channel" Private)]
+
 instance ToJSON JsonChannel
 instance FromJSON JsonChannel
 instance ToJSON UpdateChannel
@ -42,6 +49,9 @@ instance FromJSON UpdateChannel

 type API = Auth '[SA.BasicAuth, SA.Cookie, SA.JWT] SafeUser :> BaseAPI

+instance Docs.ToCapture (Capture "channel_id" ChannelID) where
+  toCapture _ = Docs.DocCapture "channel_id" "The channel id"
+
 type BaseAPI = "channels" :> ReqBody '[JSON] JsonChannel :> Post '[JSON] UpdateChannel
          :<|> "channels" :> Capture "channel_id" ChannelID :> ReqBody '[JSON] UpdateChannel :> Put '[JSON] UpdateChannel
          :<|> "channels" :> Get '[JSON] [JsonChannel]
--- a/backend/src/API/Users.hs
+++ b/backend/src/API/Users.hs
@ -5,21 +5,21 @@
 {-# Language TypeOperators #-}
 {-# Language DuplicateRecordFields #-}
 {-# Language TypeApplications #-}
-{-# Language GeneralizedNewtypeDeriving #-}
-{-# Language NamedFieldPuns #-}
 module API.Users  where

-import Servant
-import ClassyPrelude
-import Types
-import Data.Aeson
-import Web.FormUrlEncoded
-import Database (runDB)
-import Database.User
-import Database.Schema
-import Server.Auth
-import Servant.Auth.Server as SAS
-import Servant.Auth as SA
+import           ClassyPrelude
+import           Control.Monad.Catch (throwM, MonadThrow)
+import           Data.Aeson
+import           Database (runDB)
+import           Database.Schema
+import           Database.User
+import           Servant
+import           Servant.Auth as SA
+import           Servant.Auth.Server as SAS
+import qualified Servant.Docs as Docs
+import           Server.Auth
+import           Types
+import           Web.FormUrlEncoded


 data RegisterForm = RegisterForm { username :: Username
@ -28,12 +28,17 @@ data RegisterForm = RegisterForm { username :: Username
                                 , passwordAgain :: PlainPassword }
                  deriving (Generic, Show)

+instance Docs.ToSample RegisterForm
+
 data LoginStatus = LoginStatus ( Maybe SafeUser ) deriving Generic

 data RegisterStatus = RegisterStatus deriving Generic

+instance Docs.ToSample RegisterStatus
+
 instance ToJSON LoginStatus
 instance FromJSON LoginStatus
+instance Docs.ToSample LoginStatus

 instance FromJSON RegisterForm
 instance ToJSON RegisterForm
@ -42,16 +47,12 @@ instance FromJSON RegisterStatus
 instance FromForm RegisterForm
 instance ToForm RegisterForm

+
 type API = Auth '[SA.BasicAuth, SA.JWT] SafeUser :> "login" :> Get '[JSON] LoginStatus
      :<|> "register" :> ReqBody '[JSON, FormUrlEncoded] RegisterForm :> Post '[JSON] RegisterStatus
-      :<|> Auth '[SA.BasicAuth] SafeUser :> "token" :> Post '[JSON, PlainText] Token

 handler :: ServerT API AppM
-handler = loginHandler :<|> registerHandler :<|> newTokenHandler
-
-newTokenHandler :: AuthResult SafeUser -> AppM Token
-newTokenHandler = requireLoggedIn $ \SafeUser{username} ->
-  runDB (createToken username)
+handler = loginHandler :<|> registerHandler

 loginHandler :: AuthResult SafeUser -> AppM LoginStatus
 loginHandler (Authenticated u) = return (LoginStatus (Just u))
--- a/backend/src/Database.hs
+++ b/backend/src/Database.hs
@ -15,15 +15,17 @@ module Database
  , SeldaT )
  where

-import Data.Generics.Product
-import Control.Lens (view)
-import Data.Pool (Pool, withResource)
-import Database.Selda.Backend (SeldaConnection, runSeldaT, SeldaT)
-import Database.Selda (query, select, transaction)
-import Database.Selda.Generic (gen, fromRel, fromRels, toRel)
 import ClassyPrelude
+import Control.Lens (view)
+import Control.Monad.Catch (MonadMask)
+import Control.Monad.Trans.Control (MonadBaseControl)
+import Data.Generics.Product
+import Data.Pool (Pool, withResource)
+import Database.Selda (query, select, transaction)
+import Database.Selda.Backend (SeldaConnection, runSeldaT, SeldaT)
+import Database.Selda.Generic (gen, fromRel, fromRels, toRel)

-type DBLike r m = (MonadIO m, MonadReader r m, MonadBaseControl IO m, MonadMask m, HasField' "database" r (Pool SeldaConnection))
+type DBLike r m = (MonadBaseControl IO m, MonadIO m, MonadReader r m, HasField "database" r r (Pool SeldaConnection) (Pool SeldaConnection), MonadMask m)

 runDB :: DBLike r m => SeldaT m a -> m a
 runDB q = do
--- a/backend/src/Database/Book.hs
+++ b/backend/src/Database/Book.hs
@ -18,18 +18,17 @@ module Database.Book
  , BookID) where

 import ClassyPrelude
-import Database.Schema (books, users, Username, Book(..), BookID(..), UserID, HashDigest(..))
+import Control.Lens (view)
+import Control.Monad.Catch (MonadCatch)
+import Data.Generics.Product
 import Database
+import Database.Channel (booksChannels, attachChannel, clearChannels)
+import Database.Schema (books, users, Username, Book(..), BookID(..), UserID, HashDigest(..))
 import Database.Selda
 import Database.Selda.Generic
-
-import Control.Lens (view)
-import Data.Generics.Product
-
 import Database.Tag (booksTags, attachTag, clearTags)
-import Database.Channel (booksChannels, attachChannel, clearChannels)

-usersBooks :: (MonadSelda m, MonadMask m, MonadIO m) => Username -> m [Book]
+usersBooks :: (MonadSelda m, MonadIO m) => Username -> m [Book]
 usersBooks username = fromRels <$> query q
  where
    q = do
@ -41,7 +40,7 @@ usersBooks username = fromRels <$> query q
      return book


-getBook :: (MonadSelda m, MonadMask m, MonadIO m) => BookID -> Username -> m (Maybe Book)
+getBook :: (MonadSelda m, MonadIO m) => BookID -> Username -> m (Maybe Book)
 getBook identifier owner = listToMaybe . fromRels <$> query q
  where
    q = do
@ -51,12 +50,12 @@ getBook identifier owner = listToMaybe . fromRels <$> query q
      return book

 data InsertBook = InsertBook { contentType :: Text
-                             , title :: Maybe Text
+                             , title :: Text
                             , description :: Maybe Text
                             , owner :: Username }

 -- Always inserts
-insertBook :: (MonadSelda m, MonadMask m, MonadIO m) => InsertBook -> m (Maybe BookID)
+insertBook :: (MonadSelda m, MonadIO m) => InsertBook -> m (Maybe BookID)
 insertBook InsertBook{..} = do
  mUserId <- query $ do
    userId :*: _ :*: username' :*: _ <- select (gen users)
@ -68,14 +67,14 @@ insertBook InsertBook{..} = do

 data UpdateBook = UpdateBook { identifier :: BookID
                             , contentType :: Text
-                             , title :: Maybe Text
+                             , title :: Text
                             , description :: Maybe Text
                             , owner :: Username
                             , tags :: [Text]
                             , channels :: [Text] }
                deriving (Show, Generic)

-bookExists :: (MonadSelda m, MonadMask m, MonadIO m) => BookID -> m Bool
+bookExists :: (MonadSelda m, MonadIO m) => BookID -> m Bool
 bookExists identifier = not . null <$> query q
  where
    q = do
@ -83,7 +82,7 @@ bookExists identifier = not . null <$> query q
      restrict (bookId .== literal identifier)
      return bookId

-isBookOwner :: (MonadSelda m, MonadIO m, MonadThrow m) => BookID -> Username -> m Bool
+isBookOwner :: (MonadSelda m, MonadIO m) => BookID -> Username -> m Bool
 isBookOwner identifier username = not . null <$> query (bookOwner' identifier username)

 bookOwner' :: BookID -> Username -> Query s (Col s UserID :*: Col s BookID)
@ -95,7 +94,7 @@ bookOwner' identifier username = do
  restrict (bookId .== literal identifier)
  return (userId :*: bookId)

-updateBook :: (MonadSelda m, MonadMask m, MonadIO m) => UpdateBook -> m (Maybe UpdateBook)
+updateBook :: (MonadCatch m, MonadSelda m, MonadIO m) => UpdateBook -> m (Maybe UpdateBook)
 updateBook UpdateBook{..} = do
  clearTags identifier >> connectTags
  clearChannels identifier >> connectChannels
@ -114,7 +113,7 @@ updateBook UpdateBook{..} = do
    predicate (bookId :*: _) = bookId .== literal identifier


-getUpdateBook :: (MonadMask m, MonadIO m, MonadSelda m) => BookID -> Username -> m (Maybe UpdateBook)
+getUpdateBook :: (MonadIO m, MonadSelda m) => BookID -> Username -> m (Maybe UpdateBook)
 getUpdateBook bookId username = do
  mBook <- getBook bookId username
  forM mBook $ \Book{..} -> do
@ -122,7 +121,7 @@ getUpdateBook bookId username = do
    tags <- map (view (field @"tag")) <$> booksTags bookId
    return UpdateBook{owner=username,..}

-setContent :: (MonadSelda m, MonadMask m, MonadIO m) => BookID -> Username -> HashDigest -> m ()
+setContent :: (MonadSelda m, MonadIO m) => BookID -> Username -> HashDigest -> m ()
 setContent identifier owner digest = do
  mOwner <- query (bookOwner' identifier owner)
  void $ forM (listToMaybe mOwner) $ \_ ->
--- a/backend/src/Database/Channel.hs
+++ b/backend/src/Database/Channel.hs
@ -11,19 +11,21 @@ module Database.Channel
  , Visibility(..)
  , clearChannels
  , booksChannels
+  , channelBooks
  , Channel(..)
-  , ChannelID )
+  , ChannelID(..) )
  where

 import ClassyPrelude
-import Database.Schema
+import Control.Monad.Catch (MonadMask)
 import Database
+import Database.Schema
 import Database.Selda
 import Database.Selda.Generic

 import Control.Monad.Trans.Maybe

-getChannel :: (MonadSelda m, MonadMask m, MonadIO m) => ChannelID -> m (Maybe Channel)
+getChannel :: (MonadSelda m, MonadIO m) => ChannelID -> m (Maybe Channel)
 getChannel identifier = listToMaybe . fromRels <$> query q
  where
    q = do
@ -31,10 +33,10 @@ getChannel identifier = listToMaybe . fromRels <$> query q
      restrict (channelId .== literal identifier)
      return ch

-channelExists :: (MonadSelda m, MonadMask m, MonadIO m) => ChannelID -> m Bool
+channelExists :: (MonadSelda m, MonadIO m) => ChannelID -> m Bool
 channelExists identifier = not . null <$> getChannel identifier

-isChannelOwner :: (MonadSelda m, MonadIO m, MonadMask m) => ChannelID -> Username -> m Bool
+isChannelOwner :: (MonadSelda m, MonadIO m) => ChannelID -> Username -> m Bool
 isChannelOwner identifier username = not . null <$> query q
  where
    q = do
@ -55,7 +57,7 @@ userChannels username = fromRels <$> query q
      restrict (username' .== literal username)
      return channel

-updateChannelPrivacy :: (MonadMask m, MonadIO m, MonadSelda m) => ChannelID -> Visibility -> m (Maybe Channel)
+updateChannelPrivacy :: (MonadIO m, MonadSelda m) => ChannelID -> Visibility -> m (Maybe Channel)
 updateChannelPrivacy channelId visibility = do
  void $ update (gen channels) predicate (\channel -> channel `with` [pVis := literal visibility])
  getChannel channelId
@ -80,7 +82,20 @@ insertChannel username channel visibility = runMaybeT $ do
      restrict (user .== literal username)
      return userId

-booksChannels :: (MonadSelda m, MonadMask m, MonadIO m) => BookID -> m [Channel]
+channelBooks :: (MonadSelda m, MonadIO m) => Username -> ChannelID -> m [Book]
+channelBooks username identifier = fromRels <$> query q
+  where
+    q = do
+      channelId :*: bookId' <- select (gen bookChannels)
+      channelId' :*: _ :*: owner :*: _ <- select (gen channels)
+      userId :*: _ :*: username' :*: _ <- select (gen users)
+      book@(bookId :*: _) <- select (gen books)
+      restrict (username' .== literal username .&& owner .== userId)
+      restrict (channelId .== literal identifier .&& channelId .== channelId')
+      restrict (bookId .== bookId')
+      return book
+
+booksChannels :: (MonadSelda m, MonadIO m) => BookID -> m [Channel]
 booksChannels bookId = fromRels <$> query q
  where
    q = do
@ -90,7 +105,7 @@ booksChannels bookId = fromRels <$> query q
      restrict (bookId' .== literal bookId)
      return ch

-attachChannel :: (MonadMask m, MonadIO m, MonadSelda m) => Username -> BookID -> Text -> m ()
+attachChannel :: (MonadIO m, MonadSelda m) => Username -> BookID -> Text -> m ()
 attachChannel username bookId channel = do
  mCh <- fromRels <$> query channelQ
  forM_ mCh $ \Channel{identifier} ->
@ -109,5 +124,5 @@ attachChannel username bookId channel = do
      restrict (channel' .== literal channel)
      return ch

-clearChannels :: (MonadMask m, MonadIO m, MonadSelda m) => BookID -> m Int
+clearChannels :: (MonadIO m, MonadSelda m) => BookID -> m Int
 clearChannels bookId = deleteFrom (gen bookChannels) (\(_ :*: bookId') -> bookId' .== literal bookId)
--- a/backend/src/Database/Schema.hs
+++ b/backend/src/Database/Schema.hs
@ -1,102 +1,92 @@
-{-# Language NoImplicitPrelude #-}
-{-# Language DeriveGeneric #-}
-{-# Language OverloadedStrings #-}
-{-# Language DuplicateRecordFields #-}
-{-# Language GeneralizedNewtypeDeriving #-}
-{-# Language MultiParamTypeClasses #-}
+{-# LANGUAGE DeriveGeneric              #-}
+{-# LANGUAGE DuplicateRecordFields      #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE NoImplicitPrelude          #-}
+{-# LANGUAGE OverloadedStrings          #-}
 module Database.Schema where

-import ClassyPrelude
-import Database.Selda.Generic
-import Database.Selda
-import Database.Selda.Backend
-
-import Data.Aeson
-import Web.HttpApiData
-
-import Data.UUID (UUID)
-import qualified Data.UUID as UUID
-
-import Servant (MimeRender(..), PlainText)
+import           ClassyPrelude
+import           Data.Aeson
+import           Database.Selda
+import           Database.Selda.Backend
+import           Database.Selda.Generic
+import qualified Servant.Docs           as Docs
+import           Web.HttpApiData

 -- | User type
-newtype PlainPassword = PlainPassword Text deriving (Show, ToJSON, FromJSON, ToHttpApiData, FromHttpApiData, Eq)
+newtype PlainPassword = PlainPassword Text deriving (Show, ToJSON, FromJSON, ToHttpApiData, FromHttpApiData, Eq, Generic)
 newtype HashedPassword = HashedPassword {unHashed :: ByteString}
 data NoPassword = NoPassword

-newtype Email = Email { unEmail :: Text } deriving (Show, ToJSON, FromJSON, ToHttpApiData, FromHttpApiData)
+newtype Email = Email { unEmail :: Text } deriving (Show, ToJSON, FromJSON, ToHttpApiData, FromHttpApiData, Generic, Eq, IsString)

-newtype Username = Username { unUsername :: Text } deriving (Show, ToJSON, FromJSON, ToHttpApiData, FromHttpApiData)
+newtype Username = Username { unUsername :: Text } deriving (Show, ToJSON, FromJSON, ToHttpApiData, FromHttpApiData, Eq, Generic, IsString)
+
+instance Docs.ToSample Username where
+  toSamples _ = [("Username", Username "user123")]
+
+instance Docs.ToSample Email where
+  toSamples _ = [("Email", Email "first.last@example.com")]
+
+instance Docs.ToSample PlainPassword where
+  toSamples _ = [("Password", PlainPassword "password123")]

 instance SqlType HashedPassword where
  mkLit = LCustom . LBlob . unHashed
  fromSql (SqlBlob x) = HashedPassword x
-  fromSql _ = error "fromSql: Bad hash"
+  fromSql _           = error "fromSql: Bad hash"
  defaultValue = mkLit (HashedPassword "") -- Makes no sense

 instance SqlType Email where
  mkLit = LCustom . LText . unEmail
  fromSql (SqlString x) = Email x
-  fromSql _ = error "fromSql: Bad email"
+  fromSql _             = error "fromSql: Bad email"
  defaultValue = mkLit (Email "")

 instance SqlType Username where
  mkLit = LCustom . LText . unUsername
  fromSql (SqlString x) = Username x
-  fromSql _ = error "fromSql: Bad username"
+  fromSql _             = error "fromSql: Bad username"
  defaultValue = mkLit (Username "")

 newtype UserID = UserID {unUserID :: Int} deriving (Show)

-newtype BookID = BookID {unBookID :: Int} deriving (Show, ToJSON, FromJSON, FromHttpApiData, Eq, Ord)
+newtype BookID = BookID {unBookID :: Int} deriving (Show, ToJSON, FromJSON, FromHttpApiData, Eq, Ord, ToHttpApiData, Generic, Num)

-newtype ChannelID = ChannelID {unChannelID :: Int} deriving (Show, ToHttpApiData, FromHttpApiData, ToJSON, FromJSON)
+newtype ChannelID = ChannelID {unChannelID :: Int} deriving (Show, ToHttpApiData, FromHttpApiData, ToJSON, FromJSON, Eq, Generic, Num)

 newtype TagID = TagID {unTagID :: Int} deriving (Show)

 instance SqlType UserID where
  mkLit = LCustom . LInt . unUserID
  fromSql (SqlInt x) = UserID x
-  fromSql _ = error "fromSql: Bad userid"
+  fromSql _          = error "fromSql: Bad userid"
  sqlType _ = TRowID
  defaultValue = mkLit (UserID (-1))
 instance SqlType BookID where
  mkLit = LCustom . LInt . unBookID
  fromSql (SqlInt x) = BookID x
-  fromSql _ = error "fromSql: Bad bookid"
+  fromSql _          = error "fromSql: Bad bookid"
  defaultValue = mkLit (BookID (-1))
 instance SqlType ChannelID where
  mkLit = LCustom . LInt . unChannelID
  fromSql (SqlInt x) = ChannelID x
-  fromSql _ = error "fromSql: Bad channelid"
+  fromSql _          = error "fromSql: Bad channelid"
  defaultValue = mkLit (ChannelID (-1))
 instance SqlType TagID where
  mkLit = LCustom . LInt . unTagID
  fromSql (SqlInt x) = TagID x
-  fromSql _ = error "fromSql: Bad tagid"
+  fromSql _          = error "fromSql: Bad tagid"
  defaultValue = mkLit (TagID (-1))

-newtype Token = Token { unToken :: UUID } deriving (Show, ToJSON)
-
-instance MimeRender PlainText Token where
-  mimeRender _ = UUID.toLazyASCIIBytes . unToken
-
-instance SqlType Token where
-  mkLit = LCustom . LText . UUID.toText . unToken
-  fromSql (SqlString x) = maybe (error "fromSql: Could not parse token") Token . UUID.fromText $ x
-  fromSql _ = error "fromSql: Could not parse token"
-  defaultValue = mkLit (Token UUID.nil)
-
 data User pass = User { identifier :: UserID
-                      , email :: Email
-                      , username :: Username
-                      , role :: Role
-                      , token :: Maybe Token
-                      , password :: pass
-                      }
+                      , email      :: Email
+                      , username   :: Username
+                      , role       :: Role
+                      , password   :: pass }
          deriving (Show, Generic)

-data Role = UserRole | AdminRole deriving (Show, Read, Enum, Bounded, Typeable, Generic)
+data Role = UserRole | AdminRole deriving (Show, Read, Enum, Bounded, Typeable, Generic, Eq)

 instance ToJSON Role
 instance FromJSON Role
@ -117,18 +107,18 @@ users = genTable "users" [ (email :: User HashedPassword -> Email) :- uniqueGen
 -- | Book type
 newtype HashDigest = HashDigest { unHex :: ByteString } deriving Show
 -- XXX: Add an identifier for the book
-data Book = Book { identifier :: BookID
+data Book = Book { identifier  :: BookID
                 , contentHash :: Maybe HashDigest
                 , contentType :: Text
-                 , title :: Maybe Text
+                 , title       :: Text
                 , description :: Maybe Text
-                 , owner :: UserID }
+                 , owner       :: UserID }
          deriving (Show, Generic)

 instance SqlType HashDigest where
  mkLit = LCustom . LBlob . unHex
  fromSql (SqlBlob x) = HashDigest x
-  fromSql _ = error "fromSql: Not a valid hash digest"
+  fromSql _           = error "fromSql: Not a valid hash digest"
  defaultValue = mkLit (HashDigest "") -- Doesn't really make sense

 books :: GenTable Book
@ -139,12 +129,12 @@ books = genTable "books" [ (identifier :: Book -> BookID) :- autoPrimaryGen

 -- | Categorizing books
 data Tag = Tag { identifier :: TagID
-               , tag :: Text
-               , owner :: UserID }
+               , tag        :: Text
+               , owner      :: UserID }
         deriving (Show, Generic)

 data Visibility = Public | Private | Followers
-                deriving (Show, Read, Generic)
+                deriving (Show, Read, Generic, Eq)

 instance ToJSON Visibility
 instance FromJSON Visibility
@ -156,8 +146,8 @@ instance SqlType Visibility where
  defaultValue = mkLit Private

 data Channel = Channel { identifier :: ChannelID
-                       , channel :: Text
-                       , owner :: UserID
+                       , channel    :: Text
+                       , owner      :: UserID
                       , visibility :: Visibility }
             deriving (Show, Generic)

@ -173,12 +163,12 @@ channels = genTable "channels" [ (identifier :: Channel -> ChannelID) :- autoPri
  where
    i :*: _ = selectors (gen users)

-data BookTag = BookTag { tag :: TagID
+data BookTag = BookTag { tag  :: TagID
                       , book :: BookID }
             deriving (Show, Generic)

 data BookChannel = BookChannel { channel :: ChannelID
-                               , book :: BookID }
+                               , book    :: BookID }
                 deriving (Show, Generic)

 bookTags :: GenTable BookTag
--- a/backend/src/Database/Tag.hs
+++ b/backend/src/Database/Tag.hs
@ -12,13 +12,14 @@ module Database.Tag
  , Tag(..) ) where

 import ClassyPrelude
-import Database.Schema
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.Trans.Maybe
 import Database
+import Database.Schema
 import Database.Selda
 import Database.Selda.Generic
-import Control.Monad.Trans.Maybe

-upsertTag :: (MonadMask m, MonadIO m, MonadSelda m) => Username -> Text -> m (Maybe Tag)
+upsertTag :: (MonadCatch m, MonadIO m, MonadSelda m) => Username -> Text -> m (Maybe Tag)
 upsertTag username tag = runMaybeT $ do
  userId <- MaybeT (listToMaybe <$> query userQ)
  void $ lift $ upsert (gen tags) (predicate userId) id [toRel (Tag def tag userId)]
@ -34,7 +35,7 @@ upsertTag username tag = runMaybeT $ do
      restrict (username' .== literal username)
      return userId

-booksTags :: (MonadMask m, MonadIO m, MonadSelda m) => BookID -> m [Tag]
+booksTags :: (MonadIO m, MonadSelda m) => BookID -> m [Tag]
 booksTags bookId = fromRels <$> query q
  where
    q = do
@ -44,7 +45,7 @@ booksTags bookId = fromRels <$> query q
      restrict (bookId' .== literal bookId)
      return tag

-attachTag :: (MonadMask m, MonadIO m, MonadSelda m) => Username -> BookID -> Text -> m ()
+attachTag :: (MonadCatch m, MonadIO m, MonadSelda m) => Username -> BookID -> Text -> m ()
 attachTag username bookId tag = do
  maybeT <- upsertTag username tag
  forM_ maybeT $ \Tag{identifier} -> do
@ -56,6 +57,6 @@ attachTag username bookId tag = do
      restrict (tagId' .== literal tagId .&& bookId' .== literal bookId)
      return tagId'

-clearTags :: (MonadMask m, MonadIO m, MonadSelda m) => BookID -> m Int
+clearTags :: (MonadIO m, MonadSelda m) => BookID -> m Int
 clearTags bookId = deleteFrom (gen bookTags) (\(_ :*: bookId') -> bookId' .== literal bookId)

--- a/backend/src/Database/User.hs
+++ b/backend/src/Database/User.hs
@ -2,33 +2,24 @@
 {-# Language TypeApplications #-}
 {-# Language DataKinds #-}
 {-# Language TemplateHaskell #-}
-{-# Language FlexibleContexts #-}
-module Database.User
-  ( Token
-  , insertUser
-  , getUser
-  , validateUser
-  , createToken
-  , invalidateToken )
-  where
+module Database.User where

 import ClassyPrelude
+import Control.Lens (view, over, _Just)
+import Control.Monad (mfilter)
+import Control.Monad.Catch (MonadMask)
+import Control.Monad.Logger
+import Crypto.KDF.BCrypt
+import Crypto.Random.Types (MonadRandom)
+import Data.Generics.Product
 import Database
 import Database.Schema
 import Database.Selda
-import Control.Lens (view, over, _Just)
-import Data.Generics.Product
-import Crypto.KDF.BCrypt
-import Crypto.Random.Types (MonadRandom)
-import Control.Monad.Logger
-import Control.Monad (mfilter)
-import qualified Data.UUID.V4 as UUID

 data UserExistsError = UserExistsError


-
-insertUser :: (MonadLogger m, MonadIO m, MonadMask m, MonadRandom m) => Username -> Email -> PlainPassword -> SeldaT m (Either UserExistsError (User NoPassword))
+insertUser :: (MonadMask m, MonadLogger m, MonadIO m, MonadRandom m) => Username -> Email -> PlainPassword -> SeldaT m (Either UserExistsError (User NoPassword))
 insertUser username email (PlainPassword password) =
  getUser' username >>= maybe insert' (const (return $ Left UserExistsError))
  where
@ -36,7 +27,7 @@ insertUser username email (PlainPassword password) =
    insertAs role = do
      lift $ $logInfo $ "Inserting new user as " <> pack (show role)
      let bytePass = encodeUtf8 password
-      user <- User def email username role Nothing . HashedPassword <$> lift (hashPassword 12 bytePass)
+      user <- User def email username role . HashedPassword <$> lift (hashPassword 12 bytePass)
      insert_ (gen users) [toRel user] >> return (over (field @"password") (const NoPassword) user)

 adminExists :: (MonadMask m, MonadLogger m, MonadIO m) => SeldaT m Bool
@ -68,21 +59,3 @@ getUser' name = listToMaybe . fmap fromRel <$> query q
      u@(_ :*: _ :*: username :*: _ ) <- select (gen users)
      restrict (username .== literal name)
      return u
-
-createToken :: (MonadMask m, MonadIO m, MonadSelda m) => Username -> m Token
-createToken username = do
-  token <- Token <$> liftIO UUID.nextRandom
-  void $ update (gen users) predicate (updateToken token)
-  return token
-  where
-    _ :*: _ :*: pUsername :*: _ :*: pToken :*: _ = selectors (gen users)
-    predicate user = user ! pUsername .== literal username
-    updateToken token user= user `with` [pToken := literal (Just token)]
-
-invalidateToken :: (MonadMask m, MonadIO m, MonadSelda m) => Username -> m ()
-invalidateToken username = do
-  void $ update (gen users) predicate updateToken
-  where
-    _ :*: _ :*: pUsername :*: _ :*: pToken :*: _ = selectors (gen users)
-    predicate user = user ! pUsername .== literal username
-    updateToken user= user `with` [pToken := literal Nothing]
--- a/backend/src/Datastore.hs
+++ b/backend/src/Datastore.hs
@ -5,6 +5,7 @@
 {-# Language FlexibleContexts #-}
 {-# Language TypeSynonymInstances #-}
 {-# Language FlexibleInstances #-}
+{-# Language ScopedTypeVariables #-}
 module Datastore where

 import ClassyPrelude
@ -28,26 +29,26 @@ instance MonadDS AppM where
  get = getLocal

 putLocal :: ( MonadIO m
-            , HasField' "config" r config
-            , HasField' "store" config store
-            , HasField' "path" store Text
+            , HasField "config" r r config config
+            , HasField "store" config config store store
+            , HasType Text store
            , MonadReader r m)
            => ByteString -> m (Digest SHA256)
 putLocal bs = do
-  store <- unpack <$> view (field @"config" . field @"store" . field @"path")
+  store :: FilePath <- unpack <$> view (field @"config" . field @"store" . typed @Text)
  liftIO $ createDirectoryIfMissing True store
  let key = hashWith SHA256 bs
  writeFile (store </> show key) bs
  return key

 getLocal :: ( MonadIO m
-            , HasField' "config" r config
-            , HasField' "store" config store
-            , HasField' "path" store Text
+            , HasField "config" r r config config
+            , HasField "store" config config store store
+            , HasType Text store
            , MonadReader r m)
            => Digest SHA256 -> m (Maybe ByteString)
 getLocal key = do
-  store <- unpack <$> view (field @"config" . field @"store" . field @"path")
+  store <- unpack <$> view (field @"config" . field @"store" . typed @Text)
  liftIO $ createDirectoryIfMissing True store
  let file = store </> show key
  exists <- liftIO $ doesFileExist file
--- a/backend/src/Devel/Main.hs
+++ b/backend/src/Devel/Main.hs
@ -3,19 +3,18 @@
 {-# Language FlexibleContexts #-}
 module Devel.Main where

-import Prelude
-import Control.Monad.Trans.Reader (runReaderT)
-import Main (withApp, defaultMain)
 import Control.Concurrent
 import Control.Monad (void)
+import Control.Monad.Trans.Reader (runReaderT)
 import Data.IORef (IORef, newIORef, readIORef, writeIORef)
-import Foreign.Store (Store(..), lookupStore, readStore, storeAction, withStore)
-import GHC.Word (Word32)
-import Dhall (input, auto)
-
+import Database
 import Database.Schema
 import Database.Selda (tryCreateTable)
-import Database
+import Dhall (input, auto)
+import Foreign.Store (Store(..), lookupStore, readStore, storeAction, withStore)
+import GHC.Word (Word32)
+import Main (withApp, defaultMain)
+import Prelude

 update :: IO ()
 update = do
@ -37,7 +36,7 @@ update = do

 develMain :: IO ()
 develMain = do
-  conf <- input auto "./config/devel.dhall"
+  conf <- input auto "../config/devel.dhall"
  withApp conf $ \app -> do
    void $ runReaderT (runDB migrate) app
    defaultMain app
--- a/backend/src/Main.hs
+++ b/backend/src/Main.hs
@ -25,6 +25,7 @@ withApp :: Config -> (App -> IO ()) -> IO ()
 withApp config f = do
  let pgHost = view (field @"database" . field @"host") config
      pgPort = 5432
+      pgSchema = Nothing
      pgDatabase = view (field @"database" . field @"database") config
      pgUsername = Just (view (field @"database" . field @"username") config)
      pgPassword = Just (view (field @"database" . field @"password") config)
--- a/backend/src/Servant/XML.hs
+++ b/backend/src/Servant/XML.hs
@ -1,9 +1,11 @@
 {-# Language OverloadedStrings #-}
 {-# Language FlexibleInstances #-}
 {-# Language MultiParamTypeClasses #-}
+{-# Language TypeApplications #-}
 module Servant.XML
  ( ToNode(..)
  , XML
+  , OPDS
  , Text.Hamlet.XML.xml
  , iso8601 )
  where
@ -16,14 +18,22 @@ import Network.HTTP.Media.MediaType

 data XML

+data OPDS
+
 instance (ToNode a) => MimeRender XML a where
  mimeRender _ a =
    let [NodeElement root] = toNode a
    in renderLBS def (Document (Prologue [] Nothing []) root [])

+instance (ToNode a) => MimeRender OPDS a where
+  mimeRender _ a = mimeRender (Proxy @XML) a
+
 instance Accept XML where
  contentType _ = "application" // "xml" /: ("charset", "utf-8")

+instance Accept OPDS where
+  contentType _ = "application" // "atom+xml" /: ("charset", "utf-8") /: ("profile", "opds-catalog")
+
 iso8601 :: UTCTime -> Text
 iso8601 = pack . formatTime defaultTimeLocale "%Y-%m-%dT%H:%M:%SZ"

--- a/backend/src/Server.hs
+++ b/backend/src/Server.hs
@ -0,0 +1,51 @@
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE DeriveGeneric         #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE QuasiQuotes           #-}
+{-# LANGUAGE RecordWildCards       #-}
+{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE TemplateHaskell       #-}
+{-# LANGUAGE TypeApplications      #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE TypeOperators         #-}
+module Server where
+
+import qualified API                   as API
+import           ClassyPrelude         hiding (Handler)
+import           Control.Lens
+import           Control.Monad.Except
+import           Control.Monad.Logger
+import           Data.Generics.Product
+import           Servant
+import           Servant.Auth.Docs     ()
+import           Servant.Auth.Server   as SAS
+import qualified Servant.Docs          as Docs
+import           Servant.HTML.Lucid    (HTML)
+import           Server.Auth           (SafeUser)
+import           Server.Auth           (authCheck)
+import           Types
+
+type API = API.API
+  :<|> "help" :> Get '[PlainText, HTML] String
+  :<|> "static" :> Raw
+
+type Ctx = '[BasicAuthData -> IO (AuthResult SafeUser), CookieSettings, JWTSettings]
+
+server :: App -> Application
+server app = serveWithContext api cfg (hoistServerWithContext (Proxy @ API.API) (Proxy @ Ctx) server' API.handler :<|> serveDocs :<|> serveDirectoryFileServer "static")
+  where
+    apiDocs :: Docs.API
+    apiDocs = Docs.docs (Proxy @API.API)
+    serveDocs = pure $ Docs.markdown apiDocs
+    myKey = view (field @"jwk") app
+    jwtCfg = defaultJWTSettings myKey
+    authCfg = authCheck app
+    cookieSettings = SAS.defaultCookieSettings{cookieIsSecure=SAS.NotSecure}
+    cfg = jwtCfg :. cookieSettings :. authCfg :. EmptyContext
+    server' :: AppM a -> Servant.Handler a
+    server' = Handler . ExceptT . try . (`runReaderT` app) . (runFileLoggingT "logs/server.log")
+    api :: Proxy API
+    api = Proxy
--- a/backend/src/Server/Auth.hs
+++ b/backend/src/Server/Auth.hs
@ -1,42 +1,45 @@
-{-# Language DataKinds #-}
-{-# Language TypeFamilies #-}
-{-# Language OverloadedStrings #-}
-{-# Language NoImplicitPrelude #-}
-{-# Language TypeOperators #-}
-{-# Language DuplicateRecordFields #-}
-{-# Language TypeApplications #-}
-{-# Language TemplateHaskell #-}
-{-# Language FlexibleContexts #-}
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE TemplateHaskell       #-}
+{-# LANGUAGE TypeApplications      #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE TypeOperators         #-}
 module Server.Auth
  ( SafeUser(..)
  , authCheck
  , AuthResult(..)
-  , TokenCheck
  , requireLoggedIn)
  where

-import ClassyPrelude
-import Servant.Auth.Server as SAS
-import Data.Aeson
-import Database.Schema
-import Database.User
-import Database
-import Types
-import Control.Lens (view)
-import Data.Generics.Product
-import Servant (err401)
-import Control.Monad.Logger
+import           ClassyPrelude
+import           Control.Lens          (view)
+import           Control.Monad.Catch   (MonadThrow, throwM)
+import           Control.Monad.Logger
+import           Data.Aeson
+import           Data.Generics.Product
+import           Database
+import           Database.Schema
+import           Database.User
+import           Servant               (err401)
+import           Servant.Auth.Server   as SAS
+import qualified Servant.Docs          as Docs
+import           Types

 -- generic-lens can convert similar types to this
 -- I'm trying out servant-auth-server which uses a jwt style login. IIRC anyone
 -- can open the jwt token and view what's inside, you just can't modify it.
 --
 -- Is it a problem that a human readable username and email are visible?
-data SafeUser = SafeUser { email :: Email
+data SafeUser = SafeUser { email    :: Email
                         , username :: Username
-                         , role :: Role }
+                         , role     :: Role }
              deriving (Show, Generic)

+instance Docs.ToSample SafeUser where
+  toSamples _ = [("User", SafeUser "user@example.com" "user" UserRole )]
+
 instance ToJSON SafeUser where
 instance FromJSON SafeUser where
 instance ToJWT SafeUser where
@ -55,8 +58,6 @@ authCheck app (BasicAuthData username password) = flip runReaderT app $
    password' = PlainPassword $ decodeUtf8 password
    authenticated = SAS.Authenticated . view (super @SafeUser)

-requireLoggedIn :: (MonadLogger m, MonadThrow m, Monad m) => (SafeUser -> m a) -> AuthResult SafeUser -> m a
+requireLoggedIn :: (MonadThrow m, MonadLogger m, Monad m) => (SafeUser -> m a) -> AuthResult SafeUser -> m a
 requireLoggedIn f (Authenticated user) = f user
 requireLoggedIn _ u = $logError (pack (show u)) >> throwM err401
-
-data TokenCheck
--- a/backend/src/Spec.hs
+++ b/backend/src/Spec.hs
@ -0,0 +1,65 @@
+{-# Language TypeApplications #-}
+module Main where
+
+import           API.Books
+import qualified Data.Aeson as A
+import           Data.Char (isPrint)
+import           Data.GenValidity.Text ()
+import qualified Data.Text as T
+import           Database.Schema
+import           Prelude
+import           Test.Hspec
+import           Test.Validity
+
+instance GenUnchecked PlainPassword
+instance GenValid PlainPassword
+instance GenInvalid PlainPassword
+instance Validity PlainPassword
+instance GenUnchecked Email
+instance GenValid Email
+instance GenInvalid Email
+instance Validity Email
+instance GenUnchecked Username
+instance GenValid Username
+instance GenInvalid Username
+instance Validity Username
+instance GenUnchecked BookID
+instance GenValid BookID
+instance GenInvalid BookID
+instance Validity BookID
+instance GenUnchecked ChannelID
+instance GenValid ChannelID
+instance GenInvalid ChannelID
+instance Validity ChannelID
+instance GenUnchecked Role
+instance GenValid Role
+instance GenInvalid Role
+instance Validity Role
+instance GenUnchecked Visibility
+instance GenValid Visibility
+instance GenInvalid Visibility
+instance Validity Visibility
+instance GenUnchecked JsonBook
+instance GenValid JsonBook
+instance GenInvalid JsonBook
+instance Validity JsonBook
+instance GenUnchecked PostBook
+instance GenValid PostBook
+instance GenInvalid PostBook
+instance Validity PostBook
+
+spec :: Spec
+spec = do
+  describe "JSON encoding" $ do
+    it "Works for PlainPassword" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @PlainPassword) A.decode
+    it "Works for Email" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @Email) A.decode
+    it "Username" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @Username) A.decode
+    it "Works for BookID" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @BookID) A.decode
+    it "Works for ChannelID" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @ChannelID) A.decode
+    it "Works for Role" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @Role) A.decode
+    it "Works for Visibility" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @Visibility) A.decode
+    it "Works for JsonBook" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @JsonBook) A.decode
+    it "Works for PostBook" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @PostBook) A.decode
+
+main :: IO ()
+main = hspec spec
--- a/backend/src/Types.hs
+++ b/backend/src/Types.hs
--- a/backend/src/View.hs
+++ b/backend/src/View.hs
--- a/common/LICENSE
+++ b/common/LICENSE
@ -0,0 +1,30 @@
+Copyright (c) 2018, Mats Rauhala
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Mats Rauhala nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/common/common.cabal
+++ b/common/common.cabal
@ -0,0 +1,51 @@
+name:                common
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              Mats Rauhala
+maintainer:          mats.rauhala@iki.fi
+-- copyright:
+category:            Web
+build-type:          Simple
+extra-source-files:  ChangeLog.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     Configuration
+                     , Data.Versioned
+  -- other-extensions:
+  build-depends:       base >=4.10
+                     , classy-prelude
+                     , dhall
+                     , foreign-store
+                     , generic-lens
+                     , lens
+                     , mtl
+                     , text
+                     , transformers
+  hs-source-dirs:      src
+  default-extensions:  DeriveGeneric
+                     , NoImplicitPrelude
+                     , OverloadedStrings
+                     , RecordWildCards
+  default-language:    Haskell2010
+
+test-suite spec
+  type:                exitcode-stdio-1.0
+  main-is:             Spec.hs
+  hs-source-dirs:      src
+  build-depends:       base >=4.10
+                     , classy-prelude
+                     , dhall
+                     , foreign-store
+                     , generic-lens
+                     , lens
+                     , mtl
+                     , text
+                     , transformers
+                     , validity
+                     , genvalidity-hspec
+                     , genvalidity-property
+                     , hspec
--- a/common/src/Configuration.hs
+++ b/common/src/Configuration.hs
@ -12,7 +12,9 @@ data Pg = Pg { username :: Text
             , database :: Text }
        deriving (Show, Generic)

-newtype Store = Store { path :: Text } deriving (Show, Generic)
+data Store = Filestore { path :: Text }
+           | IPFS { common :: Text }
+           deriving (Show, Generic)

 data Config = Config { database :: Pg
                     , store :: Store }
--- a/common/src/Data/Versioned.hs
+++ b/common/src/Data/Versioned.hs
--- a/common/src/Spec.hs
+++ b/common/src/Spec.hs
@ -0,0 +1,9 @@
+module Main where
+
+import Test.Hspec
+
+spec :: Spec
+spec = describe "test" $ it "verifies tests work" $ True == True
+
+main :: IO ()
+main = hspec spec
--- a/default.nix
+++ b/default.nix
@ -1,10 +1,70 @@
-{ mkDerivation, base, stdenv }:
-mkDerivation {
-  pname = "ebook-manager";
-  version = "0.1.0.0";
-  src = ./.;
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [ base ];
-  license = stdenv.lib.licenses.bsd3;
+{ nixpkgs, haskellPackages }:
+
+let
+  jsaddle = nixpkgs.fetchFromGitHub {
+    owner = "ghcjs";
+    repo = "jsaddle";
+    rev = "34fe7d61b3f387b81aa748294ac8d993243f53b4";
+    sha256 = "0qdh5qdk23vcp1yp910zgw2hs4zpbx9ig25xgaax0iwj2m1ifh5x";
+  };
+  miso = nixpkgs.fetchFromGitHub {
+    owner = "dmjio";
+    repo = "miso";
+    rev = "630e823dd40a434b73124e12b229a79d9fefb01d";
+    sha256 = "046gdp3ah2lsipfcy89rh20mn08xbhcgrj549v8zzy69j33xjm2l";
+  };
+  miso-jsaddle = super: if haskellPackages.ghc.isGhcjs or false then (super.callPackage (miso + "/miso-ghcjs.nix") {}) else (super.callPackage (miso + "/miso-ghc-jsaddle.nix") {});
+
+  dontCheck = nixpkgs.haskell.lib.dontCheck;
+
+in
+
+(import ./project.nix nixpkgs) {
+  haskellPackages = haskellPackages;
+  packages = {
+    common = ./common;
+    backend = ./backend;
+    frontend = ./frontend;
+  };
+  overrides = self: super: {
+    generic-lens = nixpkgs.haskell.lib.dontCheck super.generic-lens;
+    jsaddle-warp = nixpkgs.haskell.lib.dontCheck (super.callPackage (jsaddle + "/jsaddle-warp") {});
+    jsaddle = super.callPackage (jsaddle + "/jsaddle") {};
+    miso = miso-jsaddle super;
+    # doctest = null; # Not compilable with ghcjs
+    # comonad = dontCheck super.comonad;
+    # Glob = dontCheck super.Glob;
+    # SHA = dontCheck super.SHA;
+    # iproute = dontCheck super.iproute;
+    # semigroupoids = dontCheck super.semigroupoids;
+    # wai-app-static = dontCheck super.wai-app-static;
+    # attoparsec = dontCheck super.attoparsec;
+    # http-date = dontCheck super.http-date;
+    # lens = dontCheck super.lens;
+    # unix-time = dontCheck super.unix-time;
+    # http-types = dontCheck super.http-types;
+    # servant = dontCheck super.servant;
+    # servant-server = dontCheck super.servant-server;
+    # servant-auth-docs = dontCheck super.servant-auth-docs;
+    # lens-aeson = dontCheck super.lens-aeson;
+    # word8 = dontCheck super.word8;
+    # http2 = dontCheck super.http2;
+    # wai-extra = dontCheck super.wai-extra;
+    # pgp-wordlist = dontCheck super.pgp-wordlist;
+    # prettyprinter = dontCheck super.prettyprinter;
+    # unliftio = dontCheck super.unliftio;
+    # prettyprinter-ansi-terminal = dontCheck super.prettyprinter-ansi-terminal;
+    # distributive = dontCheck super.distributive;
+    # genvalidity-property = dontCheck super.genvalidity-property;
+    # genvalidity-hspec = dontCheck super.genvalidity-hspec;
+    # genvalidity = dontCheck super.genvalidity;
+    # megaparsec = dontCheck super.megaparsec;
+    # ncurses = null;
+    # haskeline = super.callHackage "haskeline" "0.7.4.2" {};
+    # terminfo = super.callHackage "terminfo" "0.4.1.1" {};
+  };
+  tools = with haskellPackages; [
+    ghcid
+    hasktags
+  ];
 }
--- a/frontend/ChangeLog.md
+++ b/frontend/ChangeLog.md
@ -0,0 +1,5 @@
+# Revision history for frontend
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
--- a/frontend/LICENSE
+++ b/frontend/LICENSE
@ -0,0 +1,30 @@
+Copyright (c) 2018, Mats Rauhala
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Mats Rauhala nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/frontend/Setup.hs
+++ b/frontend/Setup.hs
@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
--- a/frontend/frontend.cabal
+++ b/frontend/frontend.cabal
@ -0,0 +1,27 @@
+-- Initial frontend.cabal generated by cabal init.  For further
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+name:                frontend
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              Mats Rauhala
+maintainer:          mats.rauhala@iki.fi
+-- copyright:
+category:            Web
+build-type:          Simple
+extra-source-files:  ChangeLog.md
+cabal-version:       >=1.10
+
+executable frontend
+  main-is:             Main.hs
+  -- other-modules:
+  -- other-extensions:
+  build-depends:       base >=4.11 && <4.12
+                     , miso
+                     , jsaddle-warp
+                     , mtl
+  hs-source-dirs:      src
+  default-language:    Haskell2010
--- a/frontend/src/Main.hs
+++ b/frontend/src/Main.hs
@ -0,0 +1,41 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE LambdaCase                 #-}
+{-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE RecordWildCards            #-}
+module Main where
+
+import           Control.Monad.Trans              (liftIO)
+import           Language.Javascript.JSaddle.Warp
+import           Miso
+import           Miso.String
+
+data Action = Add
+            | Subtract
+            | SayHello
+            | NoOp
+
+newtype Model = Model Int deriving (Eq, Num, ToMisoString)
+
+updateModel :: Action -> Model -> Effect Action Model
+updateModel Add m      = noEff (m + 1)
+updateModel Subtract m = noEff (m - 1)
+updateModel SayHello m = m <# (liftIO (putStrLn "Hello world") >> pure NoOp)
+updateModel NoOp m     = noEff m
+
+viewModel :: Model -> View Action
+viewModel x =
+  div_ [] [ button_  [ onClick Add ] [ text "+" ]
+          , text (ms x)
+          , button_ [ onClick Subtract ] [ text "-" ]
+  ]
+
+main :: IO ()
+main = run 8081 $ startApp App{..}
+  where
+    model = Model 0
+    initialAction = SayHello
+    update = updateModel
+    view = viewModel
+    subs = []
+    events = defaultEvents
+    mountPoint = Nothing
--- a/migrations/V1.2__User_token.sql
+++ b/migrations/V1.2__User_token.sql
@ -1 +0,0 @@
-alter table users add column token text null;
--- a/migrations/V1.2__unique_tags.sql
+++ b/migrations/V1.2__unique_tags.sql
@ -0,0 +1 @@
+create unique index tag_owner on tags (tag, owner);
--- a/nixpkgs-version.json
+++ b/nixpkgs-version.json
@ -1,7 +1,7 @@
 {
  "url": "https://github.com/nixos/nixpkgs.git",
-  "rev": "83a5765b1fea2472ec9cf9d179d3efd18b45c77e",
+  "rev": "4507926b80c6b8f73053775ffee17f6781c7e7c8",
  "date": "2018-01-08T11:52:28+01:00",
-  "sha256": "01rb61dkbzjbwnb3p8lgs03a94f4584199dlr0cwdmqzaxnp506h",
+  "sha256": "068v9xh7d8klk62p2qwr76fyfqfh1bp08xc12x138g5q6pg6yfzb",
  "fetchSubmodules": true
 }
--- a/project.nix
+++ b/project.nix
@ -0,0 +1,40 @@
+nixpkgs:
+
+let
+
+  inherit (nixpkgs.lib) mapAttrs mapAttrsToList escapeShellArg optionalString concatStringsSep concatMapStringsSep;
+
+in
+
+{ haskellPackages
+, packages
+, overrides ? _ : _ : {}
+, tools ? []
+}:
+
+let
+
+  overrides' = nixpkgs.lib.foldr nixpkgs.lib.composeExtensions (_: _: {}) [
+    (self: super: mapAttrs (name: path: self.callCabal2nix name path {}) packages)
+    overrides
+  ];
+  haskellPackages' = haskellPackages.override { overrides = overrides'; };
+  packages' = mapAttrs (name: _: haskellPackages'."${name}") packages;
+  mkShell = name: pkg:
+  let
+    n =  "${name}-shell";
+    deps = haskellPackages'.ghcWithHoogle (pkgs: pkg.buildInputs ++ pkg.propagatedBuildInputs);
+  in
+  {
+    name = "${n}";
+    value = nixpkgs.buildEnv {
+      name = "${n}";
+      paths = tools;
+      buildInputs = tools ++ [deps];
+    };
+  };
+  shells = nixpkgs.lib.listToAttrs (mapAttrsToList mkShell packages');
+
+in
+
+packages' // shells
--- a/release.nix
+++ b/release.nix
@ -0,0 +1,45 @@
+{ nixpkgs ? import <nixpkgs> {} }:
+
+let
+
+  config = {
+    packageOverrides = pkgs: with pkgs.haskell.lib;  with pkgs.lib; {
+      haskell = pkgs.haskell // {
+        packages = pkgs.haskell.packages // {
+          ghcjs84 = pkgs.haskell.packages.ghcjs84.override {
+            overrides = self: super: {
+              doctest = null;
+              directory-tree = dontCheck (super.directory-tree);
+              http-types = dontCheck (super.http-types);
+              tasty-quickcheck = dontCheck (super.tasty-quickcheck);
+              scientific = dontCheck (super.scientific);
+              servant = dontCheck (super.servant);
+              jsaddle-warp = super.callPackage ./jsaddle-warp-ghcjs.nix {};
+              ghc = overrideDerivation (super.ghc.override {
+                ghcjsSrc = pkgs.fetchgit {
+                  url = "https://github.com/ghcjs/ghcjs.git";
+                  rev = "dc190b1bb2453cfa484124e9f335ee3cad1492f7";
+                  sha256 = "0dh52aj0f3700zfyrhisy44b6y9p1bsawwrmd5pllpdyw21zd9lw";
+                  fetchSubmodules = true;
+                };
+              }) (drv: { patches = (drv.patches or []) ++ [ ./ghcjs.patch ]; });
+            };
+          };
+        };
+      };
+    };
+  };
+  pinnedVersion = nixpkgs.lib.importJSON ./nixpkgs-version.json;
+  pinnedPkgs = import (nixpkgs.fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nixpkgs";
+    inherit (pinnedVersion) rev sha256;
+  }) { inherit config; };
+  inherit (pinnedPkgs) pkgs;
+
+  in
+
+{
+  ghc = import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskell.packages.ghc843; };
+  ghcjs = import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskell.packages.ghcjs84; };
+}
--- a/src/API.hs
+++ b/src/API.hs
@ -1,50 +0,0 @@
-{-# Language DataKinds #-}
-{-# Language TypeFamilies #-}
-{-# Language TypeOperators #-}
-{-# Language NoImplicitPrelude #-}
-{-# Language MultiParamTypeClasses #-}
-{-# Language OverloadedStrings #-}
-{-# Language TemplateHaskell #-}
-{-# Language QuasiQuotes #-}
-{-# Language RecordWildCards #-}
-{-# Language DeriveGeneric #-}
-{-# Language FlexibleInstances #-}
-module API (API, handler) where
-
-
-import Servant
-import Servant.HTML.Lucid (HTML)
-import Types
-
-import View
-
-import qualified API.Users as Users
-import qualified API.Channels as Channels
-import qualified API.Books as Books
-import qualified API.Catalogue as Catalogue
-
-data Index = Index
-
-type API = Get '[HTML] (AppView Index)
-      :<|> Users.API
-      :<|> "api" :> Channels.API
-      :<|> "api" :> Books.API
-      :<|> "api" :> "1" :> Catalogue.VersionedAPI 1
-      :<|> "api" :> "current" :> Catalogue.VersionedAPI 1
-
-handler :: ServerT API AppM
-handler = indexHandler
-    :<|> Users.handler
-    :<|> Channels.handler
-    :<|> Books.handler
-    :<|> Catalogue.handler
-    :<|> Catalogue.handler
-
-instance ToHtml Index where
-  toHtml _ = do
-    h1_ [class_ "title"] "Home page"
-    p_ [class_ "subtitle"] "Hello world"
-  toHtmlRaw = toHtml
-
-indexHandler :: AppM (AppView Index)
-indexHandler = mkView "Home" Index
--- a/src/API/Books.hs
+++ b/src/API/Books.hs
@ -1,112 +0,0 @@
-{-# Language DuplicateRecordFields #-}
-{-# Language DataKinds #-}
-{-# Language TypeFamilies #-}
-{-# Language TypeOperators #-}
-{-# Language NoImplicitPrelude #-}
-{-# Language MultiParamTypeClasses #-}
-{-# Language OverloadedStrings #-}
-{-# Language TemplateHaskell #-}
-{-# Language QuasiQuotes #-}
-{-# Language RecordWildCards #-}
-{-# Language DeriveGeneric #-}
-{-# Language FlexibleInstances #-}
-{-# Language TypeApplications #-}
-{-# Language DataKinds #-}
-{-# Language NamedFieldPuns #-}
-module API.Books where
-
-import Servant hiding (contentType)
-import Types
-import ClassyPrelude
-import Server.Auth
-import Servant.Auth as SA
-import Data.Aeson
-import Database.Book
-import Database.Channel
-import Database.Tag
-import Database
-import Control.Lens
-import Data.Generics.Product
-
-import Control.Monad.Trans.Maybe
-
-import qualified Datastore as DS
-import Data.ByteArray (convert)
-import Crypto.Hash (digestFromByteString)
-
-data JsonBook = JsonBook { identifier :: BookID
-                         , contentType :: Text
-                         , title :: Maybe Text
-                         , description :: Maybe Text
-                         , channels :: [Text]
-                         , tags :: [Text] }
-              deriving (Generic, Show)
-
-data PostBook = PostBook { contentType :: Text
-                         , title :: Maybe Text
-                         , description :: Maybe Text
-                         , channels :: [Text]
-                         , tags :: [Text] }
-              deriving (Generic, Show)
-
-
-instance ToJSON JsonBook
-instance FromJSON JsonBook
-instance ToJSON PostBook
-instance FromJSON PostBook
-
-type API = Auth '[TokenCheck, SA.BasicAuth, SA.JWT] SafeUser :> BaseAPI
-
-type BaseAPI = "books" :> Get '[JSON] [JsonBook]
-       :<|> "books" :> ReqBody '[JSON] PostBook :> Post '[JSON] JsonBook
-       :<|> "books" :> Capture "book_id" BookID :> "meta" :> ReqBody '[JSON] JsonBook :> Put '[JSON] JsonBook
-       :<|> "books" :> Capture "book_id" BookID :> ReqBody '[OctetStream] ByteString :> Put '[JSON] NoContent
-       :<|> "books" :> Capture "book_id" BookID :> Get '[OctetStream] ByteString
-
-handler :: ServerT API AppM
-handler user = listBooksHandler user
-          :<|> postBookMetaHandler user
-          :<|> putBookMetaHandler user
-          :<|> putBookContentHandler user
-          :<|> getBookContentHandler user
-
-getBookContentHandler :: AuthResult SafeUser -> BookID -> AppM ByteString
-getBookContentHandler auth bookId = requireBookOwner auth bookId $ \SafeUser{username} -> do
-  content <- runMaybeT $ do
-    Book{contentHash=mHash} <- MaybeT $ runDB (getBook bookId username)
-    contentHash <- MaybeT $ return (mHash >>= digestFromByteString . unHex)
-    MaybeT $ DS.get contentHash
-  maybe (throwM err404) return content
-
-requireBookOwner :: AuthResult SafeUser -> BookID -> (SafeUser -> AppM a) -> AppM a
-requireBookOwner auth bookId f = flip requireLoggedIn auth $ \u@SafeUser{username} -> do
-  exists <- runDB $ bookExists bookId
-  unless exists $ throwM err404
-  runDB (isBookOwner bookId username) >>= \o -> if o then f u else throwM err403
-
-putBookContentHandler :: AuthResult SafeUser -> BookID -> ByteString -> AppM NoContent
-putBookContentHandler auth bookId content = requireBookOwner auth bookId $ \SafeUser{username} -> do
-  key <- HashDigest . convert <$> DS.put content
-  runDB (setContent bookId username key)
-  return NoContent
-
-postBookMetaHandler :: AuthResult SafeUser -> PostBook -> AppM JsonBook
-postBookMetaHandler auth PostBook{..} = flip requireLoggedIn auth $ \SafeUser{username} -> do
-  mIdentifier <- runDB $ insertBook InsertBook{owner=username,..}
-  maybe (throwM err403{errBody="Could not insert book"}) (\identifier -> pure JsonBook{..}) mIdentifier
-
-
-putBookMetaHandler :: AuthResult SafeUser -> BookID -> JsonBook -> AppM JsonBook
-putBookMetaHandler auth bookId JsonBook{..}
-  | bookId == identifier = requireBookOwner auth bookId $ \SafeUser{username=owner} ->
-        maybe (throwM err403) (return . view (super @JsonBook)) =<< runDB (updateBook UpdateBook{..})
-  | otherwise = throwM err403
-
-listBooksHandler :: AuthResult SafeUser -> AppM [JsonBook]
-listBooksHandler = requireLoggedIn $ \user -> do
-  runDB (usersBooks (view (field @"username") user) >>= mapM augment)
-    where
-      augment Book{identifier=bookId,contentType,title,description} = do
-        channels <- fmap (view (field @"channel")) <$> booksChannels bookId
-        tags <- fmap (view (field @"tag")) <$> booksTags bookId
-        pure JsonBook{identifier=bookId,..}
--- a/src/Server.hs
+++ b/src/Server.hs
@ -1,40 +0,0 @@
-{-# Language DataKinds #-}
-{-# Language TypeFamilies #-}
-{-# Language TypeOperators #-}
-{-# Language NoImplicitPrelude #-}
-{-# Language MultiParamTypeClasses #-}
-{-# Language OverloadedStrings #-}
-{-# Language TemplateHaskell #-}
-{-# Language QuasiQuotes #-}
-{-# Language RecordWildCards #-}
-{-# Language DeriveGeneric #-}
-{-# Language FlexibleInstances #-}
-{-# Language TypeApplications #-}
-module Server where
-
-import qualified API as API
-import Server.Auth (authCheck)
-import Servant
-import Types
-import ClassyPrelude hiding (Handler)
-import Control.Monad.Logger
-import Control.Monad.Except
-import Servant.Auth.Server as SAS
-import Control.Lens
-import Data.Generics.Product
-
-type API = API.API :<|> "static" :> Raw
-
-
-server :: App -> Application
-server app = serveWithContext api cfg (enter server' API.handler :<|> serveDirectoryFileServer "static")
-  where
-    myKey = view (field @"jwk") app
-    jwtCfg = defaultJWTSettings myKey
-    authCfg = authCheck app
-    cookieSettings = SAS.defaultCookieSettings{cookieIsSecure=SAS.NotSecure}
-    cfg = jwtCfg :. cookieSettings :. authCfg :. EmptyContext
-    server' :: AppM :~> Servant.Handler
-    server' = NT (Handler . ExceptT . try . (`runReaderT` app) . (runFileLoggingT "logs/server.log"))
-    api :: Proxy API
-    api = Proxy
Author	SHA1	Message	Date
Mats Rauhala	2eb5304977	WIP ghcjs	2018-12-19 00:24:11 +02:00
Mats Rauhala	6455d51d0e	stylish-haskell changes	2018-12-15 23:31:30 +02:00
Mats Rauhala	f50311e126	Overrides for ghcjs	2018-11-14 00:20:00 +02:00
Mats Rauhala	1b678e5758	wip	2018-11-13 00:21:20 +02:00
Mats Rauhala	2a53bbfdbb	wip	2018-11-12 23:56:30 +02:00
Mats Rauhala	5490065604	wip	2018-11-12 23:40:04 +02:00
Mats Rauhala	f9dbbf8321	ghc	2018-11-12 23:33:12 +02:00
Mats Rauhala	44bc4d8832	Dummy front	2018-11-12 23:27:34 +02:00
Mats Rauhala	2748efb0e8	Build both back and front	2018-11-12 22:59:29 +02:00
Mats Rauhala	f3004eb020	Start building the frontend libs	2018-11-12 22:58:50 +02:00
Mats Rauhala	e459a318bd	Disable cache nix root	2018-11-12 22:34:58 +02:00
Mats Rauhala	92e34fdfcc	Use the nix-build command instead	2018-11-12 21:53:47 +02:00
Mats Rauhala	26af45713c	Travis build	2018-11-12 21:46:42 +02:00
Mats Rauhala	5727ea5574	Docs support	2018-11-12 21:32:42 +02:00
Mats Rauhala	7928aa1cb6	More tests	2018-10-26 23:59:06 +03:00
Mats Rauhala	fb29a6e694	Automatic testing for schema	2018-10-26 23:47:14 +03:00
Mats Rauhala	5961a99d77	Simple placeholder test	2018-10-26 22:15:11 +03:00
Mats Rauhala	6cabe97b30	Start working on multiple data backends	2018-10-18 00:12:30 +03:00
Mats Rauhala	8733c4d1d1	Upgrade	2018-10-17 23:51:30 +03:00
MasseR	eb770b91af	Merge branch 'sandbox/MasseR/28-separate-lib' of MasseR/ebook-manager into master	2018-08-29 23:06:22 +03:00
Mats Rauhala	f5f6c9ced9	Clean up common.cabal	2018-08-29 23:03:32 +03:00
Mats Rauhala	fdbd24a4bf	Tools support for nix	2018-08-29 23:03:24 +03:00
Mats Rauhala	6865af361d	Support for multiproject builds with nix - Closes #28	2018-08-29 22:45:25 +03:00
MasseR	d792cb2a81	Merge branch 'sandbox/MasseR/2-opds' of MasseR/ebook-manager into master Closes #2	2018-08-28 23:28:24 +03:00
Mats Rauhala	cd086165db	Initial OPDS support Channel listing (#2) List books (#2) Closes (#2)	2018-08-28 23:26:49 +03:00
				`@ -1 +0,0 @@`
				`alter table users add column token text null;`
				`@ -0,0 +1 @@`
				`create unique index tag_owner on tags (tag, owner);`