From b423caf6c3ca6d0d1d21273acac772672563ba28 Mon Sep 17 00:00:00 2001 From: MickGe <87438-MickGe@users.noreply.framagit.org> Date: Tue, 16 May 2023 19:45:28 +0000 Subject: [PATCH 01/23] Fix ellipsis for identity in NaBar --- js/src/components/NavBar.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue index 470245520..d5b77683b 100644 --- a/js/src/components/NavBar.vue +++ b/js/src/components/NavBar.vue @@ -75,7 +75,7 @@ }) " > -
+
-

{{ displayName(identity) }}

-

+

{{ displayName(identity) }}

+

@{{ identity.preferredUsername }}

From a22a5e3cb924869e32cb9ed71dab3e03d91c018f Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 2 May 2023 17:04:35 +0200 Subject: [PATCH 02/23] fix(auth): Handle logging-in with disabled auth provider When only MobilizonAuthenticator provider is available, user can be found, but isn't valid for auth. We need to reject those users as well. Signed-off-by: Thomas Citharel --- lib/service/auth/mobilizon_authenticator.ex | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/service/auth/mobilizon_authenticator.ex b/lib/service/auth/mobilizon_authenticator.ex index 4e5985a7a..cc2e5aa58 100644 --- a/lib/service/auth/mobilizon_authenticator.ex +++ b/lib/service/auth/mobilizon_authenticator.ex @@ -13,8 +13,6 @@ defmodule Mobilizon.Service.Auth.MobilizonAuthenticator do @impl Authenticator def login(email, password) do - require Logger - with {:user, %User{password_hash: password_hash, provider: nil} = user} when not is_nil(password_hash) <- {:user, fetch_user(email)}, @@ -23,6 +21,10 @@ defmodule Mobilizon.Service.Auth.MobilizonAuthenticator do {:checkpw, true} <- {:checkpw, Argon2.verify_pass(password, password_hash)} do {:ok, user} else + {:user, %User{}} -> + # User from a 3rd-party provider, doesn't have a password + {:error, :user_not_found} + {:user, {:error, :user_not_found}} -> {:error, :user_not_found} From c7b90cd60a14abea7aebab7e1d87f37a44371f7c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 2 May 2023 17:13:53 +0200 Subject: [PATCH 03/23] fix(map): Fix style of the map marker Signed-off-by: Thomas Citharel --- js/src/components/LeafletMap.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/components/LeafletMap.vue b/js/src/components/LeafletMap.vue index 286ab43e0..9576d8098 100644 --- a/js/src/components/LeafletMap.vue +++ b/js/src/components/LeafletMap.vue @@ -226,7 +226,7 @@ div.map-container { @import "leaflet.locatecontrol/dist/L.Control.Locate.css"; .leaflet-div-icon { - background: unset; - border: unset; + background: unset !important; + border: unset !important; } From 6faafd639303e4b57ed81db2ffb5db4ad598b904 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 3 May 2023 09:25:48 +0200 Subject: [PATCH 04/23] fix(front): Small UI fixes on identity pickers Signed-off-by: Thomas Citharel --- js/src/components/Event/OrganizerPicker.vue | 10 ++++++---- js/src/components/Settings/SettingMenuItem.vue | 2 +- js/src/components/Utils/NavBreadcrumbs.vue | 4 ++-- js/src/views/Account/IdentityPicker.vue | 10 ++++++---- js/src/views/Account/children/EditIdentity.vue | 8 +++++--- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/js/src/components/Event/OrganizerPicker.vue b/js/src/components/Event/OrganizerPicker.vue index 869ce1ead..d2797a0de 100644 --- a/js/src/components/Event/OrganizerPicker.vue +++ b/js/src/components/Event/OrganizerPicker.vue @@ -31,7 +31,7 @@ :id="`availableActor-${availableActor?.id}`" />
diff --git a/js/src/views/Account/IdentityPicker.vue b/js/src/views/Account/IdentityPicker.vue index 456a561ef..b7932e688 100644 --- a/js/src/views/Account/IdentityPicker.vue +++ b/js/src/views/Account/IdentityPicker.vue @@ -28,7 +28,7 @@ :id="`availableActor-${identity?.id}`" />