fixed comments

wso2-extensions · Apr 26, 2024 · 1e70b10 · 1e70b10
1 parent 93cd1f5
commit 1e70b10
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...oint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/authz/OAuth2AuthzEndpoint.java b/...oint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/authz/OAuth2AuthzEndpoint.java
@@ -1920,20 +1920,20 @@ private void setAuthorizationCode(OAuthMessage oAuthMessage, OAuth2AuthorizeResp
         authorizationResponseDTO.getSuccessResponseDTO().setAuthorizationCode(authorizationCode);
 
         AccessTokenExtendedAttributes tokenExtendedAttributes = null;
-        tokenExtendedAttributes = getExtendedTokenAttributes(oAuthMessage, oauth2Params);
+        ServiceProvider serviceProvider = getServiceProvider(oauth2Params.getClientId());
+        if (implementsTokenAttributeExtension(serviceProvider)) {
+            tokenExtendedAttributes = getExtendedTokenAttributes(oAuthMessage, oauth2Params, serviceProvider);
+        }
         addUserAttributesToOAuthMessage(oAuthMessage, authorizationCode, authzRespDTO.getCodeId(),
                 tokenBindingValue, tokenExtendedAttributes);
     }
 
     private AccessTokenExtendedAttributes getExtendedTokenAttributes(OAuthMessage oAuthMessage,
-                                                                     OAuth2Parameters oauth2Params) {
+                                                                     OAuth2Parameters oauth2Params,
+                                                                     ServiceProvider serviceProvider) {
 
         try {
-            ServiceProvider serviceProvider = getServiceProvider(oauth2Params.getClientId());
             // TODO: Improve to read the script separately instead of reading from adaptive script.
-            if (!implementsTokenAttributeExtension(serviceProvider)) {
-                return null;
-            }
             Gson gson = new Gson();
             JSEngine jsEngine = EngineUtils.getEngineFromConfig();
             JsLogger jsLogger = new JsLogger();