From 076893981ff4f7f17330746c561acc570339adac Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 25 Mar 2021 17:27:38 +0100 Subject: [PATCH 01/12] =?UTF-8?q?Fixed=20mail=20login=20bug=F0=9F=90=9E?= =?UTF-8?q?=F0=9F=93=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #107 --- src/components/auth/Login.svelte | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/components/auth/Login.svelte b/src/components/auth/Login.svelte index 35fbbe38..6be88339 100644 --- a/src/components/auth/Login.svelte +++ b/src/components/auth/Login.svelte @@ -5,6 +5,7 @@ store.init(); import { OpenAPI, AuthService } from "@odit/lfk-client-js"; import Footer from "../general/Footer.svelte"; + import isEmail from "validator/es/lib/isEmail"; import Toastify from "toastify-js"; // ------ let username = config.default_username || ""; @@ -36,10 +37,19 @@ text: $_("login_is_checked"), duration: 500, }).showToast(); - AuthService.authControllerLogin({ - username, - password, - }) + let postdata = {}; + if (isEmail(username)) { + postdata = { + email: username, + password, + }; + } else { + postdata = { + username, + password, + }; + } + AuthService.authControllerLogin(postdata) .then(async (result) => { await localForage.setItem("logindata", result); OpenAPI.TOKEN = result.access_token; From fbe74a5d8090553a35576a17c97019939cf4f386 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 25 Mar 2021 17:31:53 +0100 Subject: [PATCH 02/12] Commented out the buggy runner search to prevent bad UX ref #107 --- src/components/runners/RunnersOverview.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte index bfc06a15..089392c5 100644 --- a/src/components/runners/RunnersOverview.svelte +++ b/src/components/runners/RunnersOverview.svelte @@ -115,12 +115,12 @@ {#if current_runners.length === 0} {:else} - + class="gridjs-input gridjs-search-input mb-4" /> -->