ash-project/ash_authentication
1
0
Fork 0
mirror of https://github.com/team-alembic/ash_authentication.git synced 2024-09-17 03:43:04 +12:00
Code Issues Projects Releases Packages Wiki Activity

fix: set options earlier in magic link/oauth2

Browse source
This commit is contained in:
Zach Daniel 2024-08-09 11:18:31 -04:00
parent 652983be5a
commit ccd0eb00d9
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ash_authentication/strategies/magic_link/actions.ex
View file

@ -23,8 +23,8 @@ defmodule AshAuthentication.Strategy.MagicLink.Actions do
strategy.resource
|> Query.new()
|> Query.set_context(%{private: %{ash_authentication?: true}})
|> Query.for_read(strategy.request_action_name, params)
|> Ash.read(options)
|> Query.for_read(strategy.request_action_name, params, options)
|> Ash.read()
|> case do
{:ok, _} -> :ok
{:error, reason} -> {:error, reason}
@ -44,8 +44,8 @@ defmodule AshAuthentication.Strategy.MagicLink.Actions do
strategy.resource
|> Query.new()
|> Query.set_context(%{private: %{ash_authentication?: true}})
|> Query.for_read(strategy.sign_in_action_name, params)
|> Ash.read(options)
|> Query.for_read(strategy.sign_in_action_name, params, options)
|> Ash.read()
|> case do
{:ok, [user]} ->
{:ok, user}

16
lib/ash_authentication/strategies/oauth2/actions.ex
View file

@ -33,8 +33,8 @@ defmodule AshAuthentication.Strategy.OAuth2.Actions do
ash_authentication?: true
}
})
|> Query.for_read(strategy.sign_in_action_name, params)
|> Ash.read(options)
|> Query.for_read(strategy.sign_in_action_name, params, options)
|> Ash.read()
|> case do
{:ok, [user]} ->
{:ok, user}
@ -105,11 +105,15 @@ defmodule AshAuthentication.Strategy.OAuth2.Actions do
ash_authentication?: true
}
})
|> Changeset.for_create(strategy.register_action_name, params,
upsert?: true,
upsert_identity: action.upsert_identity
|> Changeset.for_create(
strategy.register_action_name,
params,
Keyword.merge(options,
upsert?: true,
upsert_identity: action.upsert_identity
)
)
|> Ash.create(options)
|> Ash.create()
end
def register(%OAuth2{} = strategy, _params, _options),