backoffice ui

1 files changed, 5 insertions, 18 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/login/index.tsx b/packages/merchant-backoffice-ui/src/paths/login/index.tsx
index a9e3c3a1b..e37ef4bef 100644
--- a/packages/merchant-backoffice-ui/src/paths/login/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/login/index.tsx
@@ -26,31 +26,15 @@ import { useBackendContext } from "../../context/backend.js";
 import { useInstanceContext } from "../../context/instance.js";
 import { AccessToken, LoginToken } from "../../declaration.js";
 import { useCredentialsChecker } from "../../hooks/backend.js";
-import { useBackendURL } from "../../hooks/index.js";
 
 interface Props {
   onConfirm: (token: LoginToken | undefined) => void;
 }
 
-function getTokenValuePart(t: string): string {
-  if (!t) return t;
-  const match = /secret-token:(.*)/.exec(t);
-  if (!match || !match[1]) return "";
-  return match[1];
-}
-
 function normalizeToken(r: string): AccessToken {
   return `secret-token:${r}` as AccessToken;
 }
 
-function cleanUp(s: string): string {
-  let result = s;
-  if (result.indexOf("webui/") !== -1) {
-    result = result.substring(0, result.indexOf("webui/"));
-  }
-  return result;
-}
-
 export function LoginPage({ onConfirm }: Props): VNode {
   const { url: backendURL, changeBackend, resetBackend } = useBackendContext();
   const { admin, id } = useInstanceContext();
@@ -245,11 +229,14 @@ function AsyncButton({ onClick, disabled, type = "", children }: { type?: string
 export function ConnectionPage({ onConfirm }: { onConfirm: (s: string) => void }): VNode {
   const { url: backendURL } = useBackendContext()
 
-  const [url, setURL] = useState(cleanUp(backendURL));
+  const [error, setError] = useState<string>();
+  const [url, setURL] = useState(backendURL ?? "");
   const { i18n } = useTranslationContext();
 
   async function doConnect() {
-    onConfirm(url)
+    const withHttp = url.startsWith("http") ? url : "https://" + url
+    
+    onConfirm(withHttp)
   }
 
   return (