Fix SessionDataKeyConsent null issue

Author: Thanuja

components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/validators/DefaultOAuth2ScopeValidator.java

@@ -95,6 +95,9 @@ public List<String> validateScope(OAuthAuthzReqMessageContext authzReqMessageCon
         }
         List<String> authorizedScopes = getAuthorizedScopes(requestedScopes, authzReqMessageContext
                         .getAuthorizationReqDTO().getUser(), appId, null, tenantDomain);
+        if (requestedScopes.contains(INTERNAL_LOGIN_SCOPE) && !authorizedScopes.contains(INTERNAL_LOGIN_SCOPE)) {
+            authorizedScopes.add(INTERNAL_LOGIN_SCOPE);
+        }
         removeRegisteredScopes(authzReqMessageContext);
         return authorizedScopes;
     }
@@ -129,7 +132,11 @@ public List<String> validateScope(OAuthTokenReqMessageContext tokenReqMessageCon
         List<String> authorizedScopes = getAuthorizedScopes(requestedScopes, tokenReqMessageContext
                         .getAuthorizedUser(), appId, grantType, tenantDomain);
         removeRegisteredScopes(tokenReqMessageContext);
-        if (OAuthConstants.GrantTypes.CLIENT_CREDENTIALS.equals(grantType) && authorizedScopes.contains(SYSTEM_SCOPE)) {
+        if (requestedScopes.contains(INTERNAL_LOGIN_SCOPE) && !authorizedScopes.contains(INTERNAL_LOGIN_SCOPE)) {
+            authorizedScopes.add(INTERNAL_LOGIN_SCOPE);
+        }
+        if (OAuthConstants.GrantTypes.CLIENT_CREDENTIALS.equals(grantType) && authorizedScopes.contains(SYSTEM_SCOPE)
+                || authorizedScopes.contains(INTERNAL_LOGIN_SCOPE)) {
             authorizedScopes.remove(INTERNAL_LOGIN_SCOPE);
         }
         return authorizedScopes;