Merge branch 'DavidMeng-master-patch-92375' into 'master'

Refactor AuthorizationFilter::hasAnyPermission to avoid always returning true

See merge request !257

notification-core/src/main/java/org/opengroup/osdu/notification/auth/AuthorizationFilter.java

@@ -63,25 +63,23 @@ public class AuthorizationFilter {
         if (Arrays.asList(requiredRoles).contains(Config.CRON) && requestInfoExt.isCronRequest()) {
             dpsHeaders.put(DpsHeaders.USER_EMAIL, Config.CRON);
             requestInfoExt.setHeaders(dpsHeaders);
-            return true;
         } else if (Arrays.asList(requiredRoles).contains(Config.PUBSUB)) {
             String jwt = dpsHeaders.getAuthorization().substring(BEARER_PREFIX.length());
             if (!this.validator.isValidPublisherServiceAccount(jwt)) {
-                if (!this.authorizeWithEntitlements(requiredRoles)) {
-                    throw new AppException(401, "Invalid User Identity", "this user is not authorized for this operation");
-                }
+                this.authorizeWithEntitlements(requiredRoles);
+            } else {
+                return false;
             }
-            return true;
         } else {
-            return authorizeWithEntitlements(requiredRoles);
+            authorizeWithEntitlements(requiredRoles);
         }
+        return true;
     }
 
-    private boolean authorizeWithEntitlements(String... requiredRoles) {
-        AuthorizationResponse authorizationResponse = authService.authorizeAny(requestInfoExt.getHeaders(), requiredRoles);
+    private void authorizeWithEntitlements(String... requiredRoles) {
         DpsHeaders dpsHeaders = requestInfoExt.getHeaders();
+        AuthorizationResponse authorizationResponse = authService.authorizeAny(dpsHeaders, requiredRoles);
         dpsHeaders.put(DpsHeaders.USER_EMAIL, authorizationResponse.getUser());
         requestInfoExt.setHeaders(dpsHeaders);
-        return true;
     }
 }