6 files changed, 107 insertions, 125 deletions

diff --git a/packages/renderer/src/components/locationBar/LocationBar.tsx b/packages/renderer/src/components/locationBar/LocationBar.tsx
index fc9c147..54ead8e 100644
--- a/packages/renderer/src/components/locationBar/LocationBar.tsx
+++ b/packages/renderer/src/components/locationBar/LocationBar.tsx
@@ -43,11 +43,12 @@ const LocationBarRoot = styled('header', {
 
 function LocationBar(): JSX.Element {
   const {
-    settings: { selectedService, showLocationBar },
+    shared: { locationBarVisible },
+    settings: { selectedService },
   } = useStore();
 
   return (
-    <LocationBarRoot id={LOCATION_BAR_ID} hidden={!showLocationBar}>
+    <LocationBarRoot id={LOCATION_BAR_ID} hidden={!locationBarVisible}>
       <NavigationButtons service={selectedService} />
       <LocationTextField service={selectedService} />
       <ExtraButtons service={selectedService} />
diff --git a/packages/renderer/src/components/locationBar/LocationTextField.tsx b/packages/renderer/src/components/locationBar/LocationTextField.tsx
index 30953de..85cf794 100644
--- a/packages/renderer/src/components/locationBar/LocationTextField.tsx
+++ b/packages/renderer/src/components/locationBar/LocationTextField.tsx
@@ -20,6 +20,7 @@
 
 import FilledInput from '@mui/material/FilledInput';
 import { styled } from '@mui/material/styles';
+import { SecurityLabelKind } from '@sophie/shared';
 import { autorun } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import React, { useCallback, useEffect, useState } from 'react';
@@ -30,7 +31,6 @@ import GoButton from './GoButton';
 import LocationOverlayInput from './LocationOverlayInput';
 import SecurityLabel from './SecurityLabel';
 import UrlOverlay from './UrlOverlay';
-import splitUrl from './splitUrl';
 
 const LocationTextFieldRoot = styled(FilledInput, {
   name: 'LocationTextField',
@@ -75,8 +75,6 @@ function LocationTextField({
     [setInputFocused],
   );
 
-  const splitResult = splitUrl(service?.currentUrl);
-
   return (
     <LocationTextFieldRoot
       inputComponent={LocationOverlayInput}
@@ -84,7 +82,12 @@ function LocationTextField({
         'aria-label': 'Location',
         spellCheck: false,
         overlayVisible: !inputFocused && !changed,
-        overlay: <UrlOverlay splitResult={splitResult} />,
+        overlay: (
+          <UrlOverlay
+            url={service?.currentUrl ?? ''}
+            alert={service?.hasSecurityLabelWarning ?? false}
+          />
+        ),
       }}
       inputRef={inputRefCallback}
       onFocus={() => setInputFocused(true)}
@@ -114,8 +117,8 @@ function LocationTextField({
       disableUnderline
       startAdornment={
         <SecurityLabel
+          kind={service?.securityLabel ?? SecurityLabelKind.Empty}
           changed={changed}
-          splitResult={splitResult}
           position="start"
         />
       }
diff --git a/packages/renderer/src/components/locationBar/SecurityLabel.tsx b/packages/renderer/src/components/locationBar/SecurityLabel.tsx
index 0017f89..ac51cff 100644
--- a/packages/renderer/src/components/locationBar/SecurityLabel.tsx
+++ b/packages/renderer/src/components/locationBar/SecurityLabel.tsx
@@ -18,17 +18,17 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import IconHttps from '@mui/icons-material/HttpsOutlined';
-import IconHttp from '@mui/icons-material/NoEncryption';
-import IconGlobe from '@mui/icons-material/Public';
-import IconWarning from '@mui/icons-material/Warning';
+import HttpsOutliedIcon from '@mui/icons-material/HttpsOutlined';
+import NoEncrpytionIcon from '@mui/icons-material/NoEncryption';
+import PublicIcon from '@mui/icons-material/Public';
+import WarningIcon from '@mui/icons-material/Warning';
 import { styled } from '@mui/material/styles';
+import { SecurityLabelKind } from '@sophie/shared';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
 import LocationInputAdornment from './LocationInputAdornment';
 import getAlertColor from './getAlertColor';
-import type { SplitResult } from './splitUrl';
 
 const SecurityLabelRoot = styled(LocationInputAdornment, {
   name: 'SecurityLabel',
@@ -53,55 +53,48 @@ const SecurityLabelText = styled('span', {
 }));
 
 export default function SecurityLabel({
-  splitResult,
+  kind,
   changed,
   position,
 }: {
-  splitResult: SplitResult;
+  kind: SecurityLabelKind;
   changed: boolean;
   position: 'start' | 'end';
 }): JSX.Element {
-  const { t } = useTranslation(undefined, {
-    keyPrefix: 'securityLabel',
-  });
+  const { t } = useTranslation();
 
-  const { type } = splitResult;
-  if (changed || type === 'empty') {
+  if (changed || kind === SecurityLabelKind.Empty) {
     return (
       <SecurityLabelRoot alert={false} position={position} aria-hidden>
-        <IconGlobe fontSize="small" />
+        <PublicIcon fontSize="small" />
       </SecurityLabelRoot>
     );
   }
-  switch (type) {
-    case 'valid': {
-      const { secure } = splitResult;
-      return secure ? (
-        <SecurityLabelRoot
-          alert={false}
-          position={position}
-          aria-label={t('secureConnection')}
-        >
-          <IconHttps fontSize="small" />
-        </SecurityLabelRoot>
-      ) : (
-        <SecurityLabelRoot alert position={position}>
-          <IconHttp fontSize="small" />
-          <SecurityLabelText>{t('notSecureConnection')}</SecurityLabelText>
-        </SecurityLabelRoot>
-      );
-    }
-    case 'invalid':
-      return (
-        <SecurityLabelRoot alert position={position}>
-          <IconWarning fontSize="small" />
-          <SecurityLabelText>{t('unknownSite')}</SecurityLabelText>
-        </SecurityLabelRoot>
-      );
-    default:
-      /* eslint-disable-next-line @typescript-eslint/restrict-template-expressions --
-        Error handling for impossible case.
-      */
-      throw new Error(`Unexpected SplitResult: ${type}`);
+  if (kind === SecurityLabelKind.SecureConnection) {
+    return (
+      <SecurityLabelRoot
+        alert={false}
+        position={position}
+        aria-label={t('securityLabel.secureConnection')}
+      >
+        <HttpsOutliedIcon fontSize="small" />
+      </SecurityLabelRoot>
+    );
   }
+  const tslError =
+    kind === SecurityLabelKind.NotSecureConnection ||
+    kind === SecurityLabelKind.CertificateError;
+  const icon = tslError ? (
+    <NoEncrpytionIcon fontSize="small" />
+  ) : (
+    <WarningIcon fontSize="small" />
+  );
+  return (
+    <SecurityLabelRoot alert position={position}>
+      {icon}
+      <SecurityLabelText>
+        {t([`securityLabel.${kind}`, 'securityLabel.unspecific'])}
+      </SecurityLabelText>
+    </SecurityLabelRoot>
+  );
 }
diff --git a/packages/renderer/src/components/locationBar/UrlOverlay.tsx b/packages/renderer/src/components/locationBar/UrlOverlay.tsx
index d590709..a71fa4e 100644
--- a/packages/renderer/src/components/locationBar/UrlOverlay.tsx
+++ b/packages/renderer/src/components/locationBar/UrlOverlay.tsx
@@ -22,7 +22,47 @@ import { styled } from '@mui/material/styles';
 import React from 'react';
 
 import getAlertColor from './getAlertColor';
-import type { SplitResult } from './splitUrl';
+
+export type SplitResult =
+  | {
+      type: 'hostOnly';
+      prefix: string;
+      host: string;
+      suffix: string;
+    }
+  | {
+      type: 'wholeString';
+      value: string;
+    }
+  | {
+      type: 'empty';
+    };
+
+function splitUrl(urlString: string | undefined): SplitResult {
+  if (urlString === undefined || urlString === '') {
+    return { type: 'empty' };
+  }
+  let url: URL;
+  try {
+    url = new URL(urlString);
+  } catch {
+    return { type: 'wholeString', value: urlString };
+  }
+  const { protocol, host, username, password, pathname, search, hash } = url;
+  if (host !== '') {
+    return {
+      type: 'hostOnly',
+      prefix: `${protocol}//${
+        username === ''
+          ? ''
+          : `${username}${password === '' ? '' : `:${password}`}@`
+      }`,
+      host,
+      suffix: `${pathname}${search}${hash}`,
+    };
+  }
+  return { type: 'wholeString', value: urlString };
+}
 
 const PrimaryFragment = styled('span', {
   name: 'LocationOverlayInput',
@@ -40,28 +80,31 @@ const SecondaryFragment = styled('span', {
 }));
 
 export default function UrlOverlay({
-  splitResult,
+  url,
+  alert,
 }: {
-  splitResult: SplitResult;
+  url: string | undefined;
+  alert: boolean;
 }): JSX.Element {
+  const splitResult = splitUrl(url);
   const { type } = splitResult;
   switch (type) {
-    case 'valid': {
-      const { secure, prefix, host, suffix } = splitResult;
+    case 'hostOnly': {
+      const { prefix, host, suffix } = splitResult;
       return (
         <>
           <SecondaryFragment>{prefix}</SecondaryFragment>
-          <PrimaryFragment alert={!secure}>{host}</PrimaryFragment>
+          <PrimaryFragment alert={alert}>{host}</PrimaryFragment>
           <SecondaryFragment>{suffix}</SecondaryFragment>
         </>
       );
     }
-    case 'invalid': {
+    case 'wholeString': {
       const { value } = splitResult;
-      return <PrimaryFragment alert>{value}</PrimaryFragment>;
+      return <PrimaryFragment alert={alert}>{value}</PrimaryFragment>;
     }
     case 'empty':
-      return <PrimaryFragment alert={false} />;
+      return <PrimaryFragment alert={alert} />;
     default:
       /* eslint-disable-next-line @typescript-eslint/restrict-template-expressions --
         Error handling for impossible case.
diff --git a/packages/renderer/src/components/locationBar/splitUrl.ts b/packages/renderer/src/components/locationBar/splitUrl.ts
deleted file mode 100644
index 6e95472..0000000
--- a/packages/renderer/src/components/locationBar/splitUrl.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C)  2022 Kristóf Marussy <kristof@marussy.com>
- *
- * This file is part of Sophie.
- *
- * Sophie is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export type SplitResult =
-  | {
-      type: 'valid';
-      secure: boolean;
-      prefix: string;
-      host: string;
-      suffix: string;
-    }
-  | {
-      type: 'invalid';
-      value: string;
-    }
-  | {
-      type: 'empty';
-    };
-
-export default function splitUrl(urlString: string | undefined): SplitResult {
-  if (urlString === undefined || urlString === '') {
-    return { type: 'empty' };
-  }
-  let url: URL;
-  try {
-    url = new URL(urlString);
-  } catch {
-    return { type: 'invalid', value: urlString };
-  }
-  const { protocol, host, username, password, pathname, search, hash } = url;
-  if (protocol === 'http:' || protocol === 'https:') {
-    return {
-      type: 'valid',
-      secure: protocol === 'https:',
-      prefix: `${protocol}//${
-        username === ''
-          ? ''
-          : `${username}${password === '' ? '' : `:${password}`}@`
-      }`,
-      host,
-      suffix: `${pathname}${search}${hash}`,
-    };
-  }
-  return { type: 'invalid', value: urlString };
-}
diff --git a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
index 325160e..7fc559d 100644
--- a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
+++ b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
@@ -47,19 +47,23 @@ function ToggleLocationBarIcon({
 
 function ToggleLocationBarButton(): JSX.Element {
   const { t } = useTranslation();
-  const { settings } = useStore();
-  const { selectedService, showLocationBar } = settings;
+  const {
+    shared: { locationBarVisible, canToggleLocationBar },
+    settings,
+  } = useStore();
+  const { selectedService } = settings;
 
   return (
     <IconButton
-      aria-pressed={showLocationBar}
+      disabled={!canToggleLocationBar}
+      aria-pressed={locationBarVisible}
       aria-controls={LOCATION_BAR_ID}
       aria-label={t('toolbar.toggleLocationBar')}
       onClick={() => settings.toggleLocationBar()}
     >
       <ToggleLocationBarIcon
         loading={selectedService?.loading ?? false}
-        show={showLocationBar}
+        show={locationBarVisible}
       />
     </IconButton>
   );