hasura · rikinsk · Sep 25, 2019 · Aug 7, 2019 · Aug 9, 2019 · Aug 9, 2019
@@ -1,3 +1,5 @@
+import { ADMIN_SECRET_HEADER_KEY } from '../../src/constants';
+
 export const baseUrl = Cypress.config('baseUrl');
 export const dataTypes = [
   'serial',
@@ -41,7 +43,7 @@ export const makeDataAPIOptions = (dataApiUrl, key, body) => ({
   method: 'POST',
   url: makeDataAPIUrl(dataApiUrl),
   headers: {
-    'x-hasura-admin-secret': key,
+    [ADMIN_SECRET_HEADER_KEY]: key,
   },
   body,
   failOnStatusCode: false,

@@ -1,3 +1,5 @@
+import { ADMIN_SECRET_HEADER_KEY } from '../../src/constants';
+
 export const baseUrl = Cypress.config('baseUrl');
 export const queryTypes = ['insert', 'update', 'delete'];
 export const getTriggerName = (i, testName = '') =>
@@ -14,7 +16,7 @@ export const makeDataAPIOptions = (dataApiUrl, key, body) => ({
   method: 'POST',
   url: makeDataAPIUrl(dataApiUrl),
   headers: {
-    'x-hasura-admin-secret': key,
+    [ADMIN_SECRET_HEADER_KEY]: key,
   },
   body,
   failOnStatusCode: false,

@@ -1,3 +1,5 @@
+import { ADMIN_SECRET_HEADER_KEY } from '../../src/constants';
+
 export const baseUrl = Cypress.config('baseUrl');
 export const getRemoteSchemaName = (i, schemaName) =>
   `test-remote-schema-${schemaName}-${i}`;
@@ -14,7 +16,7 @@ export const makeDataAPIOptions = (dataApiUrl, key, body) => ({
   method: 'POST',
   url: makeDataAPIUrl(dataApiUrl),
   headers: {
-    'x-hasura-admin-secret': key,
+    [ADMIN_SECRET_HEADER_KEY]: key,
   },
   body,
   failOnStatusCode: false,

@@ -1,107 +1,64 @@
 import { SERVER_CONSOLE_MODE } from './constants';
+import { getFeaturesCompatibility } from './helpers/versionUtils';
+import { stripTrailingSlash } from './components/Common/utils/urlUtils';
 
-/* helper tools to format explain json */
+/* set helper tools into window */
 
-/* eslint-disable */
 import sqlFormatter from './helpers/sql-formatter.min';
 import hljs from './helpers/highlight.min';
-import { getFeaturesCompatibility } from './helpers/versionUtils';
-/* eslint-enable */
 
-/* */
+if (
+  window &&
+  typeof window === 'object' &&
+  !window.sqlFormatter &&
+  !window.hljs
+) {
+  window.sqlFormatter = sqlFormatter;
+  window.hljs = hljs;
+}
 
-const checkExtraSlashes = url => {
-  if (!url) {
-    return url;
-  }
-  if (url[url.length - 1] === '/') {
-    return url.slice(0, url.length - 1);
-  }
-  return url;
-};
+/* initialize globals */
 
 const globals = {
   apiHost: window.__env.apiHost,
   apiPort: window.__env.apiPort,
-  dataApiUrl: checkExtraSlashes(window.__env.dataApiUrl),
+  dataApiUrl: stripTrailingSlash(window.__env.dataApiUrl),
   devDataApiUrl: window.__env.devDataApiUrl,
   nodeEnv: window.__env.nodeEnv,
-  adminSecret: window.__env.adminSecret || window.__env.accessKey,
-  isAdminSecretSet:
-    window.__env.isAdminSecretSet || window.__env.isAccessKeySet,
-  adminSecretLabel:
-    window.__env.isAdminSecretSet !== undefined ||
-    window.__env.adminSecret !== undefined
-      ? 'admin-secret'
-      : 'access-key',
-  consoleMode:
-    window.__env.consoleMode === 'hasuradb'
-      ? 'server'
-      : window.__env.consoleMode,
-  urlPrefix: checkExtraSlashes(window.__env.urlPrefix),
+  adminSecret: window.__env.adminSecret || null, // will be updated after login/logout
+  isAdminSecretSet: window.__env.isAdminSecretSet || false,
+  consoleMode: window.__env.consoleMode || SERVER_CONSOLE_MODE,
+  urlPrefix: stripTrailingSlash(window.__env.urlPrefix) || '',
   enableTelemetry: window.__env.enableTelemetry,
   telemetryTopic:
     window.__env.nodeEnv !== 'development' ? 'console' : 'console_test',
   assetsPath: window.__env.assetsPath,
   serverVersion: window.__env.serverVersion,
-  consoleAssetVersion: CONSOLE_ASSET_VERSION,
+  consoleAssetVersion: CONSOLE_ASSET_VERSION, // set during console build
   featuresCompatibility: window.__env.serverVersion
     ? getFeaturesCompatibility(window.__env.serverVersion)
     : null,
 };
 
-// set defaults
-if (!window.__env.urlPrefix) {
-  globals.urlPrefix = '/';
-}
-
-if (!window.__env.consoleMode) {
-  globals.consoleMode = SERVER_CONSOLE_MODE;
-}
-
-if (!globals.adminSecret) {
-  globals.adminSecret = null;
-}
-
-if (globals.isAdminSecretSet === undefined) {
-  globals.isAdminSecretSet = false;
-}
-
-if (
-  window &&
-  typeof window === 'object' &&
-  !window.sqlFormatter &&
-  !window.hljs
-) {
-  window.sqlFormatter = sqlFormatter;
-  window.hljs = hljs;
-}
-
 if (globals.consoleMode === SERVER_CONSOLE_MODE) {
   if (globals.nodeEnv !== 'development') {
-    if (window.__env.consolePath) {
-      const safeCurrentUrl = checkExtraSlashes(window.location.href);
-      globals.dataApiUrl = safeCurrentUrl.slice(
+    const consolePath = window.__env.consolePath;
+    if (consolePath) {
+      const currentUrl = stripTrailingSlash(window.location.href);
+      globals.dataApiUrl = currentUrl.slice(
         0,
-        safeCurrentUrl.lastIndexOf(window.__env.consolePath)
+        currentUrl.lastIndexOf(consolePath)
       );
-      const currentPath = checkExtraSlashes(window.location.pathname);
+
+      const currentPath = stripTrailingSlash(window.location.pathname);
       globals.urlPrefix =
-        currentPath.slice(
-          0,
-          currentPath.lastIndexOf(window.__env.consolePath)
-        ) + '/console';
+        currentPath.slice(0, currentPath.lastIndexOf(consolePath)) + '/console';
     } else {
       const windowUrl = window.location.protocol + '//' + window.location.host;
+
       globals.dataApiUrl = windowUrl;
     }
   }
-  /*
-   * Require the exact usecase
-  if (globals.nodeEnv === 'development') {
-    globals.dataApiUrl = globals.devDataApiUrl;
-  }
-  */
 }
 
 export default globals;
@@ -1,10 +1,7 @@
 import globals from 'Globals';
 
 const stateKey = 'CONSOLE_LOCAL_INFO:' + globals.dataApiUrl;
-const CONSOLE_ADMIN_SECRET =
-  globals.adminSecretLabel === 'admin-secret'
-    ? 'CONSOLE_ADMIN_SECRET'
-    : 'CONSOLE_ACCESS_KEY';
+const CONSOLE_ADMIN_SECRET = 'CONSOLE_ADMIN_SECRET';
 
 const loadAppState = () => JSON.parse(window.localStorage.getItem(stateKey));
 
@@ -21,6 +18,8 @@ const saveAdminSecretState = state => {
 
 const clearAdminSecretState = () => {
   window.localStorage.removeItem(CONSOLE_ADMIN_SECRET);
+
+  globals.adminSecret = null;
 };
 
 const clearState = () => window.localStorage.removeItem(stateKey);

@@ -431,6 +431,10 @@ input {
   margin: 0 !important;
 }
 
+.remove_margin_top {
+  margin-top: 0 !important;
+}
+
 .display_inline {
   display: inline-block;
 }

@@ -9,7 +9,7 @@ const WarningSymbol = ({
   tooltipPlacement = 'right',
   customStyle = null,
 }) => {
-  const tooltip = <Tooltip>{tooltipText}</Tooltip>;
+  const tooltip = <Tooltip id={tooltipText}>{tooltipText}</Tooltip>;
 
   return (
     <div className={styles.display_inline}>

@@ -1,3 +1,11 @@
 export const getPathRoot = path => {
   return path.split('/')[1];
 };
+
+export const stripTrailingSlash = url => {
+  if (url && url.endsWith('/')) {
+    return url.slice(0, -1);
+  }
+
+  return url;
+};
@@ -4,7 +4,7 @@ import {
   loadInconsistentObjects,
   redirectToMetadataStatus,
   isMetadataStatusPage,
-} from '../Services/Metadata/Actions';
+} from '../Services/Settings/Actions';
 import Spinner from '../Common/Spinner/Spinner';
 
 import PageNotFound, { NotFoundError } from './PageNotFound';

@@ -0,0 +1,67 @@
+import Endpoints, { globalCookiePolicy } from '../../Endpoints';
+import { UPDATE_DATA_HEADERS } from '../Services/Data/DataActions';
+import { saveAdminSecretState } from '../AppState';
+import { ADMIN_SECRET_HEADER_KEY, CLI_CONSOLE_MODE } from '../../constants';
+import requestAction from '../../utils/requestAction';
+import globals from '../../Globals';
+
+export const verifyLogin = ({
+  adminSecret,
+  shouldPersist,
+  successCallback,
+  errorCallback,
+  dispatch,
+}) => {
+  const url = Endpoints.getSchema;
+  const requestOptions = {
+    credentials: globalCookiePolicy,
+    method: 'POST',
+    headers: {
+      [ADMIN_SECRET_HEADER_KEY]: adminSecret,
+      'content-type': 'application/json',
+    },
+    body: JSON.stringify({
+      type: 'select',
+      args: {
+        table: {
+          name: 'hdb_table',
+          schema: 'hdb_catalog',
+        },
+        columns: ['table_schema'],
+        where: { table_schema: 'public' },
+        limit: 1,
+      },
+    }),
+  };
+
+  dispatch(requestAction(url, requestOptions)).then(
+    () => {
+      if (adminSecret) {
+        if (globals.consoleMode !== CLI_CONSOLE_MODE) {
+          // set admin secret to local storage
+          if (shouldPersist) {
+            saveAdminSecretState(adminSecret);
+          }
+
+          // set admin secret in globals
+          globals.adminSecret = adminSecret;
+        }
+
+        // set data headers in redux
+        dispatch({
+          type: UPDATE_DATA_HEADERS,
+          data: {
+            'content-type': 'application/json',
+            [ADMIN_SECRET_HEADER_KEY]: adminSecret,
+          },
+        });
+      }
+      if (successCallback) {
+        successCallback();
+      }
+    },
+    error => {
+      errorCallback(error);
+    }
+  );
+};