这是indexloc提供的服务，不要输入任何密码
Skip to content

fix auth hook mode env var (fix #1270) #1285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 4, 2019
Merged

fix auth hook mode env var (fix #1270) #1285

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc2109a
fix auth hook mode env var, (fix #1270)
rakeshkky Jan 2, 2019
db4ffce
Merge branch 'master' into issue-1270-hook-type-env
0x777 Jan 2, 2019
c77d17f
Merge branch 'master' into issue-1270-hook-type-env
shahidhk Jan 3, 2019
a1d7a89
Merge branch 'master' into issue-1270-hook-type-env
rakeshkky Jan 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions server/src-lib/Hasura/Server/Init.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,15 @@ mkServeOptions rso = do

mkAuthHook (AuthHookG mUrl mType) = do
mUrlEnv <- withEnv mUrl $ fst authHookEnv
ty <- fromMaybe AHTGet <$> withEnv mType (fst authHookTypeEnv)
authModeM <- withEnv mType (fst authHookModeEnv)
ty <- maybe (authHookTyEnv mType) return authModeM
return (flip AuthHookG ty <$> mUrlEnv)

-- Also support HASURA_GRAPHQL_AUTH_HOOK_TYPE
-- TODO:- drop this in next major update
authHookTyEnv mType = fromMaybe AHTGet <$>
withEnv mType "HASURA_GRAPHQL_AUTH_HOOK_TYPE"

mkCorsConfig (CorsConfigG mDom isDis) = do
domEnv <- fromMaybe "*" <$> withEnv mDom (fst corsDomainEnv)
return $ CorsConfigG domEnv isDis
Expand Down Expand Up @@ -303,7 +309,7 @@ serveCmdFooter =
envVarDoc = mkEnvVarDoc $ envVars <> eventEnvs
envVars =
[ servePortEnv, pgStripesEnv, pgConnsEnv, pgTimeoutEnv
, txIsoEnv, accessKeyEnv, authHookEnv , authHookTypeEnv
, txIsoEnv, accessKeyEnv, authHookEnv , authHookModeEnv
, jwtSecretEnv , unAuthRoleEnv, corsDomainEnv , enableConsoleEnv
]

Expand Down Expand Up @@ -357,10 +363,10 @@ authHookEnv =
, "The authentication webhook, required to authenticate requests"
)

authHookTypeEnv :: (String, String)
authHookTypeEnv =
( "HASURA_GRAPHQL_AUTH_HOOK_TYPE"
, "The authentication webhook type (default: GET)"
authHookModeEnv :: (String, String)
authHookModeEnv =
( "HASURA_GRAPHQL_AUTH_HOOK_MODE"
, "The authentication webhook mode (default: GET)"
)

jwtSecretEnv :: (String, String)
Expand Down Expand Up @@ -523,7 +529,7 @@ parseWebHook =
option (eitherReader readHookType)
( long "auth-hook-mode" <>
metavar "GET|POST" <>
help (snd authHookTypeEnv)
help (snd authHookModeEnv)
)


Expand Down