Merge pull request #13009 from Arshardh/ai-access-token-fix

Fix Access token generator initialization
wso2 · Feb 27, 2025 · 9622bef · 9622bef
2 parents 289e41d + 1be0322
commit 9622bef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/.../org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java b/.../org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
@@ -11168,9 +11168,9 @@ private static CloseableHttpResponse executeAIRequest(HttpRequestBase request, S
         try {
             if (tokenEndpoint != null) {
                 if (tokenGenerator == null) {
-                    tokenGenerator = new AccessTokenGenerator(tokenEndpoint, key);
+                    tokenGenerator = new AccessTokenGenerator();
                 }
-                String token = tokenGenerator.getAccessToken();
+                String token = tokenGenerator.getAccessToken(tokenEndpoint, key);
                 request.setHeader(APIConstants.AUTHORIZATION_HEADER_DEFAULT,
                         APIConstants.AUTHORIZATION_BEARER + token);
             } else {

diff --git a/...bon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/AccessTokenGenerator.java b/...bon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/AccessTokenGenerator.java
@@ -41,17 +41,9 @@
 public class AccessTokenGenerator {
 
     private static final Log log = LogFactory.getLog(AccessTokenGenerator.class);
-
-    private String tokenEndpoint;
-    private String authKey;
     private Map<String, AccessTokenInfo> accessTokenInfoMap = new ConcurrentHashMap<>();
 
-    public AccessTokenGenerator(String tokenEndpoint, String authKey) {
-        this.tokenEndpoint = tokenEndpoint;
-        this.authKey = authKey;
-    }
-
-    public String getAccessToken() {
+    public String getAccessToken(String tokenEndpoint, String authKey) {
         AccessTokenInfo accessTokenInfo = accessTokenInfoMap.get(authKey);
         if (accessTokenInfo != null) {
             long expiryTime = accessTokenInfo.getIssuedTime() + accessTokenInfo.getValidityPeriod();
@@ -62,7 +54,7 @@ public String getAccessToken() {
                     log.debug("Access token expired. New token requested");
                 }
                 accessTokenInfoMap.remove(authKey);
-                accessTokenInfo = generateNewAccessToken();
+                accessTokenInfo = generateNewAccessToken(tokenEndpoint, authKey);
                 accessTokenInfoMap.put(authKey, accessTokenInfo);
                 assert accessTokenInfo != null;
                 return accessTokenInfo.getAccessToken();
@@ -73,16 +65,17 @@ public String getAccessToken() {
                 return accessTokenInfo.getAccessToken();
             }
         } else {
-            accessTokenInfo = generateNewAccessToken();
+            accessTokenInfo = generateNewAccessToken(tokenEndpoint, authKey);
             if (accessTokenInfo != null) {
                 accessTokenInfoMap.put(authKey, accessTokenInfo);
                 return accessTokenInfo.getAccessToken();
             }
         }
         return null;
+
     }
 
-    private AccessTokenInfo generateNewAccessToken() {
+    private AccessTokenInfo generateNewAccessToken(String tokenEndpoint, String authKey) {
         try {
             URL oauthURL = new URL(tokenEndpoint);
             HttpPost request = new HttpPost(tokenEndpoint);