Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions src/oidcc_client_context.erl
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,35 @@ Create Client Context from a `m:oidcc_provider_configuration_worker`.
ClientId :: binary(),
ClientSecret :: unauthenticated,
Opts :: unauthenticated_opts().
from_configuration_worker(ProviderName, ClientId, ClientSecret, Opts) when is_atom(ProviderName) ->
case erlang:whereis(ProviderName) of
from_configuration_worker(ProviderName, ClientId, ClientSecret, Opts) ->
case resolve_pid(ProviderName) of
undefined ->
{error, provider_not_ready};
_Pid ->
load_from_configuration_worker(ProviderName, ClientId, ClientSecret, Opts)
end.

%% gen_server:server_ref() covers more than plain atoms (pid/{via,...}/
%% {global,...}/{Name,Node}); erlang:whereis/1 alone only resolves the
%% local atom case, so other refs would skip this check and only fail
%% later as an uncaught `exit({noproc, ...})` from gen_server:call/2.
-spec resolve_pid(gen_server:server_ref()) -> pid() | undefined.
resolve_pid(Pid) when is_pid(Pid) ->
Pid;
resolve_pid(Name) when is_atom(Name) ->
erlang:whereis(Name);
resolve_pid({global, Name}) ->
resolve_pid({via, global, Name});
resolve_pid({via, Module, Name}) ->
case erlang:apply(Module, whereis_name, [Name]) of
Pid when is_pid(Pid) -> Pid;
undefined -> undefined
end;
from_configuration_worker(ProviderName, ClientId, ClientSecret, Opts) ->
load_from_configuration_worker(ProviderName, ClientId, ClientSecret, Opts).
resolve_pid({Name, Node}) when is_atom(Name), is_atom(Node) ->
case rpc:call(Node, erlang, whereis, [Name]) of
Pid when is_pid(Pid) -> Pid;
_ -> undefined
end.

-spec load_from_configuration_worker(ProviderName, ClientId, ClientSecret, Opts) ->
{ok, t()} | {error, error()}
Expand Down
45 changes: 45 additions & 0 deletions test/oidcc_client_context_test.erl
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,51 @@ from_configuration_worker_global_name_test() ->
end
end).

provider_not_running_global_name_test() ->
?assertMatch(
{error, provider_not_ready},
oidcc_client_context:from_configuration_worker(
{global, provider_not_running_global_name_test},
<<"client_id">>,
<<"client_secret">>
)
),
ok.

provider_not_running_via_name_test() ->
%% `global' implements the `via' callback API (register_name/2,
%% unregister_name/1, whereis_name/1, send/2), so it doubles as a
%% stand-in for a custom registry (e.g. Elixir's `Registry') to
%% exercise the `{via, Module, Name}' branch of `gen_server:server_ref()'.
?assertMatch(
{error, provider_not_ready},
oidcc_client_context:from_configuration_worker(
{via, global, provider_not_running_via_name_test},
<<"client_id">>,
<<"client_secret">>
)
),
ok.

from_configuration_worker_via_name_test() ->
Name = from_configuration_worker_via_name_test,
with_provider_mock(fun() ->
{ok, Pid} = oidcc_provider_configuration_worker:start_link(#{
issuer => <<"https://example.com">>,
name => {via, global, Name}
}),
try
?assertMatch(
{ok, #oidcc_client_context{}},
oidcc_client_context:from_configuration_worker(
{via, global, Name}, <<"client_id">>, <<"client_secret">>
)
)
after
ok = gen_server:stop(Pid)
end
end).

with_suspended_worker(Pid, TestFun) ->
ok = sys:suspend(Pid),
try
Expand Down
Loading