Address review comments

wso2-extensions · Mar 4, 2024 · 36c2231 · 36c2231
1 parent 5ec7232
commit 36c2231
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...y.oauth/src/main/java/org/wso2/carbon/identity/oauth/config/OAuthServerConfiguration.java b/...y.oauth/src/main/java/org/wso2/carbon/identity/oauth/config/OAuthServerConfiguration.java
@@ -294,7 +294,7 @@ public class OAuthServerConfiguration {
     private int deviceCodePollingInterval = 5000;
     private String deviceCodeKeySet = "BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz23456789";
     private String deviceAuthzEPUrl = null;
-    private boolean addTenantDomainToTokenEnabled = false;
+    private boolean addTenantDomainToAccessTokenEnabled = false;
 
     private OAuthServerConfiguration() {
         buildOAuthServerConfiguration();
@@ -469,7 +469,7 @@ private void buildOAuthServerConfiguration() {
         setOAuthResponseJspPageAvailable();
 
         // read domain information setting config.
-        isAddTenantDomainToTokenEnabled(oauthElem);
+        isAddTenantDomainToAccessTokenEnabled(oauthElem);
     }
 
     /**
@@ -646,9 +646,9 @@ public String getDeviceAuthzEPUrl() {
         return deviceAuthzEPUrl;
     }
 
-    public boolean isAddTenantDomainToTokenEnabled() {
+    public boolean isAddTenantDomainToAccessTokenEnabled() {
 
-        return addTenantDomainToTokenEnabled;
+        return addTenantDomainToAccessTokenEnabled;
     }
 
     /**
@@ -3201,14 +3201,14 @@ private void parseTokenRenewalPerRequestConfiguration(OMElement oauthConfigElem)
         }
     }
 
-    private void isAddTenantDomainToTokenEnabled(OMElement oauthConfigElem) {
+    private void isAddTenantDomainToAccessTokenEnabled(OMElement oauthConfigElem) {
         OMElement enableAddDomainElem = oauthConfigElem.getFirstChildWithName(getQNameWithIdentityNS(
-                ConfigElements.ADD_DOMAIN_TO_TOKEN));
+                ConfigElements.ADD_DOMAIN_TO_ACCESS_TOKEN));
         if (enableAddDomainElem != null) {
-            addTenantDomainToTokenEnabled  = Boolean.parseBoolean(enableAddDomainElem.getText());
+            addTenantDomainToAccessTokenEnabled  = Boolean.parseBoolean(enableAddDomainElem.getText());
         }
         if (log.isDebugEnabled()) {
-            log.debug("AddTenantDomainToTokenEnabled was set to : " + addTenantDomainToTokenEnabled);
+            log.debug("AddTenantDomainToTokenEnabled was set to : " + addTenantDomainToAccessTokenEnabled);
         }
     }
 
@@ -3370,7 +3370,7 @@ private class ConfigElements {
         // Property to decide whether to add userstore domain to id_token.
         private static final String OPENID_CONNECT_ADD_USERSTORE_DOMAIN_TO_ID_TOKEN = "AddUserstoreDomainToIdToken";
         // Enable/Disable adding domain information to the token
-        private static final String ADD_DOMAIN_TO_TOKEN = "AddTenantDomainToAccessToken";
+        private static final String ADD_DOMAIN_TO_ACCESS_TOKEN = "AddTenantDomainToAccessToken";
         private static final String REQUEST_OBJECT_ENABLED = "RequestObjectEnabled";
         private static final String ENABLE_FAPI_CIBA_PROFILE = "EnableCibaProfile";
         private static final String ENABLE_FAPI_SECURITY_PROFILE = "EnableSecurityProfile";

diff --git a/...on.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/JWTTokenIssuer.java b/...on.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/JWTTokenIssuer.java
@@ -481,7 +481,7 @@ protected JWTClaimsSet createJWTClaimSet(OAuthAuthzReqMessageContext authAuthzRe
         jwtClaimsSetBuilder.notBeforeTime(new Date(curTimeInMillis));
         jwtClaimsSetBuilder.claim(CLIENT_ID, consumerKey);
 
-        if (OAuthServerConfiguration.getInstance().isAddTenantDomainToTokenEnabled()) {
+        if (OAuthServerConfiguration.getInstance().isAddTenantDomainToAccessTokenEnabled()) {
             jwtClaimsSetBuilder.claim(APP_DOMAIN, oAuthAppDO.getAppOwner().getTenantDomain());
             jwtClaimsSetBuilder.claim(USER_DOMAIN, authenticatedUser.getTenantDomain());
         }