diff --git a/Makefile b/Makefile index 4392d73..99a565e 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ ghcid: dev-deps: stack install ghcid -reset-database: destroy-create-db migration fixtures +reset-database: create-db-user destroy-create-db migration fixtures reset-data: truncate-tables fixtures diff --git a/src/Application.hs b/src/Application.hs index c4ec762..4597171 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -44,6 +44,7 @@ import System.Log.FastLogger (defaultBufSize, newStdoutLoggerSet, import Handler.Admin import Handler.Abstract import Handler.Auth +import Handler.Conference.Roles import Handler.Home import Helpers.Email diff --git a/src/Foundation.hs b/src/Foundation.hs index 30e8af4..6d5dace 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -39,7 +39,6 @@ instance Yesod App where defaultLayout w = do p <- widgetToPageContent w - msgs <- getMessages let pt = pageTitle p title = case renderHtml pt of "" -> "Moot" @@ -52,8 +51,6 @@ instance Yesod App where #{title} ^{pageHead p} <body> - $forall (status, msg) <- msgs - <p class="message #{status}">#{msg} ^{pageBody p} |] diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs index 8142753..b157a96 100644 --- a/src/Handler/Admin.hs +++ b/src/Handler/Admin.hs @@ -89,7 +89,7 @@ renderConferenceAbstractTypes conf@(Entity conferenceId _) getConferenceAbstractTypesR :: ConferenceId -> Handler Html getConferenceAbstractTypesR conferenceId = do - (_, _, _, conference) <- + (_, _, conference) <- requireOwnerForConference conferenceId abstractTypes <- runDB $ getAbstractTypes (entityKey conference) (abstractTypeFormWidget, _) <- generateFormPost abstractTypeForm @@ -97,7 +97,7 @@ getConferenceAbstractTypesR conferenceId = do postConferenceAbstractTypesR :: ConferenceId -> Handler Html postConferenceAbstractTypesR conferenceId = do - (_, _, _, conference) <- + (_, _, conference) <- requireOwnerForConference conferenceId ((result, abstractTypeFormWidget), _) <- runFormPost abstractTypeForm case result of @@ -105,10 +105,13 @@ postConferenceAbstractTypesR conferenceId = do abstractTypes <- runDB $ do void $ insertEntity $ - AbstractType (entityKey conference) name (makeTalkDuration duration) + AbstractType (entityKey conference) name (makeTalkDuration duration) getAbstractTypes (entityKey conference) renderConferenceAbstractTypes conference abstractTypes abstractTypeFormWidget - _ -> error "bluhhh" + err -> do + $logErrorSH err + abstractTypes <- runDB $ getAbstractTypes (entityKey conference) + renderConferenceAbstractTypes conference abstractTypes abstractTypeFormWidget renderConferencesCallout :: [Entity Conference] -> Text -> Widget renderConferencesCallout [] _ = return () @@ -175,8 +178,6 @@ renderSubmitterConferences userId = do |] renderConferenceSubmission :: Entity Conference - -- -> Entity AbstractType - -- -> Entity Abstract -> [( Entity AbstractType , Entity Abstract )] @@ -243,6 +244,10 @@ getConferenceDashboardR confId = do <h5> <a href="@{ConferenceSurrogateAbstractR confId}"> Submit surrogate abstract on behalf of a speaker + <h5> + <a href="@{ConferenceRolesR confId}"> + Manage conference roles and invite new users + <div .medium-6> <div. .medium-3 .column> <form method=POST diff --git a/src/Handler/Auth.hs b/src/Handler/Auth.hs index 496f539..6a6250d 100644 --- a/src/Handler/Auth.hs +++ b/src/Handler/Auth.hs @@ -42,7 +42,7 @@ requireVerifiedUser = do |] (Just _) -> return user -requireOwner :: Handler (Entity User, Entity Owner) +requireOwner :: Handler (Entity User, Entity Account) requireOwner = do user <- requireUser maybeOwner <- runDB $ getOwnerForUser (entityKey user) @@ -63,7 +63,7 @@ requireAccount :: Handler (Entity User, Entity Account) requireAccount = do maybeAccount <- requestAccount case maybeAccount of - (user, Nothing) -> do + (_, Nothing) -> do $logWarn "Current user is not associated with an account" permissionDenied noAccountsForUserMsg (user, Just account) -> return (user, account) @@ -79,9 +79,9 @@ requestAccount = do requireOwnerForEntity :: DBVal a - => EntityField a (Key Owner) + => EntityField a (Key Account) -> (SqlExpr (Entity a) -> SqlQuery b) - -> Handler (Entity User, Entity Owner, Entity a) + -> Handler (Entity User, Entity Account, Entity a) requireOwnerForEntity f w = do (user, owner) <- requireOwner maybeRec <- runDB $ getRecByField' f w (entityKey owner) @@ -94,10 +94,10 @@ requireOwnerForEntity f w = do requireOwnerForConference :: ConferenceId - -> Handler ( Entity User, Entity Owner, Entity Account, Entity Conference) + -> Handler (Entity User, Entity Account, Entity Conference) requireOwnerForConference conferenceId = do - (user, owner) <- requireOwner - maybeConfAcc <- runDB $ getAccAndConf owner + (user, account) <- requireOwner + maybeConfAcc <- runDB $ getAccAndConf (accountOwner $ entityVal account) case maybeConfAcc of Nothing -> do $logWarn "Current user is not associated with an account" @@ -106,18 +106,19 @@ requireOwnerForConference conferenceId = do $logWarn "Current user is not associated with any conferences" permissionDenied noConferencesForUserMsg Just (acc, Just conf) -> - return (user, owner, acc, conf) + return (user, acc, conf) where - getAccAndConf :: Entity Owner -> DB (Maybe (Entity Account, Maybe (Entity Conference))) - getAccAndConf owner = + getAccAndConf :: UserId -> DB (Maybe (Entity Account, Maybe (Entity Conference))) + getAccAndConf userId = selectFirst $ from $ \(account `LeftOuterJoin` mConference) -> do on (just (account ^. AccountId) ==. mConference ?. ConferenceAccount) - where_ (account ^. AccountOwner ==. val (entityKey owner)) + where_ (account ^. AccountOwner ==. val userId) + where_ (mConference ?. ConferenceId ==. (just (val conferenceId))) return (account, mConference) -- TODO: requireAdmin -requireAdmin :: Handler (Entity User, Either (Entity Owner) (Entity Admin)) +requireAdmin :: Handler (Entity User, Either (Entity Account) (Entity Admin)) requireAdmin = undefined requireAdminForConference @@ -130,8 +131,8 @@ requireAdminForConference conferenceId = do Nothing -> do let errMsg = "Conference does not exist" $logWarn errMsg >> permissionDenied errMsg - Just (conf, owner) -> do - unless (ownerUser (entityVal owner) == entityKey user) $ do + Just (conf, _, ownerUser) -> do + unless (entityKey ownerUser == entityKey user) $ do isAdmin <- runDB (isUserConferenceAdmin (entityKey user)) unless isAdmin $ do let errMsg = "Current User is not an admin of the conference" diff --git a/src/Handler/Conference/Roles.hs b/src/Handler/Conference/Roles.hs new file mode 100644 index 0000000..0a0ae0c --- /dev/null +++ b/src/Handler/Conference/Roles.hs @@ -0,0 +1,112 @@ +module Handler.Conference.Roles where + +import Import + +import Colonnade hiding (fromMaybe) +import qualified Data.Aeson as A +import qualified Data.Map as M +import Data.UUID.V4 (nextRandom) +import Yesod.Colonnade +import qualified Yesod.Paginator as Page + +import Handler.Admin +import Handler.Auth +import Helpers.Forms +import qualified Helpers.PaginateUtil as PageUtil +import Helpers.Views + +getConferenceRolesR :: ConferenceId -> Handler Html +getConferenceRolesR confId = do + (_, confEnt@(Entity _ conference)) <- requireAdminForConference confId + let confName = conferenceName conference + (admins, editors) <- runDB $ rolesForConference confId + baseLayout Nothing $ do + setTitle (fromString (unpack confName)) + [whamlet| +<article .grid-container> + ^{renderConferenceWidget confEnt} + <div .medium-6 .cell> + <h5> + <a href="@{ConferenceInviteRoleR confId}"> + Invite someone to be an editor on this conference + <h3>Users with roles on this conference + <h5>Admins + <ul> + $forall (Entity _ user, _) <- admins + <li>#{tshow user} + <h5>Editors + <ul> + $forall (Entity _ user, _) <- editors + <li>#{tshow user} +|] + +data RoleInviteForm = + RoleInviteForm { + role :: Role + , email :: Email + } deriving (Eq, Show) + +roleInviteForm :: Form RoleInviteForm +roleInviteForm = do + let roleList :: [(Text, Role)] + roleList = + [ ("Editor", EditorRole) + ] + renderDivs $ + RoleInviteForm + <$> areq (selectFieldList roleList) + (named "role" (placeheld "Role:")) (Just EditorRole) + <*> areq emailField' (named "email" + (placeheld "Email: ")) Nothing + +conferenceInviteRoleView :: Entity Conference -> Widget -> Handler Html +conferenceInviteRoleView confEnt@(Entity confId conference) roleInviteWidget = do + let confName = conferenceName conference + baseLayout Nothing $ do + setTitle (fromString (unpack confName)) + [whamlet| +<article .grid-container> + ^{renderConferenceWidget confEnt} + <div .medium-6> + <h3>Invite someone to perform a role for this conference + <div .medium-6> + <form method="POST" action="@{ConferenceInviteRoleR confId}"> + ^{roleInviteWidget} + <input .button type="submit" value="Invite"> +|] + +inviteEmailToConferenceRole :: ConferenceId + -> Email + -> Role + -> Handler (Entity RoleInvitation) +inviteEmailToConferenceRole confId email role = do + emailInvitation <- runDB $ createRoleInvitation confId email role + -- let uuid = editorInvitationUuid emailInvitation + -- $logInfoSH uuid + return $ emailInvitation + +getConferenceInviteRoleR :: ConferenceId -> Handler Html +getConferenceInviteRoleR confId = do + (_, confEnt) <- requireAdminForConference confId + (roleInviteWidget, _) <- generateFormPost roleInviteForm + conferenceInviteRoleView confEnt roleInviteWidget + +postConferenceInviteRoleR :: ConferenceId -> Handler Html +postConferenceInviteRoleR confId = do + (_, confEnt) <- requireAdminForConference confId + ((result, roleInviteWidget), _) <- runFormPost roleInviteForm + case result of + FormSuccess (RoleInviteForm role email) -> do + case role of + EditorRole -> do + _ <- inviteEmailToConferenceRole confId email role + (freshRoleInviteWidget, _) <- generateFormPost roleInviteForm + setMessage $ toHtml $ "You successfully invited: " <> tshow (unEmail email) + conferenceInviteRoleView confEnt freshRoleInviteWidget + err -> do + $logErrorSH err + conferenceInviteRoleView confEnt roleInviteWidget + +getConferenceAcceptRoleR :: ConferenceId -> UUID -> Handler Html +getConferenceAcceptRoleR confId uuid = do + undefined diff --git a/src/Helpers/Forms.hs b/src/Helpers/Forms.hs index fe4d954..5de07be 100644 --- a/src/Helpers/Forms.hs +++ b/src/Helpers/Forms.hs @@ -2,7 +2,6 @@ module Helpers.Forms where import Import.NoFoundation -import qualified Data.Text as T import qualified Text.Email.Validate as TEV named :: Text -> FieldSettings master -> FieldSettings master diff --git a/src/Helpers/PaginateUtil.hs b/src/Helpers/PaginateUtil.hs index 283e5a2..5c08453 100644 --- a/src/Helpers/PaginateUtil.hs +++ b/src/Helpers/PaginateUtil.hs @@ -7,7 +7,6 @@ where import Yesod.Paginator.Prelude import Yesod.Core import Yesod.Paginator.Pages -import Yesod.Persist.Core -- | Utility for better custom pagination allowing only one runDB. @@ -25,4 +24,4 @@ getCurrentPage :: MonadHandler m => m PageNumber getCurrentPage = fromMaybe 1 . go <$> lookupGetParam "p" where go :: Maybe Text -> Maybe PageNumber - go mp = readIntegral . unpack =<< mp \ No newline at end of file + go mp = readIntegral . unpack =<< mp diff --git a/src/Helpers/Views.hs b/src/Helpers/Views.hs index aafbd85..b7b1c94 100644 --- a/src/Helpers/Views.hs +++ b/src/Helpers/Views.hs @@ -7,6 +7,7 @@ baseLayout :: Maybe (Entity User) -> HandlerFor App Html baseLayout _ content = do nav <- renderNav + msgs <- getMessages defaultLayout $ do -- We need AJAX here and there. addScriptRemote "https://code.jquery.com/jquery-3.3.1.min.js" @@ -15,6 +16,8 @@ baseLayout _ content = do addStylesheet (StaticR css_app_css) [whamlet| ^{nav} +$forall (status, msg) <- msgs + <p class="message #{status}">#{msg} <br> ^{content} ^{renderFooter} diff --git a/src/Model.hs b/src/Model.hs index 1d361c7..df04469 100644 --- a/src/Model.hs +++ b/src/Model.hs @@ -27,8 +27,8 @@ import qualified Settings as S share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistLowerCase| User sql=users - email Email sqltype=varchar(100) - name Text sqltype=varchar(100) + email Email sqltype=varchar(320) + name Text sqltype=varchar(256) createdAt UTCTime verifiedAt UTCTime Maybe UniqueUserEmail email @@ -53,15 +53,10 @@ Reset sql=resets deriving Eq Show Account sql=accounts - owner OwnerId + owner UserId UniqueAccountOwner owner deriving Eq Show -Owner sql=owners - user UserId - UniqueOwnerUser user - deriving Eq Show - Admin sql=admins user UserId conference ConferenceId @@ -74,6 +69,17 @@ Editor sql=editors UniqueEditorUserConference user conference deriving Eq Show +RoleInvitation sql=role_invitations + email Email sqltype=varchar(320) + conference ConferenceId + role Role sqltype=varchar(100) + uuid UUID + createdAt UTCTime + verifiedAt UTCTime Maybe + user UserId Maybe + UniqueRoleInvitation email conference + deriving Eq Show + Conference sql=conferences account AccountId name Text diff --git a/src/Model/API.hs b/src/Model/API.hs index 2d167b6..091c0af 100644 --- a/src/Model/API.hs +++ b/src/Model/API.hs @@ -19,18 +19,17 @@ import qualified Data.ByteString.Base64 as B64 (encode) import qualified Database.Persist as P import qualified Database.Esqueleto.Internal.Language as Esq -getOwnerForUser :: UserId -> DB (Maybe (Entity Owner)) -getOwnerForUser userId = getRecByField OwnerUser userId +getOwnerForUser :: UserId -> DB (Maybe (Entity Account)) +getOwnerForUser userId = getRecByField AccountOwner userId -getAccountByOwner :: OwnerId -> DB (Maybe (Entity Account)) -getAccountByOwner ownerId = getRecByField AccountOwner ownerId +-- getAccountByOwner :: OwnerId -> DB (Maybe (Entity Account)) +-- getAccountByOwner ownerId = getRecByField AccountOwner ownerId getAccountByUser :: UserId -> DB (Maybe (Entity Account)) getAccountByUser userId = do selectFirst $ - from $ \(account `InnerJoin` owner) -> do - on (account ^. AccountOwner ==. owner ^. OwnerId) - where_ (owner ^. OwnerUser ==. val userId) + from $ \(account) -> do + where_ (account ^. AccountOwner ==. val userId) return account getRecsByField' :: ( DBAll val typ backend @@ -231,24 +230,17 @@ deleteExistingResets :: UserId -> DB () deleteExistingResets userId = do deleteWhere [ResetUser P.==. userId] -createOwner :: UserId -> DB (Entity Owner) -createOwner userKey = do - owner <- insertEntity $ Owner userKey - return owner - createAccount :: Email -> Text -> Text -> DB ( Entity User , Entity EmailVerification - , Entity Owner , Entity Account ) createAccount email name pass = do (user, emailVerification) <- createUser email name pass - owner <- createOwner (entityKey user) - account <- insertEntity $ Account (entityKey owner) - return (user, emailVerification, owner, account) + account <- insertEntity $ Account (entityKey user) + return (user, emailVerification, account) -------------------------------------------------------------------------------- -- Conferences @@ -296,14 +288,14 @@ getConference confId = getRecByField ConferenceId confId -- they exist. getOwnerForConference :: ConferenceId - -> DB (Maybe (Entity Conference, Entity Owner)) + -> DB (Maybe (Entity Conference, Entity Account, Entity User)) getOwnerForConference confId = selectFirst $ - from $ \(conference `InnerJoin` account `InnerJoin` owner) -> do - on (account ^. AccountOwner ==. owner ^. OwnerId) + from $ \(conference `InnerJoin` account `InnerJoin` user) -> do + on (account ^. AccountOwner ==. user ^. UserId) on (conference ^. ConferenceAccount ==. account ^. AccountId) where_ (conference ^. ConferenceId ==. (val confId)) - pure (conference, owner) + pure (conference, account, user) -- | Return whether or not the user is an admin of the conference -- Warning: Does not check if user is the owner of the conference @@ -592,3 +584,36 @@ getConfAndAbstractTypes confId = do (Just conf) -> do abstractTypes <- getAbstractTypes confId return $ Just $ (conf, abstractTypes) + +createRoleInvitation :: ConferenceId + -> Email + -> Role + -> DB (Entity RoleInvitation) +createRoleInvitation confId email role = do + uuid <- liftIO nextRandom + now <- liftIO getCurrentTime + insertEntity $ + RoleInvitation email confId role uuid now Nothing Nothing + +-------------------------------------------------------------------------------- +-- Roles ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- +rolesForConference :: ConferenceId + -> DB ( [(Entity User, Entity Admin)] + , [(Entity User, Entity Editor)] + ) +rolesForConference confId = do + admins <- getRoleUsers AdminUser AdminConference + editors <- getRoleUsers EditorUser EditorConference + pure (admins, editors) + where getRoleUsers :: (DBVal val) + => EntityField val UserId + -> EntityField val ConferenceId + -> DB [(Entity User, Entity val)] + getRoleUsers roleUserField roleConferenceField = + select $ + from $ \(conference `InnerJoin` roleModel `InnerJoin` user) -> do + on (user ^. UserId ==. roleModel ^. roleUserField) + on (roleModel ^. roleConferenceField ==. conference ^. ConferenceId) + where_ (conference ^. ConferenceId ==. val confId) + pure (user, roleModel) diff --git a/src/Model/Fixtures.hs b/src/Model/Fixtures.hs index 26535f9..7f67722 100644 --- a/src/Model/Fixtures.hs +++ b/src/Model/Fixtures.hs @@ -12,14 +12,18 @@ data EmailVerificationFixtures = EmailVerificationFixtures { allEmailVerificationsF :: [Entity EmailVerification] } deriving (Eq, Show) -data OwnerFixtures = - OwnerFixtures { allOwnersF :: [Entity Owner] } - deriving (Eq, Show) - data AccountFixtures = AccountFixtures { allAccountsF :: [Entity Account] } deriving (Eq, Show) +data AdminFixtures = + AdminFixtures { allAdminsF :: [Entity Admin] } + deriving (Eq, Show) + +data EditorFixtures = + EditorFixtures { allEditorsF :: [Entity Editor] } + deriving (Eq, Show) + data ConferenceFixtures = ConferenceFixtures { allConferencesF :: [Entity Conference] } deriving (Eq, Show) @@ -35,7 +39,6 @@ data AbstractTypeFixtures = data Fixtures = Fixtures { userF :: UserFixtures , emailVerificationF :: EmailVerificationFixtures - , ownerF :: OwnerFixtures , accountF :: AccountFixtures , conferenceF :: ConferenceFixtures , abstractTypeF :: AbstractTypeFixtures @@ -68,7 +71,6 @@ makeAccount :: Email -> Text -> DB ( Entity User , Entity EmailVerification - , Entity Owner , Entity Account ) makeAccount email' name pass = do @@ -79,11 +81,10 @@ uncurry3 f (a, b, c) = f a b c makeAccounts :: DB ( [Entity User] , [Entity EmailVerification] - , [Entity Owner] , [Entity Account] ) makeAccounts = - unzip4 <$> + unzip3 <$> sequenceA [ makeAccount chrisEmail "Chris Allen" chrisPassword , makeAccount alexeyEmail "Alexey" alexeyPassword ] @@ -185,7 +186,7 @@ futureTime = Just $ UTCTime (fromGregorian 2019 1 1) 0 insertFixtures :: DB Fixtures insertFixtures = do - (accountUsersF, allEmailVerificationsF, allOwnersF, allAccountsF) <- makeAccounts + (accountUsersF, allEmailVerificationsF, allAccountsF) <- makeAccounts -- Go ahead and verify all the users created with makeAccounts traverse_ verifyEmailEntity allEmailVerificationsF plainUsersF <- makeUsers @@ -283,7 +284,6 @@ insertFixtures = do let allConferencesF = chrisConferencesF ++ alexeyConferencesF userF = UserFixtures {..} emailVerificationF = EmailVerificationFixtures {..} - ownerF = OwnerFixtures {..} accountF = AccountFixtures {..} conferenceF = ConferenceFixtures {..} abstractTypeF = AbstractTypeFixtures {..} diff --git a/src/Model/Types.hs b/src/Model/Types.hs index 66bb3b1..73778b7 100644 --- a/src/Model/Types.hs +++ b/src/Model/Types.hs @@ -132,3 +132,21 @@ defaultConferenceSlug = makeConferenceSlug . filter ( /= ' ') displayConferenceSlug :: ConferenceSlug -> Text displayConferenceSlug = decodeUtf8 . urlEncode False . encodeUtf8 . unConferenceSlug + +data Role = + EditorRole + -- | Reviewer + -- | Scheduler + deriving (Eq, Show) + +instance PersistField Role where + toPersistValue EditorRole = PersistText "editor" + fromPersistValue (PersistText role) = + case role of + "editor" -> return EditorRole + t -> + Left + $ [st|Got invalid text value for Role, was: #{tshow t}|] + fromPersistValue v = + Left + $ [st|Got invalid PersistValue for Role, was: #{tshow v}|] diff --git a/src/Routes.hs b/src/Routes.hs index 27dd946..21a4321 100644 --- a/src/Routes.hs +++ b/src/Routes.hs @@ -25,6 +25,9 @@ mkYesodData "App" [parseRoutes| /organizer/signup OrganizerSignupR GET POST /conferences ConferencesR GET /conference/#ConferenceId ConferenceDashboardR GET +/conference/#ConferenceId/roles ConferenceRolesR GET +/conference/#ConferenceId/roles/invite ConferenceInviteRoleR GET POST +/conference/#ConferenceId/roles/#UUID/accept ConferenceAcceptRoleR GET /conference/#ConferenceId/cfp/open ConferenceCfpOpenR POST /conference/#ConferenceId/cfp/close ConferenceCfpCloseR POST /conference/#ConferenceId/abstract-types ConferenceAbstractTypesR GET POST