diff --git a/Foundation.hs b/Foundation.hs index a720006..4e45806 100644 --- a/Foundation.hs +++ b/Foundation.hs @@ -181,6 +181,7 @@ instance Yesod App where isAuthorized (AvatarR _) _ = return Authorized isAuthorized TriggerRemotelyR _ = return Authorized + isAuthorized (TriggerRemotelySimpleR _ _ _ _) _ = return Authorized isAuthorized TriggerLocallyR _ = return Authorized isAuthorized (OpenViewProgressR _) _ = return Authorized diff --git a/Handler/ShowChallenge.hs b/Handler/ShowChallenge.hs index 9def0cf..80ac76b 100644 --- a/Handler/ShowChallenge.hs +++ b/Handler/ShowChallenge.hs @@ -276,6 +276,18 @@ postTriggerRemotelyR = do (Just token) <- lookupPostParam "token" mBranch <- lookupPostParam "branch" mGitAnnexRemote <- lookupPostParam "git-annex-remote" + doTrigger token challengeName url mBranch mGitAnnexRemote + +postTriggerRemotelySimpleR :: Text -> Text -> Text -> Text -> Handler TypedContent +postTriggerRemotelySimpleR token challengeName url branch = + doTrigger token challengeName url (Just branch) Nothing + +getTriggerRemotelySimpleR :: Text -> Text -> Text -> Text -> Handler TypedContent +getTriggerRemotelySimpleR token challengeName url branch = + doTrigger token challengeName url (Just branch) Nothing + +doTrigger :: Text -> Text -> Text -> Maybe Text -> Maybe Text -> Handler TypedContent +doTrigger token challengeName url mBranch mGitAnnexRemote = do [Entity userId _] <- runDB $ selectList [UserTriggerToken ==. Just token] [] trigger userId challengeName url mBranch mGitAnnexRemote diff --git a/config/routes b/config/routes index 02ca3cc..fdd68a2 100644 --- a/config/routes +++ b/config/routes @@ -25,6 +25,7 @@ /challenge-discussion-rss/#Text ChallengeDiscussionFeedR GET /challenge-update/#ChallengeId ChallengeUpdateR GET POST /trigger-remotely TriggerRemotelyR POST +/trigger-remotely-simple/#Text/#Text/#Text/#Text TriggerRemotelySimpleR GET POST /trigger-locally TriggerLocallyR POST /indicator-graph-data/#IndicatorId IndicatorGraphDataR GET diff --git a/templates/challenge-how-to.hamlet b/templates/challenge-how-to.hamlet index 38c5bc9..f894f52 100644 --- a/templates/challenge-how-to.hamlet +++ b/templates/challenge-how-to.hamlet @@ -131,6 +131,9 @@ $maybe token <- mToken

Your webook is:

      wget --timeout=0 --quiet -O - '#{appRoot settings}/trigger-remotely' --post-data 'token=#{token}&branch=#{myBranch}&challenge=#{challengeName challenge}&url=URL_TO_YOUR_REPO'
+   

or you can just use the following URL: +

+     #{appRoot settings}/trigger-remotely-simple/#{token}/#{challengeName challenge}/URL_TO_YOUR_REPO/#{myBranch}
 
 

Manual submission