Return expires_in or exp depending on whats available

Author: MarcialRosales

deps/oauth2_client/src/oauth2_client.erl

@@ -71,12 +71,17 @@ get_openid_configuration(IssuerURI, OpenIdConfigurationPath, TLSOptions) ->
 get_openid_configuration(IssuerURI, TLSOptions) ->
     get_openid_configuration(IssuerURI, ?DEFAULT_OPENID_CONFIGURATION_PATH, TLSOptions).
 
--spec get_expiration_time(successful_access_token_response()) -> {ok, integer()} | {error, missing_exp_field}.
-get_expiration_time(#successful_access_token_response{expires_in = ExpiresIn,
+-spec get_expiration_time(successful_access_token_response()) -> 
+    {ok, [{expires_in, integer() }| {exp, integer() }]} | {error, missing_exp_field}.
+get_expiration_time(#successful_access_token_response{expires_in = ExpiresInSec,
     access_token = AccessToken}) ->
-  case ExpiresIn of
-    undefined -> jwt_helper:get_expiration_time(jwt_helper:decode(AccessToken));
-    _ -> {ok, ExpiresIn}
+  case ExpiresInSec of
+    undefined -> 
+        case jwt_helper:get_expiration_time(jwt_helper:decode(AccessToken)) of 
+            {ok, Exp} -> {ok, [{exp, Exp}]};
+            {error, _} = Error -> Error 
+        end;
+    _ -> {ok, [{expires_in, ExpiresInSec}]}
   end.
 
 update_oauth_provider_endpoints_configuration(OAuthProvider) ->

deps/oauth2_client/test/unit_SUITE.erl

@@ -122,7 +122,7 @@ access_token_response_with_expires_in(_) ->
     access_token = EncodedToken,
     expires_in = ExpiresIn
   },
-  ?assertEqual({ok, ExpiresIn}, oauth2_client:get_expiration_time(AccessTokenResponse)).
+  ?assertEqual({ok, [{exoires_in, ExpiresIn}]}, oauth2_client:get_expiration_time(AccessTokenResponse)).
 
 access_token_response_with_exp_in_access_token(_) ->
   Jwk = ?UTIL_MOD:fixture_jwk(),
@@ -132,7 +132,7 @@ access_token_response_with_exp_in_access_token(_) ->
   AccessTokenResponse = #successful_access_token_response{
     access_token = EncodedToken
   },
-  ?assertEqual({ok, ExpiresIn}, oauth2_client:get_expiration_time(AccessTokenResponse)).
+  ?assertEqual({ok, [{exp, ExpiresIn}]}, oauth2_client:get_expiration_time(AccessTokenResponse)).
 
 access_token_response_without_expiration_time(_) ->
   Jwk = ?UTIL_MOD:fixture_jwk(),

deps/rabbitmq_management/selenium/test/basic-auth/enabled_plugins

@@ -1,5 +1,5 @@
 [accept,amqp10_client,amqp_client,base64url,cowboy,cowlib,eetcd,gun,jose,
- oauth2_client,prometheus,rabbitmq_auth_backend_cache,
+ oauth2_client,prometheus,rabbitmq_amqp1_0,rabbitmq_auth_backend_cache,
  rabbitmq_auth_backend_http,rabbitmq_auth_backend_ldap,
  rabbitmq_auth_backend_oauth2,rabbitmq_auth_mechanism_ssl,rabbitmq_aws,
  rabbitmq_consistent_hash_exchange,rabbitmq_event_exchange,