Skip to content

Commit cb9bda4

Browse files
Fix dialyzer errors
1 parent cd67b65 commit cb9bda4

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ update_state(AuthUser, NewToken) ->
106106
{_, _} = Tuple ->
107107
case check_token(NewToken, Tuple) of
108108
%% avoid logging the token
109-
{error, _} = E -> E;
110109
{refused, {error, {invalid_token, error, _Err, _Stacktrace}}} ->
111110
{refused, "Authentication using an OAuth 2/JWT token failed: provided token is invalid"};
112111
{refused, Err} ->
@@ -136,7 +135,6 @@ authenticate(_, AuthProps0) ->
136135
{refused, "Authentication using OAuth 2/JWT token failed: ~tp", [Err0]};
137136
{ResourceServer, _} = Tuple ->
138137
case check_token(Token, Tuple) of
139-
{error, _} = E -> E;
140138
{refused, {error, {invalid_token, error, _Err, _Stacktrace}}} ->
141139
{refused, "Authentication using an OAuth 2/JWT token failed: provided token is invalid", []};
142140
{refused, Err} ->

deps/rabbitmq_auth_backend_oauth2/src/resource_server.erl

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ resolve_resource_server_from_audience(Audience) ->
5858

5959
-spec get_root_resource_server_id() -> resource_server_id().
6060
get_root_resource_server_id() ->
61-
get_env(resource_server_id).
61+
get_env(resource_server_id, <<>>).
6262

6363
-spec get_root_resource_server() -> resource_server().
6464
get_root_resource_server() ->
@@ -80,7 +80,7 @@ get_root_resource_server() ->
8080
get_env(extra_scopes_source),
8181
DefaultScopePrefix =
8282
case ResourceServerId of
83-
undefined -> undefined;
83+
<<>> -> undefined;
8484
_ -> erlang:iolist_to_binary([ResourceServerId, <<".">>])
8585
end,
8686
ScopePrefix =
@@ -102,17 +102,18 @@ get_root_resource_server() ->
102102
oauth_provider_id = OAuthProviderId
103103
}.
104104

105-
-spec get_resource_server(resource_server_id()) -> resource_server().
105+
-spec get_resource_server(resource_server_id()) -> resource_server() | undefined.
106106
get_resource_server(ResourceServerId) ->
107107
RootResourseServer = get_root_resource_server(),
108108
RootResourseServerId = RootResourseServer#resource_server.id,
109109
case ResourceServerId of
110-
undefined -> undefined;
110+
<<>> -> undefined;
111111
RootResourseServerId -> RootResourseServer;
112112
_ -> get_resource_server(ResourceServerId, RootResourseServer)
113113
end.
114114

115-
-spec get_resource_server(resource_server_id(), resource_server()) -> resource_server().
115+
-spec get_resource_server(ResourceServerId :: resource_server_id(),
116+
DefaultResourceServerSettings :: resource_server()) -> resource_server().
116117
get_resource_server(ResourceServerId, RootResourseServer) when
117118
ResourceServerId == RootResourseServer#resource_server.id ->
118119
RootResourseServer;
@@ -202,7 +203,7 @@ find_unique_resource_server_without_verify_aud() ->
202203
Map0 = maps:filter(fun(_K,V) -> not get_boolean_value(verify_aud, V,
203204
Root#resource_server.verify_aud) end, get_env(resource_servers, #{})),
204205
Map = case {Root#resource_server.id, Root#resource_server.verify_aud} of
205-
{undefined, _} -> Map0;
206+
{<<>>, _} -> Map0;
206207
{_, true} -> Map0;
207208
{Id, false} -> maps:put(Id, Root, Map0)
208209
end,
@@ -214,7 +215,7 @@ find_unique_resource_server_without_verify_aud() ->
214215

215216
append(List, Value) ->
216217
case Value of
217-
undefined -> List;
218+
<<>> -> List;
218219
_ -> List ++ [Value]
219220
end.
220221
get_env(Par) ->

0 commit comments

Comments
 (0)