add hasNoAuth method

Author: insmac

packages/web-console/src/modules/OAuth2/utils.ts

@@ -1,4 +1,7 @@
-import { ConsoleSettingsShape, ConsoleSettings } from "../../store/Console/types"
+import {
+  ConsoleSettingsShape,
+  ConsoleSettings,
+} from "../../store/Console/types"
 
 type TokenPayload = Partial<{
   grant_type: string
@@ -10,7 +13,9 @@ type TokenPayload = Partial<{
 }>
 
 const getBaseURL = (config: ConsoleSettings) => {
-  return `${config["acl.oidc.tls.enabled"] ? "https" : "http"}://${config["acl.oidc.host"]}:${config["acl.oidc.port"]}`
+  return `${config["acl.oidc.tls.enabled"] ? "https" : "http"}://${
+    config["acl.oidc.host"]
+  }:${config["acl.oidc.port"]}`
 }
 
 export const getAuthorisationURL = ({
@@ -67,3 +72,8 @@ export const getAuthToken = async (
     },
   )
 }
+
+export const hasNoAuth = (config: ConsoleSettings) =>
+  (config["acl.basic.auth.realm.enabled"] !== undefined &&
+    !config["acl.basic.auth.realm.enabled"]) ||
+  (config["acl.oidc.enabled"] == undefined && !config["acl.oidc.enabled"])

packages/web-console/src/providers/AuthProvider.tsx

@@ -9,6 +9,7 @@ import {
   getAuthorisationURL,
   getAuthToken,
   getTokenExpirationDate,
+  hasNoAuth,
 } from "../modules/OAuth2/utils"
 import {
   generateCodeChallenge,
@@ -52,9 +53,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
   const [loading, setLoading] = useState(true)
   const [sessionData, setSessionData] =
     useState<ContextProps["sessionData"]>(undefined)
-  const [ready, setReady] = useState(
-    !settings["acl.basic.auth.realm.enabled"] && !settings["acl.oidc.enabled"],
-  )
+  const [ready, setReady] = useState(hasNoAuth(settings))
   const [errorMessage, setErrorMessage] = useState<string | undefined>(
     undefined,
   )

packages/web-console/src/providers/QuestProvider/index.tsx

@@ -37,6 +37,7 @@ import { getValue } from "../../utils/localStorage"
 import { StoreKey } from "../../utils/localStorage/types"
 import { formatCommitHash, formatVersion } from "./services"
 import { Versions } from "./types"
+import { hasNoAuth } from "../../modules/OAuth2/utils"
 
 const questClient = new QuestDB.Client()
 
@@ -63,9 +64,7 @@ export const QuestProvider = ({ children }: PropsWithChildren<Props>) => {
   const settings = useSelector(selectors.console.getSettings)
   const { sessionData, refreshAuthToken } = useAuth()
   const [authCheckFinished, setAuthCheckFinished] = useState(
-    settings["acl.basic.auth.realm.enabled"] ||
-      (!settings["acl.oidc.enabled"] &&
-        !settings["acl.basic.auth.realm.enabled"]),
+    hasNoAuth(settings),
   )
   const [buildVersion, setBuildVersion] = useState<Versions>(
     defaultValues.buildVersion,