Skip to content

Commit 9d91df6

Browse files
Minmor clenup
1 parent 3521447 commit 9d91df6

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

deps/oauth2_client/test/unit_SUITE.erl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,18 @@ access_token_response_without_expiration_time(_) ->
302302
AccessTokenResponse = #successful_access_token_response{
303303
access_token = EncodedToken
304304
},
305-
ct:log("AccessTokenResponse ~p", [AccessTokenResponse]),
306305
?assertEqual({error, missing_exp_field}, oauth2_client:get_expiration_time(AccessTokenResponse)).
307306

308307

309308
can_sign_token(_Config) ->
310309
application:set_env(rabbitmq_auth_backend_oauth2, opaque_token_signing_key,
311310
[{ id, <<"key-id">>}, {type, hs256}, {key, <<"some-key">>}]),
312311

313-
{ok, Value } = oauth2_client:sign_token(#{"scopes" => "a b"}),
314-
ct:log("JWT : ~p", [Value]),
315-
ok.
312+
{ok, _ } = oauth2_client:sign_token(#{"scopes" => "a b"}).
316313

317314
is_jwt_token(Config) ->
318315
Jwk = ?UTIL_MOD:fixture_jwk(),
319316
AccessToken = maps:remove(<<"exp">>, ?UTIL_MOD:fixture_token()),
320-
ct:log("AccesToken ~p", [AccessToken]),
321317
{_, EncodedToken} = ?UTIL_MOD:sign_token_hs(AccessToken, Jwk),
322318
?assertEqual(true, oauth2_client:is_jwt_token(EncodedToken)).
323319

deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ expiry_timestamp(#auth_user{impl = DecodedTokenFun}) ->
153153
authenticate(_, AuthProps0) ->
154154
AuthProps = to_map(AuthProps0),
155155
Token0 = token_from_context(AuthProps),
156-
TokenResult = case uaa_jwt_jwt:is_jwt_token(Token0) of
156+
TokenResult = case oauth2_client:is_jwt_token(Token0) of
157157
true -> {ok, Token0};
158158
false ->
159159
case oauth2_client:introspect_token(Token0) of

deps/rabbitmq_auth_backend_oauth2/src/uaa_jwt_jwt.erl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,3 @@ get_aud(Token) ->
4242
catch Type:Err:Stacktrace ->
4343
{error, {invalid_token, Type, Err, Stacktrace}}
4444
end.
45-
46-
is_jwt_token(Token) when is_binary(Token) ->
47-
case binary:split(Token, <<".">>, [global]) of
48-
[_, _, _] -> true;
49-
_ -> false
50-
end;
51-
is_jwt_token(_Token) -> true.

0 commit comments

Comments
 (0)