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

indicate access key is set in the console context (close #426) #447

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 1 commit into from
Sep 14, 2018
Merged

indicate access key is set in the console context (close #426) #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 14 additions & 6 deletions server/src-lib/Hasura/Server/App.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

module Hasura.Server.App where

import Control.Arrow ((***))
import Control.Concurrent.MVar
import Data.IORef

Expand Down Expand Up @@ -43,7 +44,8 @@ import Hasura.RQL.DDL.Schema.Table
--import Hasura.RQL.DML.Explain
import Hasura.RQL.DML.QueryTemplate
import Hasura.RQL.Types
import Hasura.Server.Auth (AuthMode, getUserInfo)
import Hasura.Server.Auth (AuthMode (..),
getUserInfo)
import Hasura.Server.Init
import Hasura.Server.Logging
import Hasura.Server.Middleware (corsMiddleware,
Expand All @@ -58,12 +60,18 @@ import Hasura.SQL.Types
consoleTmplt :: M.Template
consoleTmplt = $(M.embedSingleTemplate "src-rsr/console.html")

mkConsoleHTML :: IO T.Text
mkConsoleHTML =
isAccessKeySet :: AuthMode -> T.Text
isAccessKeySet AMNoAuth = "false"
isAccessKeySet _ = "true"

mkConsoleHTML :: AuthMode -> IO T.Text
mkConsoleHTML authMode =
bool (initErrExit errMsg) (return res) (null errs)
where
(errs, res) = M.checkedSubstitute consoleTmplt $
object ["version" .= consoleVersion]
object [ "version" .= consoleVersion
, "isAccessKeySet" .= isAccessKeySet authMode
]
errMsg = "Fatal Error : console template rendering failed"
++ show errs

Expand Down Expand Up @@ -307,7 +315,7 @@ httpApp mRootDir corsCfg serverCtx enableConsole = do

-- API Console and Root Dir
if enableConsole then do
consoleHTML <- lift mkConsoleHTML
consoleHTML <- lift $ mkConsoleHTML $ scAuthMode serverCtx
serveApiConsole consoleHTML
else maybe (return ()) (middleware . MS.staticPolicy . MS.addBase) mRootDir

Expand Down Expand Up @@ -361,7 +369,7 @@ httpApp mRootDir corsCfg serverCtx enableConsole = do
tmpltArgsFromQueryParams = do
qparams <- params
return $ M.fromList $ flip map qparams $
\(a, b) -> (TemplateParam a, String b)
TemplateParam *** String

mkQTemplateAction tmpltName tmpltArgs =
v1QueryHandler $ RQExecuteQueryTemplate $
Expand Down
5 changes: 3 additions & 2 deletions server/src-rsr/console.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<script>
window.__env = {
consoleMode: "hasuradb",
urlPrefix: "/console"
urlPrefix: "/console",
isAccessKeySet: {{isAccessKeySet}}
};
</script>
</head>
Expand Down Expand Up @@ -46,4 +47,4 @@
<script src="https://storage.googleapis.com/hasura-graphql-engine/console/{{version}}/vendor.js" charset="UTF-8"></script>
<script src="https://storage.googleapis.com/hasura-graphql-engine/console/{{version}}/main.js" charset="UTF-8"></script>
</body>
</html>
</html>