mirror of
https://github.com/team-alembic/ash_authentication.git
synced 2024-09-19 12:52:55 +12:00
fix: set options earlier in magic link/oauth2
This commit is contained in:
parent
652983be5a
commit
ccd0eb00d9
2 changed files with 14 additions and 10 deletions
|
@ -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}
|
||||
|
|
|
@ -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),
|
||||
|
|
Loading…
Reference in a new issue