jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change raw-media-types to accept a string of comma separated MIME types (#1370)

Browse Source
This commit is contained in:
Dan Amoroso
2019-08-06 13:23:52 -05:00
committed by Steve Chávez
parent ee40e7e0d7
commit d5758523f3
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+2
View File
@@ -9,6 +9,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- #1369, Change `raw-media-types` to accept a string of comma separated MIME types - @Dansvidania
## [6.0.1] - 2019-07-30 ## [6.0.1] - 2019-07-30
### Added ### Added
src/PostgREST/Config.hs
+6 -12
View File
@@ -167,9 +167,9 @@ readOptions = do
<*> pure False <*> pure False
<*> (fmap (fmap coerceText) <$> C.subassocs "app.settings" C.value) <*> (fmap (fmap coerceText) <$> C.subassocs "app.settings" C.value)
<*> (maybe (Right [JSPKey "role"]) parseRoleClaimKey <$> optValue "role-claim-key") <*> (maybe (Right [JSPKey "role"]) parseRoleClaimKey <$> optValue "role-claim-key")
<*> (maybe ["public"] splitExtraSearchPath <$> optValue "db-extra-search-path") <*> (maybe ["public"] splitOnCommas <$> optValue "db-extra-search-path")
<*> ((\x y -> QualifiedIdentifier x <$> y) <$> dbSchema <*> optString "root-spec") <*> ((\x y -> QualifiedIdentifier x <$> y) <$> dbSchema <*> optString "root-spec")
<*> (fmap encodeUtf8 <$> optionalListOfText "raw-media-types") <*> (maybe [] (fmap encodeUtf8 . splitOnCommas) <$> optValue "raw-media-types")
parseJwtAudience :: C.Key -> C.Parser C.Config (Maybe StringOrURI) parseJwtAudience :: C.Key -> C.Parser C.Config (Maybe StringOrURI)
parseJwtAudience k = parseJwtAudience k =
@@ -180,12 +180,6 @@ readOptions = do
(Just "") -> pure Nothing (Just "") -> pure Nothing
aud' -> pure aud' aud' -> pure aud'
optionalListOfText :: C.Key -> C.Parser C.Config [Text]
optionalListOfText k =
C.optional k (C.list C.string) >>= \case
Nothing -> pure []
Just types -> pure types
reqString :: C.Key -> C.Parser C.Config Text reqString :: C.Key -> C.Parser C.Config Text
reqString k = C.required k C.string reqString k = C.required k C.string
@@ -219,9 +213,9 @@ readOptions = do
parseRoleClaimKey (C.String s) = pRoleClaimKey s parseRoleClaimKey (C.String s) = pRoleClaimKey s
parseRoleClaimKey v = pRoleClaimKey $ show v parseRoleClaimKey v = pRoleClaimKey $ show v
splitExtraSearchPath :: C.Value -> [Text] splitOnCommas :: C.Value -> [Text]
splitExtraSearchPath (C.String s) = strip <$> splitOn "," s splitOnCommas (C.String s) = strip <$> splitOn "," s
splitExtraSearchPath _ = [] splitOnCommas _ = []
opts = info (helper <*> pathParser) $ opts = info (helper <*> pathParser) $
fullDesc fullDesc
@@ -283,7 +277,7 @@ readOptions = do
|# root-spec = "stored_proc_name" |# root-spec = "stored_proc_name"
| |
|## content types to produce raw output |## content types to produce raw output
|# raw-media-types=["image/png","image/jpg"] |# raw-media-types="image/png, image/jpg"
|] |]
pathParser :: Parser FilePath pathParser :: Parser FilePath