diff --git a/js/src/graphql/config.ts b/js/src/graphql/config.ts index b55fb06de..e122f9650 100644 --- a/js/src/graphql/config.ts +++ b/js/src/graphql/config.ts @@ -112,6 +112,9 @@ export const CONFIG = gql` isDefault } } + exportFormats { + eventParticipants + } } } `; diff --git a/lib/service/auth/ldap_authenticator.ex b/lib/service/auth/ldap_authenticator.ex index 6dba56edd..7a31b1997 100644 --- a/lib/service/auth/ldap_authenticator.ex +++ b/lib/service/auth/ldap_authenticator.ex @@ -132,9 +132,11 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticator do ) :: String.t() | {:error, :ldap_registration_missing_attributes} | any() defp search_user(connection, ldap, base, uid, email, group) do + Logger.debug("Searching for user") # We may need to bind before performing the search res = if Keyword.get(ldap, :require_bind_for_search, true) do + Logger.debug("Doing binding before search as it's required") admin_field = Keyword.get(ldap, :bind_uid) admin_password = Keyword.get(ldap, :bind_password) bind_user(connection, base, uid, admin_field, admin_password) @@ -153,7 +155,9 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticator do @spec do_search_user(any(), String.t(), String.t(), String.t(), String.t() | boolean()) :: String.t() | {:error, :ldap_registration_missing_attributes} | any() defp do_search_user(connection, base, uid, email, group) do - with {:ok, {:eldap_search_result, [{:eldap_entry, _, attributes}], _}} <- + Logger.debug("Searching user") + + with {:ok, {:eldap_search_result, [{:eldap_entry, _, attributes}], _, _}} <- :eldap.search(connection, [ {:base, to_charlist(base)}, {:filter, search_filter(email, group)}, diff --git a/test/service/auth/ldap_authentificator_test.exs b/test/service/auth/ldap_authentificator_test.exs index 6168f8594..9136c2171 100644 --- a/test/service/auth/ldap_authentificator_test.exs +++ b/test/service/auth/ldap_authentificator_test.exs @@ -62,7 +62,8 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticatorTest do wholeSubtree: fn -> :ok end, search: fn _connection, _options -> {:ok, - {:eldap_search_result, [{:eldap_entry, '', [{'cn', [to_charlist("MyUser")]}]}], []}} + {:eldap_search_result, [{:eldap_entry, '', [{'cn', [to_charlist("MyUser")]}]}], [], + []}} end, close: fn _connection -> send(self(), :close_connection) @@ -110,7 +111,8 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticatorTest do wholeSubtree: fn -> :ok end, search: fn _connection, _options -> {:ok, - {:eldap_search_result, [{:eldap_entry, '', [{'cn', [to_charlist("MyUser")]}]}], []}} + {:eldap_search_result, [{:eldap_entry, '', [{'cn', [to_charlist("MyUser")]}]}], [], + []}} end, close: fn _connection -> send(self(), :close_connection)