{"header":{"message":"Beginning of modularization of server.","description":null,"timestamp":"2015-01-20T23:42:00Z","authors":[{"email":"kris.nuttycombe@gmail.com","name":"Kris Nuttycombe"}]},"hash":"BROSTG5KP3NUNLSYPVQID254TE47E5RKQAKLPIY7PGWETE6JNMTAC","authors":[],"deps":{"hashes":[["BROSTG5KP3NUNLSYPVQID254TE47E5RKQAKLPIY7PGWETE6JNMTAC","Beginning of modularization of server."],["AA",null],["EYGIUUQZSCUCLEF6IFIN6RD3TCSOTTSQEQ2SV7OJRVVNFE6NJQPQC","Restore remainder of endpoints to compiling status."],["RSEB2NFGUBTFESE5BJKDUVQL5Y5ZVGY5O4CJX2LNP63MS3NRHHZQC","Replacing Snap with Scotty."],["NVOCQVASZWTKQJG7GPH7KHKZZR7NUG4WLV5YY4KAIRPCJRWCZPIAC","Initial failing tests."],["EQXRXRZDYCM7BDAVBOXQYPG6C7IJT3OFGNIXCDAHJJBRKAXNGL7AC","Changed to use tasty instead of test-framework"],["ADMKQQGCGVSHHIMVQ4XFRDCG544SBJCYALSKZV45CQQBZ4ACUH2AC","Initial empty Snap project."],["4QX5E5ACVN57KJLCWOM4JEI6JSV4XZNCWVYPOTKSOMUW3SOMCNJAC","Initial compilation of payouts function succeeds."],["64VI73NPSFNWTL6UXM6YHRFLNJZ3NUJ2R3CL53MO2HSZWFGBIRTQC","Server now compiles using abstracted SQLite"],["WFZDMVUXZ2KPTMRAZGEYHKEJTKOKWVYCXKKAKQ7K6I5TMSLBUJ4QC","Rename ADB -> QDB"],["TLQ72DSJD7GGPWN6HGBHAVPBRQFKEQ6KSK43U7JWWID4ZWAF47JAC","Lenses, sqlite-simple"],["TCOAKCGGHOIRJCTZYEZQ3K6KCGL2LGAYGYFRGSPCHBTJJY2V6AXAC","Completed conversion to snap."],["2Y2QZFVFSKXEFEGYJB5A7GI735ONWPCF7DVTIY5T73AUEVTZTBBQC","Switch to more modern cabal2nix-based workflow."],["IZEVQF627FA7VV25KJAWYWGGC35LZUUBBQRPN5ZAINTQLPEDRTEAC","Work in progress replacing sqlite with postgres."],["W35DDBFYF6Z4ZPCFEO5RPAONZLYCSNTXUSTS6FIUUVZHCI6Q7GHAC","Factor common JSON conversions up into client lib module."],["EMVTF2IWNQGRL44FC4JNG5FYYQTZSFPNM6SOM7IAEH6T7PPK2NVAC","WIP moving back to snap."],["TNR3TEHKVADAEZSTOD2XLSUTSW5AWST2YUW4CWK5KE7DSC6XHZNAC","Switch to Postgres + snaplet arch compiles."],["64C6AWH66FDKU6UE6Z6JPX2J2GBM2JOPTH2GL6LHKAIUBGNGDZ5AC","Rename Ananke -> Quixotic, project reboot."],["WZUHEZSBRKHQMNWDKVG4X6DDIQEAXTGI6IGAJ5ERPRQ3W2KUMX4QC","Start of migration back toward snap."],["Z3M53KTLZMPOISMHE25SZJSWX5TA37IV33IRE7KNRAD3PKEAEJXQC","Adrift."],["LAROLAYUGJ4Q5AEFV5EJMIA2ZKBNCBWHHHPCJ3CKCNIUIYUKRFVQC","WIP"],["MK7ODWHUEPOMAEVK5D3OWW25QRAXKDO4ZVJKNZGWKB5434MP2LNAC","Some minor renaming."],["GKGVYBZGPJXO7N7GLHLRNYQPXFHBQSNQN53OKRFCXLQEYDTC5I4QC","Added JSON serialization to TimeLog"],["NJZ3DKZYZTAEHPAEXS3XFWIPCJFR3D4642UQMGQABVFGNKQUEQVAC","THEY CAN TALK!"],["7XN3I3QJHYMKU2DCUXX34WQMSJ4ZJOWW7FME34EANO3E5W4Q632AC","Add 'loggedIntervals' endpoint."],["5W5M56VJFJEBXMGBVKGCKPHOEMVTKUOQMLPJP7VNDQLTYNJXXLHQC","Move library code to 'lib'"],["WO2MINIF4TXOHWSE7JWXRZYN64XRVLYIRFMF4SMPSOXKA2V77KMQC","Auctions now compile!"],["OBFPJS2GHO2PEHBHGEHKIUOUAFIQHPIZXEVD2YIE3ZIE2PVMH5VAC","Project successfully builds and tests under nix."]],"deps":["EYGIUUQZSCUCLEF6IFIN6RD3TCSOTTSQEQ2SV7OJRVVNFE6NJQPQC"],"known":["ADMKQQGCGVSHHIMVQ4XFRDCG544SBJCYALSKZV45CQQBZ4ACUH2AC","NVOCQVASZWTKQJG7GPH7KHKZZR7NUG4WLV5YY4KAIRPCJRWCZPIAC","EQXRXRZDYCM7BDAVBOXQYPG6C7IJT3OFGNIXCDAHJJBRKAXNGL7AC","4QX5E5ACVN57KJLCWOM4JEI6JSV4XZNCWVYPOTKSOMUW3SOMCNJAC","GKGVYBZGPJXO7N7GLHLRNYQPXFHBQSNQN53OKRFCXLQEYDTC5I4QC","RSEB2NFGUBTFESE5BJKDUVQL5Y5ZVGY5O4CJX2LNP63MS3NRHHZQC","64C6AWH66FDKU6UE6Z6JPX2J2GBM2JOPTH2GL6LHKAIUBGNGDZ5AC","64VI73NPSFNWTL6UXM6YHRFLNJZ3NUJ2R3CL53MO2HSZWFGBIRTQC","Z3M53KTLZMPOISMHE25SZJSWX5TA37IV33IRE7KNRAD3PKEAEJXQC","5W5M56VJFJEBXMGBVKGCKPHOEMVTKUOQMLPJP7VNDQLTYNJXXLHQC","WZUHEZSBRKHQMNWDKVG4X6DDIQEAXTGI6IGAJ5ERPRQ3W2KUMX4QC","EMVTF2IWNQGRL44FC4JNG5FYYQTZSFPNM6SOM7IAEH6T7PPK2NVAC","LAROLAYUGJ4Q5AEFV5EJMIA2ZKBNCBWHHHPCJ3CKCNIUIYUKRFVQC","WFZDMVUXZ2KPTMRAZGEYHKEJTKOKWVYCXKKAKQ7K6I5TMSLBUJ4QC","TLQ72DSJD7GGPWN6HGBHAVPBRQFKEQ6KSK43U7JWWID4ZWAF47JAC","TCOAKCGGHOIRJCTZYEZQ3K6KCGL2LGAYGYFRGSPCHBTJJY2V6AXAC","W35DDBFYF6Z4ZPCFEO5RPAONZLYCSNTXUSTS6FIUUVZHCI6Q7GHAC","2Y2QZFVFSKXEFEGYJB5A7GI735ONWPCF7DVTIY5T73AUEVTZTBBQC","NJZ3DKZYZTAEHPAEXS3XFWIPCJFR3D4642UQMGQABVFGNKQUEQVAC","7XN3I3QJHYMKU2DCUXX34WQMSJ4ZJOWW7FME34EANO3E5W4Q632AC","MK7ODWHUEPOMAEVK5D3OWW25QRAXKDO4ZVJKNZGWKB5434MP2LNAC","IZEVQF627FA7VV25KJAWYWGGC35LZUUBBQRPN5ZAINTQLPEDRTEAC","TNR3TEHKVADAEZSTOD2XLSUTSW5AWST2YUW4CWK5KE7DSC6XHZNAC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":846},"path":"lib/Quixotic/TimeLog.hs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":846},"to":{"change":3,"start":3390,"end":3497},"introduced_by":3}],"inode":{"change":3,"pos":846}}},"contents":[{"Del":"{-# LANGUAGE ScopedTypeVariables #-}\n{-# LANGUAGE OverloadedStrings #-}\n{-# LANGUAGE NoImplicitPrelude #-}\n"}]}},{"Edit":{"inode":{"change":3,"pos":1},"path":"quixotic.cabal","line":18,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":270}],"down_context":[{"change":3,"pos":554}],"flag":"BLOCK","start":4,"end":164,"inode":{"change":3,"pos":1}}},"contents":[{"Add":" default-extensions: NoImplicitPrelude"},{"Add":" , OverloadedStrings"},{"Add":" , RecordWildCards"},{"Add":" , ScopedTypeVariables"}]}},{"Edit":{"inode":{"change":3,"pos":1},"path":"quixotic.cabal","line":60,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1496}],"down_context":[{"change":27,"pos":2112}],"flag":"BLOCK","start":165,"end":325,"inode":{"change":3,"pos":1}}},"contents":[{"Add":" default-extensions: NoImplicitPrelude"},{"Add":" , OverloadedStrings"},{"Add":" , RecordWildCards"},{"Add":" , ScopedTypeVariables"}]}},{"Edit":{"inode":{"change":3,"pos":1},"path":"quixotic.cabal","line":80,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1833}],"down_context":[{"change":3,"pos":1833}],"flag":"BLOCK","start":326,"end":486,"inode":{"change":3,"pos":1}}},"contents":[{"Add":" default-extensions: NoImplicitPrelude"},{"Add":" , OverloadedStrings"},{"Add":" , RecordWildCards"},{"Add":" , ScopedTypeVariables"}]}},{"Edit":{"inode":{"change":3,"pos":1},"path":"quixotic.cabal","line":88,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1277}],"down_context":[{"change":3,"pos":1277}],"flag":"BLOCK","start":487,"end":504,"inode":{"change":3,"pos":1}}},"contents":[{"Add":" , bytestring"}]}},{"Edit":{"inode":{"change":3,"pos":1},"path":"quixotic.cabal","line":107,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":7467}],"down_context":[{"change":3,"pos":7467}],"flag":"BLOCK","start":505,"end":546,"inode":{"change":3,"pos":1}}},"contents":[{"Add":" , attoparsec"},{"Add":" , base64-bytestring"}]}},{"Edit":{"inode":{"change":3,"pos":1},"path":"quixotic.cabal","line":115,"atom":{"NewVertex":{"up_context":[{"change":28,"pos":3346}],"down_context":[{"change":28,"pos":3346}],"flag":"BLOCK","start":547,"end":707,"inode":{"change":3,"pos":1}}},"contents":[{"Add":" default-extensions: NoImplicitPrelude"},{"Add":" , OverloadedStrings"},{"Add":" , RecordWildCards"},{"Add":" , ScopedTypeVariables"}]}},{"FileDel":{"deleted_names":[{"basename":"Api","metadata":576}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":1243},"to":{"change":3,"start":548,"end":562},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":562},"to":{"change":3,"start":547,"end":547},"introduced_by":3}],"inode":{"change":3,"pos":547}}},"content_edges":null,"content":[]}},{"FileDel":{"deleted_names":[{"basename":"Api.hs","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":1243},"to":{"change":3,"start":1533,"end":1563},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":1563},"to":{"change":3,"start":1490,"end":1490},"introduced_by":3}],"inode":{"change":3,"pos":1490}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1490},"to":{"change":3,"start":1491,"end":1532},"introduced_by":3}],"inode":{"change":3,"pos":1490}},"content":[{"Del":"module Api (api) where\n\nimport Rest.API\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":5188},"path":"server/Main.hs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5188},"to":{"change":3,"start":897,"end":1040},"introduced_by":3}],"inode":{"change":3,"pos":5188}}},"contents":[{"Del":"{-# LANGUAGE ScopedTypeVariables #-} \n{-# LANGUAGE OverloadedStrings #-} \n{-# LANGUAGE NoImplicitPrelude #-}\n{-# LANGUAGE RecordWildCards #-} \n"}]}},{"Edit":{"inode":{"change":3,"pos":5188},"path":"server/Main.hs","line":24,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":943}],"down_context":[{"change":3,"pos":1565}],"flag":"BLOCK","start":710,"end":783,"inode":{"change":3,"pos":5188}}},"contents":[{"Add":"import Quixotic.Api"},{"Add":"import Quixotic.Api.Types"},{"Add":"import Quixotic.Api.Users"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":5188},"path":"server/Main.hs","line":47,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":314},"to":{"change":3,"start":7960,"end":8110},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8110},"to":{"change":3,"start":1268,"end":1310},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1310},"to":{"change":3,"start":8149,"end":8170},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8149},"to":{"change":3,"start":8149,"end":8170},"introduced_by":3}],"inode":{"change":3,"pos":5188}}},"contents":[{"Del":"\ntype PQDB = QDB (ReaderT Connection IO)\n\ndata App = App \n { _qdb :: Snaplet PQDB\n , _sess :: Snaplet SessionManager\n , _db :: Snaplet Postgres\n"},{"Del":" , _auth :: Snaplet (AU.AuthManager App)\n"},{"Del":" }\nmakeLenses ''App\n"}]}},{"Edit":{"inode":{"change":3,"pos":5188},"path":"server/Main.hs","line":48,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":315},"to":{"change":3,"start":1311,"end":1454},"introduced_by":3}],"inode":{"change":3,"pos":5188}}},"contents":[{"Del":"instance HasPostgres (Handler b App) where\n getPostgresState = with db get\n setLocalPostgresState s = local (set (db . snapletValue) s)\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":5188},"path":"server/Main.hs","line":62,"ins":{"up_context":[{"change":3,"pos":8755}],"down_context":[{"change":3,"pos":8817}],"flag":"BLOCK","start":784,"end":929,"inode":{"change":3,"pos":5188}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8755},"to":{"change":3,"start":8755,"end":8817},"introduced_by":3}],"inode":{"change":3,"pos":5188}},"ins_contents":[{"Add":" addRoutes [ (\"login\", loginHandler) "},{"Add":" , (\"register\", registerHandler)"},{"Add":" , (\"logStart/:btcAddr\", logWorkHandler StartWork)"}],"del_contents":[{"Del":" addRoutes [ (\"logStart/:btcAddr\", logWorkHandler StartWork)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":5188},"path":"server/Main.hs","line":66,"ins":{"up_context":[{"change":3,"pos":8878}],"down_context":[{"change":3,"pos":8999}],"flag":"BLOCK","start":930,"end":1047,"inode":{"change":3,"pos":5188}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8878},"to":{"change":3,"start":8878,"end":8999},"introduced_by":3}],"inode":{"change":3,"pos":5188}},"ins_contents":[{"Add":" , (\"loggedIntervals/:btcAddr\", loggedIntervalsHandler qdb)"},{"Add":" , (\"payouts\", payoutsHandler qdb)"}],"del_contents":[{"Del":"-- , (\"loggedIntervals/:btcAddr\", loggedIntervalsHandler qdb)\n-- , (\"payouts\", payoutsHandler qdb)\n"}]}},{"Edit":{"inode":{"change":3,"pos":5188},"path":"server/Main.hs","line":96,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":468},"to":{"change":3,"start":5695,"end":5696},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1197},"to":{"change":3,"start":5695,"end":5696},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1977},"to":{"change":3,"start":5695,"end":5696},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2767},"to":{"change":3,"start":5695,"end":5696},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5695},"to":{"change":3,"start":5695,"end":5696},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5696},"to":{"change":2,"start":75,"end":169},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":169},"to":{"change":3,"start":9241,"end":9373},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5696},"to":{"change":3,"start":9241,"end":9373},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":682},"to":{"change":3,"start":6062,"end":6063},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":884},"to":{"change":3,"start":6062,"end":6063},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2061},"to":{"change":3,"start":6062,"end":6063},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":3037},"to":{"change":3,"start":6062,"end":6063},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":9373},"to":{"change":3,"start":6062,"end":6063},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6062},"to":{"change":3,"start":6062,"end":6063},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6063},"to":{"change":3,"start":1455,"end":2121},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2121},"to":{"change":3,"start":9374,"end":9424},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6063},"to":{"change":3,"start":9374,"end":9424},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9424},"to":{"change":3,"start":2122,"end":2200},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2200},"to":{"change":3,"start":9563,"end":9679},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9563},"to":{"change":3,"start":9563,"end":9679},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9679},"to":{"change":3,"start":2201,"end":2461},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2461},"to":{"change":3,"start":981,"end":982},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":9872},"to":{"change":3,"start":981,"end":982},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":981},"to":{"change":3,"start":981,"end":982},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":982},"to":{"change":2,"start":170,"end":441},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":441},"to":{"change":3,"start":1016,"end":1017},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1144},"to":{"change":3,"start":1016,"end":1017},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":10559},"to":{"change":3,"start":1016,"end":1017},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1016},"to":{"change":3,"start":1016,"end":1017},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1017},"to":{"change":2,"start":442,"end":750},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":750},"to":{"change":3,"start":2462,"end":2509},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1017},"to":{"change":3,"start":2462,"end":2509},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2509},"to":{"change":3,"start":1181,"end":1328},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1181},"to":{"change":3,"start":1181,"end":1328},"introduced_by":3}],"inode":{"change":3,"pos":5188}}},"contents":[{"Del":"\n"},{"Del":"-- | FIXME, make configurable\ndepf :: DepF\ndepf = linearDepreciation (Months 6) (Months 60) \n\n"},{"Del":"qdbpgSnapletInit :: SnapletInit a PQDB\nqdbpgSnapletInit = makeSnaplet \"qdbpg\" \"QDB on Postgresql\" Nothing $ do\n return postgresQDB\n"},{"Del":"\n"},{"Del":"requireLogin :: Handler App App a -> Handler App App a\nrequireLogin = AU.requireUser auth (redirect \"/login\")\n\nrequireUserId :: (UserId -> Handler App App a) -> Handler App App a \nrequireUserId hf = AU.requireUser auth (redirect \"/login\") $ do\n QDB{..} <- with qdb get\n authedUser <- with auth AU.currentUser\n qdbUser <- case UserName . AU.unUid <$> (AU.userId =<< authedUser) of \n Nothing -> snapError 403 \"User is authenticated, but session lacks user identifier\"\n Just n -> liftPG . runReaderT $ findUserByUserName n\n case qdbUser of\n Nothing -> snapError 403 \"Unable to retrieve user record for authenticated user\" \n Just u -> hf (u ^. userId)\n\n"},{"Del":"logWorkHandler :: EventType -> Handler App App ()\n"},{"Del":"logWorkHandler evType = requireUserId $ \\uid -> do \n QDB{..} <- with qdb get\n"},{"Del":" addrBytes <- getParam \"btcAddr\"\n timestamp <- liftIO getCurrentTime\n let workEvent = WorkEvent evType timestamp\n"},{"Del":" storeEv addr = runReaderT . recordEvent uid $ LogEntry addr workEvent\n case fmap decodeUtf8 addrBytes >>= parseBtcAddr of\n Nothing -> snapError 400 $ \"Unable to parse bitcoin address from \" <> (tshow addrBytes)\n Just addr -> liftPG $ storeEv addr\n"},{"Del":"\n"},{"Del":"loggedIntervalsHandler :: Handler App App ()\nloggedIntervalsHandler = requireLogin $ do\n QDB{..} <- with qdb get\n widx <- liftPG $ runReaderT readWorkIndex\n modifyResponse $ addHeader \"content-type\" \"application/json\"\n writeLBS . A.encode $ mapKeys (^. address) widx\n"},{"Del":"\n"},{"Del":"payoutsHandler :: Handler App App ()\npayoutsHandler = requireLogin $ do \n QDB{..} <- with qdb get\n ptime <- liftIO $ getCurrentTime\n widx <- liftPG $ runReaderT readWorkIndex\n modifyResponse $ addHeader \"content-type\" \"application/json\"\n writeLBS . A.encode . PayoutsResponse $ payouts depf ptime widx\n\n"},{"Del":"snapError :: MonadSnap m => Int -> Text -> m a\n"},{"Del":"snapError c t = do\n modifyResponse $ setResponseStatus c $ encodeUtf8 t\n writeText $ ((tshow c) <> \" - \" <> t)\n r <- getResponse\n finishWith r\n"}]}},{"FileAdd":{"meta":{"basename":"Quixotic","metadata":576},"context":[{"change":3,"pos":1243}],"contents":[]}},{"FileAdd":{"meta":{"basename":"Api","metadata":576},"context":[{"change":0,"pos":1049}],"contents":[]}},{"FileAdd":{"meta":{"basename":"Types.hs","metadata":0},"context":[{"change":0,"pos":1071}],"contents":[{"Add":"{-# LANGUAGE FlexibleInstances #-} "},{"Add":"{-# LANGUAGE TemplateHaskell #-}"},{"Add":""},{"Add":"module Quixotic.Api.Types where"},{"Add":""},{"Add":"import ClassyPrelude "},{"Add":""},{"Add":"import Control.Lens"},{"Add":"import Control.Monad.Reader"},{"Add":"import Control.Monad.State"},{"Add":"import Database.PostgreSQL.Simple"},{"Add":""},{"Add":"import Quixotic.Database"},{"Add":"import Quixotic.Database.PostgreSQL"},{"Add":"import Quixotic.TimeLog"},{"Add":"import Quixotic.Users"},{"Add":""},{"Add":"import Snap.Core"},{"Add":"import Snap.Snaplet"},{"Add":"import Snap.Snaplet.PostgresqlSimple"},{"Add":"import qualified Snap.Snaplet.Auth as AU"},{"Add":"import Snap.Snaplet.Session"},{"Add":""},{"Add":"data QModules = QModules "},{"Add":" { _qdb :: QDB (ReaderT Connection IO) "},{"Add":" , _depf :: DepF"},{"Add":" }"},{"Add":"makeLenses ''QModules"},{"Add":""},{"Add":"data App = App "},{"Add":" { _qm :: Snaplet QModules"},{"Add":" , _sess :: Snaplet SessionManager"},{"Add":" , _db :: Snaplet Postgres"},{"Add":" , _auth :: Snaplet (AU.AuthManager App)"},{"Add":" }"},{"Add":"makeLenses ''App"},{"Add":""},{"Add":"instance HasPostgres (Handler b App) where"},{"Add":" getPostgresState = with db get"},{"Add":" setLocalPostgresState s = local (set (db . snapletValue) s)"},{"Add":""},{"Add":"-- | FIXME, make configurable"},{"Add":"qdbpgSnapletInit :: SnapletInit a QModules"},{"Add":"qdbpgSnapletInit = makeSnaplet \"qdbpg\" \"QDB on Postgresql\" Nothing $ do"},{"Add":" pure $ QModules postgresQDB $ linearDepreciation (Months 6) (Months 60) "},{"Add":""},{"Add":"requireLogin :: Handler App App a -> Handler App App a"},{"Add":"requireLogin = AU.requireUser auth (redirect \"/login\")"},{"Add":""},{"Add":"requireUserId :: (UserId -> Handler App App a) -> Handler App App a "},{"Add":"requireUserId hf = AU.requireUser auth (redirect \"/login\") $ do"},{"Add":" QDB{..} <- view qdb <$> with qm get"},{"Add":" authedUser <- with auth AU.currentUser"},{"Add":" qdbUser <- case UserName . AU.unUid <$> (AU.userId =<< authedUser) of "},{"Add":" Nothing -> snapError 403 \"User is authenticated, but session lacks user identifier\""},{"Add":" Just n -> liftPG . runReaderT $ findUserByUserName n"},{"Add":" case qdbUser of"},{"Add":" Nothing -> snapError 403 \"Unable to retrieve user record for authenticated user\" "},{"Add":" Just u -> hf (u ^. userId)"},{"Add":""},{"Add":"snapError :: MonadSnap m => Int -> Text -> m a"},{"Add":"snapError c t = do"},{"Add":" modifyResponse $ setResponseStatus c $ encodeUtf8 t"},{"Add":" writeText $ ((tshow c) <> \" - \" <> t)"},{"Add":" getResponse >>= finishWith"},{"Add":""},{"Add":"ok :: MonadSnap m => m ()"},{"Add":"ok = do"},{"Add":" modifyResponse $ setResponseCode 200"},{"Add":" getResponse >>= finishWith "}]}},{"FileAdd":{"meta":{"basename":"Users.hs","metadata":0},"context":[{"change":0,"pos":1071}],"contents":[{"Add":"{-# LANGUAGE ScopedTypeVariables #-} "},{"Add":"{-# LANGUAGE OverloadedStrings #-} "},{"Add":"{-# LANGUAGE NoImplicitPrelude #-}"},{"Add":"{-# LANGUAGE RecordWildCards #-} "},{"Add":"{-# LANGUAGE TemplateHaskell #-}"},{"Add":""},{"Add":"module Quixotic.Api.Users "},{"Add":" ( loginHandler"},{"Add":" , registerHandler"},{"Add":" ) where"},{"Add":""},{"Add":"import ClassyPrelude "},{"Add":""},{"Add":"import Data.ByteString (split)"},{"Add":"import Data.Attoparsec.ByteString "},{"Add":"import qualified Data.ByteString.Base64 as B64"},{"Add":""},{"Add":"import Quixotic.Api.Types"},{"Add":""},{"Add":"import Snap.Core"},{"Add":"import Snap.Snaplet"},{"Add":"import qualified Snap.Snaplet.Auth as AU"},{"Add":""},{"Add":"data AuthHeader = AuthHeader Text ByteString"},{"Add":""},{"Add":"authHeaderParser :: Parser AuthHeader"},{"Add":"authHeaderParser = do"},{"Add":" let isBase64Char w = (w >= 47 && w <= 57 ) ||"},{"Add":" (w >= 64 && w <= 90 ) ||"},{"Add":" (w >= 97 && w <= 122) ||"},{"Add":" (w == 43 || w == 61 )"},{"Add":" b64 <- string \"Basic\" *> takeWhile1 isBase64Char "},{"Add":" decoded <- either fail pure $ B64.decode b64"},{"Add":" case split 58 decoded of"},{"Add":" (uname : pwd : []) -> pure $ AuthHeader (decodeUtf8 uname) pwd"},{"Add":" _ -> fail \"Could not unpack auth header into username and password components\""},{"Add":""},{"Add":"-- data CreateUser = CreateUser"},{"Add":"-- { _user :: User"},{"Add":"-- , _password :: ByteString"},{"Add":"-- }"},{"Add":"-- makeLenses ''CreateUser"},{"Add":""},{"Add":"loginHandler :: (AU.AuthUser -> Handler App App a) -> Handler App App a"},{"Add":"loginHandler onSuccess = do"},{"Add":" req <- getRequest"},{"Add":" rawHeader <- maybe throwChallenge pure $ getHeader \"Authorization\" req"},{"Add":" (AuthHeader uname pwd) <- either (throwDenied . AU.AuthError) pure $ parseOnly authHeaderParser rawHeader "},{"Add":" authResult <- with auth $ AU.loginByUsername uname (AU.ClearText pwd) False"},{"Add":" either throwDenied onSuccess authResult"},{"Add":""},{"Add":"registerHandler :: Handler App App ()"},{"Add":"registerHandler = ok"},{"Add":""},{"Add":"throwChallenge :: MonadSnap m => m a"},{"Add":"throwChallenge = do"},{"Add":" modifyResponse $ (setResponseStatus 401 \"Unauthorized\") . "},{"Add":" (setHeader \"WWW-Authenticate\" \"Basic realm=quixotic\")"},{"Add":" getResponse >>= finishWith"},{"Add":""},{"Add":"throwDenied :: MonadSnap m => AU.AuthFailure -> m a"},{"Add":"throwDenied failure = do"},{"Add":" modifyResponse $ setResponseStatus 403 \"Access Denied\""},{"Add":" writeText $ \"Access Denied: \" <> tshow failure"},{"Add":" getResponse >>= finishWith"}]}},{"FileMove":{"meta":{"basename":"WorkLog.hs","metadata":0},"old":[{"basename":"WorkLog.hs","metadata":0}],"up":[{"change":0,"pos":1071}],"down":[{"change":3,"pos":564}],"show_perms":false}},{"FileAdd":{"meta":{"basename":"Api.hs","metadata":0},"context":[{"change":0,"pos":1049}],"contents":[{"Add":"{-# LANGUAGE FlexibleInstances #-} "},{"Add":"{-# LANGUAGE TemplateHaskell #-}"},{"Add":""},{"Add":"module Quixotic.Api where"},{"Add":""},{"Add":"import ClassyPrelude "},{"Add":""},{"Add":"import Control.Lens"},{"Add":"import Control.Monad.State"},{"Add":"import qualified Data.Aeson as A"},{"Add":"import Data.Map"},{"Add":""},{"Add":"import Quixotic"},{"Add":"import Quixotic.Database"},{"Add":"import Quixotic.Json"},{"Add":"import Quixotic.TimeLog"},{"Add":""},{"Add":"import Quixotic.Api.Types"},{"Add":""},{"Add":"import Snap.Core"},{"Add":"import Snap.Snaplet"},{"Add":"import Snap.Snaplet.PostgresqlSimple"},{"Add":""},{"Add":"logWorkHandler :: EventType -> Handler App App ()"},{"Add":"logWorkHandler evType = requireUserId $ \\uid -> do "},{"Add":" QDB{..} <- view qdb <$> with qm get"},{"Add":" addrBytes <- getParam \"btcAddr\""},{"Add":" timestamp <- liftIO getCurrentTime"},{"Add":" let workEvent = WorkEvent evType timestamp"},{"Add":" storeEv addr = runReaderT . recordEvent uid $ LogEntry addr workEvent"},{"Add":" case fmap decodeUtf8 addrBytes >>= parseBtcAddr of"},{"Add":" Nothing -> snapError 400 $ \"Unable to parse bitcoin address from \" <> (tshow addrBytes)"},{"Add":" Just addr -> liftPG $ storeEv addr"},{"Add":""},{"Add":"loggedIntervalsHandler :: Handler App App ()"},{"Add":"loggedIntervalsHandler = requireLogin $ do"},{"Add":" QDB{..} <- view qdb <$> with qm get"},{"Add":" widx <- liftPG $ runReaderT readWorkIndex"},{"Add":" modifyResponse $ addHeader \"content-type\" \"application/json\""},{"Add":" writeLBS . A.encode $ mapKeys (^. address) widx"},{"Add":""},{"Add":"payoutsHandler :: Handler App App ()"},{"Add":"payoutsHandler = requireLogin $ do "},{"Add":" (QModules QDB{..} df) <- with qm get"},{"Add":" ptime <- liftIO $ getCurrentTime"},{"Add":" widx <- liftPG $ runReaderT readWorkIndex"},{"Add":" modifyResponse $ addHeader \"content-type\" \"application/json\""},{"Add":" writeLBS . A.encode . PayoutsResponse $ payouts df ptime widx"}]}}],"owner":"nuttycom","repo":"aftok","token":"toC/VPUR9ZQ6Eiy0t5NWpCH6uJdz7JRpq8oP4rDnwEI=","login":null}

…

Dependencies

Change contents