hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2024-12-14 08:02:15 +03:00
Code Issues Projects Releases Wiki Activity

console: fix security tab visibility when login with admin secret on EE

Browse Source 
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/9397
Co-authored-by: Vishnu Bharathi <4211715+scriptnull@users.noreply.github.com>
GitOrigin-RevId: 686863dfaa31d9c88f6affae93cdf94ccadbbb5f
This commit is contained in:
Varun Choudhary 2023-06-14 12:23:30 +05:30 committed by hasura-bot
parent ea840f9520
commit c867a47552
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/libs/console/legacy-ee/src/lib/routes.js
View File

@ -15,6 +15,7 @@ import {
prefetchEELicenseInfo, prefetchEELicenseInfo,
PageNotFound, PageNotFound,
dataHeaders, dataHeaders,
loadAdminSecretState,
} from '@hasura/console-legacy-ce'; } from '@hasura/console-legacy-ce';
import { import {
dataRouterUtils, dataRouterUtils,
@ -65,6 +66,7 @@ import { decodeToken, checkAccess } from './utils/computeAccess';
import preLoginHook from './utils/preLoginHook'; import preLoginHook from './utils/preLoginHook';
import metricsRouter from './components/Services/Metrics/MetricsRouter'; import metricsRouter from './components/Services/Metrics/MetricsRouter';
import { notifyRouteChangeToAppcues } from './utils/appCues'; import { notifyRouteChangeToAppcues } from './utils/appCues';
import extendedGlobals from './Globals';
const routes = store => { const routes = store => {
// load hasuractl migration status // load hasuractl migration status
@ -289,6 +291,18 @@ const routes = store => {
// ie. admin privileges are already checked in the login process // ie. admin privileges are already checked in the login process
if (globals.consoleType === 'pro-lite') return; // show security tab if (globals.consoleType === 'pro-lite') return; // show security tab
// when consoleType === pro and if admin secret is provided, show security tab
if (
globals.consoleType === 'pro' &&
(extendedGlobals.adminSecret ||
loadAdminSecretState() ||
globals.adminSecret) &&
(extendedGlobals.adminSecret ||
loadAdminSecretState() ||
globals.adminSecret) !== ''
)
return;
// cloud cli doesn't have any privileges when `hasura console` command is executed, it will only have previleges when `hasura pro console` is executed. // cloud cli doesn't have any privileges when `hasura console` command is executed, it will only have previleges when `hasura pro console` is executed.
// this will make sure that security tab is visible even when the users are running `hasura console` command with valid admin secret // this will make sure that security tab is visible even when the users are running `hasura console` command with valid admin secret
if (globals.consoleType === 'cloud' && globals.consoleMode === 'cli') { if (globals.consoleType === 'cloud' && globals.consoleMode === 'cli') {