Address review comments

wso2-extensions · Oct 26, 2023 · 62307b0 · 62307b0
1 parent 6ce5ec0
commit 62307b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/...rvice/src/main/java/org/wso2/carbon/identity/auth/service/util/AuthConfigurationUtil.java b/...rvice/src/main/java/org/wso2/carbon/identity/auth/service/util/AuthConfigurationUtil.java
@@ -189,8 +189,7 @@ private static OMElement getResourceAccessControlConfigs() {
             } catch (IOException e) {
                 String message = "Error while reading Resource Access control configuration at: " + path.getFileName();
                 log.error(message);
-            } catch (XMLStreamException e
-            ) {
+            } catch (XMLStreamException e) {
                 String message = "Error while parsing Resource Access control configuration at: " + path.getFileName();
                 log.error(message);
             }

diff --git a/...ce/src/main/java/org/wso2/carbon/identity/authz/service/handler/AuthorizationHandler.java b/...ce/src/main/java/org/wso2/carbon/identity/authz/service/handler/AuthorizationHandler.java
@@ -77,15 +77,8 @@ public AuthorizationResult handleAuthorization(AuthorizationContext authorizatio
             if (isScopeValidationRequired(authorizationContext, validateScope)) {
                 validateScopes(authorizationContext, authorizationResult, allowedScopes);
             }
-            else if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) {
-                if (StringUtils.isNotBlank(permissionString) || authorizationContext.getRequiredScopes().size() == 0) {
-                    validatePermissions(authorizationResult, user, permissionString, tenantUserRealm);
-                }
-            } else {
-                // TODO: Use OAuth2 scope validator, once merged.
+            if (StringUtils.isNotBlank(permissionString) || authorizationContext.getRequiredScopes().size() == 0) {
                 validatePermissions(authorizationResult, user, permissionString, tenantUserRealm);
-                // authorizationResult.setAuthorizationStatus(AuthorizationStatus.GRANT);
-
             }
         } catch (UserStoreException e) {
             String errorMessage = "Error occurred while trying to authorize, " + e.getMessage();