diff --git a/config/routes b/config/routes index e9f892e..f8f1292 100644 --- a/config/routes +++ b/config/routes @@ -1,5 +1,5 @@ -/ RootR GET -/marketplace/#PkgId MarketplaceR GET +/ RootR GET +/marketplace/#PkgId MarketplaceR GET -- EOS API V0 /eos/v0/latest EosVersionR GET -- get eos information diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs index 4d746e1..672ee53 100644 --- a/src/Handler/Admin.hs +++ b/src/Handler/Admin.hs @@ -154,6 +154,7 @@ postPkgUploadR = do resourcesTemp <- getsYesod $ ( "temp") . resourcesDir . appSettings createDirectoryIfMissing True resourcesTemp pkgId_ <- getPkgIdParam + $logInfo $ "PARAM: " <> show pkgId_ withTempDirectory resourcesTemp "newpkg" $ \dir -> do let path = dir "temp" <.> "s9pk" case pkgId_ of diff --git a/src/Handler/Util.hs b/src/Handler/Util.hs index 21a2016..e00261b 100644 --- a/src/Handler/Util.hs +++ b/src/Handler/Util.hs @@ -310,8 +310,7 @@ checkAdminAuthUpload pkgId = do getPkgIdParam :: MonadHandler m => m (Maybe PkgId) getPkgIdParam = do - id <- lookupPostParam "id" - case id of + lookupPostParam "id" >>= \case Nothing -> pure Nothing Just v -> case readMaybe v of Nothing -> sendResponseStatus status400 ("Invalid PkgId" :: Text)