Final simplification of function

Author: MarcialRosales

deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl

@@ -28,7 +28,7 @@
     get_scope/1, set_scope/2,
     resolve_resource_server/1]).
 
--import(rabbit_oauth2_rar, [extract_scopes_from_rich_auth_request/2, has_rich_auth_request_scopes/1]).
+-import(rabbit_oauth2_rar, [extract_scopes_from_rich_auth_request/2]).
 
 -import(rabbit_oauth2_scope, [filter_matching_scope_prefix_and_drop_it/2]).
 
@@ -241,24 +241,19 @@ extract_scopes_from_scope_claim(Payload) ->
     ResourceServer :: resource_server(), DecodedToken :: decoded_jwt_token()) -> map().
 normalize_token_scope(ResourceServer, Payload) ->
 
-    Payload2 = extract_scopes_using_scope_aliases(ResourceServer, 
+    Payload1 = extract_scopes_from_rich_auth_request(ResourceServer,
+        extract_scopes_using_scope_aliases(ResourceServer, 
         extract_scopes_from_additional_scopes_key(ResourceServer, 
-            extract_scopes_from_scope_claim(Payload))),
-
-    Payload3 = case has_rich_auth_request_scopes(Payload2) of
-        true  -> extract_scopes_from_rich_auth_request(ResourceServer, Payload2);
-        false -> Payload2
-        end,
+            extract_scopes_from_scope_claim(Payload)))),
 
     FilteredScopes = filter_matching_scope_prefix_and_drop_it(
-        get_scope(Payload3), ResourceServer#resource_server.scope_prefix),
-    set_scope(FilteredScopes, Payload3).
-
+        get_scope(Payload1), ResourceServer#resource_server.scope_prefix),
+    set_scope(FilteredScopes, Payload1).
 
 -spec extract_scopes_using_scope_aliases(
      ResourceServer :: resource_server(), Payload :: map()) -> map().
 extract_scopes_using_scope_aliases( 
-        #resource_server{scope_aliases = ScopeAliasMapping} = ResourceServer, Payload) 
+        #resource_server{scope_aliases = ScopeAliasMapping}, Payload) 
         when is_map(ScopeAliasMapping) ->
     Scopes0 = get_scope(Payload),
     Scopes = rabbit_data_coercion:to_list_of_binaries(Scopes0),

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_rar.erl

@@ -11,7 +11,7 @@
 -include("oauth2.hrl").
 -import(uaa_jwt, [get_scope/1, set_scope/2]).
 
--export([extract_scopes_from_rich_auth_request/2, has_rich_auth_request_scopes/1]).
+-export([extract_scopes_from_rich_auth_request/2]).
 
 -define(AUTHORIZATION_DETAILS_CLAIM, <<"authorization_details">>).
 -define(RAR_ACTIONS_FIELD, <<"actions">>).
@@ -44,15 +44,12 @@
         <<"management">>,
         <<"policymaker">> ]).
 
--spec has_rich_auth_request_scopes(Payload::map()) -> boolean().
-has_rich_auth_request_scopes(Payload) ->
-    maps:is_key(?AUTHORIZATION_DETAILS_CLAIM, Payload).
-
 -spec extract_scopes_from_rich_auth_request(ResourceServer :: resource_server(),
         Payload :: map()) -> map().
 %% https://oauth.net/2/rich-authorization-requests/
 extract_scopes_from_rich_auth_request(ResourceServer,
-        #{?AUTHORIZATION_DETAILS_CLAIM := Permissions} = Payload) ->
+        #{?AUTHORIZATION_DETAILS_CLAIM := Permissions} = Payload) 
+          when is_list(Permissions) ->
     ResourceServerType = ResourceServer#resource_server.resource_server_type,
 
     FilteredPermissionsByType = lists:filter(fun(P) ->
@@ -61,7 +58,8 @@ extract_scopes_from_rich_auth_request(ResourceServer,
         ResourceServer#resource_server.id, FilteredPermissionsByType),
 
     ExistingScopes = get_scope(Payload),
-    set_scope(AdditionalScopes ++ ExistingScopes, Payload).
+    set_scope(AdditionalScopes ++ ExistingScopes, Payload);
+extract_scopes_from_rich_auth_request(_, Payload) -> Payload.
 
 put_location_attribute(Attribute, Map) ->
     put_attribute(binary:split(Attribute, <<":">>, [global, trim_all]), Map).

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_scope.erl

@@ -96,6 +96,7 @@ parse_resource_pattern(Pattern, Permission) ->
 -spec filter_matching_scope_prefix_and_drop_it(list(), binary()|list()) -> list().
 filter_matching_scope_prefix_and_drop_it(Scopes, <<"">>) -> Scopes;
 filter_matching_scope_prefix_and_drop_it(Scopes, PrefixPattern)  ->
+    
     PatternLength = byte_size(PrefixPattern),
     lists:filtermap(
         fun(ScopeEl) ->