making token fetch thread safe

AsabuHere · AsabuHere · commit c046ba6995ca · 2024-06-21T03:39:00.000-06:00
diff --git a/src/main/java/com/twilio/TwilioOrgsTokenAuth.java b/src/main/java/com/twilio/TwilioOrgsTokenAuth.java
@@ -20,7 +20,7 @@ public class TwilioOrgsTokenAuth {
     private static String region = System.getenv("TWILIO_REGION");
     private static String edge = System.getenv("TWILIO_EDGE");
     private static volatile BearerTokenTwilioRestClient restClient;
-    @Setter
+    @Getter @Setter
     private static TokenManager tokenManager;
 
     private static volatile ExecutorService executorService;
@@ -87,7 +87,7 @@ private static BearerTokenTwilioRestClient buildOAuthRestClient() {
         builder.region(TwilioOrgsTokenAuth.region);
         builder.edge(TwilioOrgsTokenAuth.edge);
         if(TwilioOrgsTokenAuth.tokenManager == null){
-            tokenManager = new OrgsTokenManager(grantType, clientId, clientSecret, code, redirectUri, audience, refreshToken, scope);
+            throw new AuthenticationException("Either initialize the authentications class or pass a custom token manager");
         }
         builder.tokenManager(TwilioOrgsTokenAuth.tokenManager);
 
diff --git a/src/main/java/com/twilio/http/bearertoken/BearerTokenTwilioRestClient.java b/src/main/java/com/twilio/http/bearertoken/BearerTokenTwilioRestClient.java
@@ -109,7 +109,9 @@ public BearerTokenTwilioRestClient build() {
     public Response request(BearerTokenRequest request) {
 
         if (accessToken == null || accessToken.isEmpty() || isTokenExpired(this.accessToken)) {
-            this.accessToken = tokenManager.fetchAccessToken();
+            synchronized (BearerTokenTwilioRestClient.class){
+                this.accessToken = tokenManager.fetchAccessToken();
+            }
         }
         
         request.setAuth(accessToken);

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,9 @@ public BearerTokenTwilioRestClient build() {`
`109`	`109`	`public Response request(BearerTokenRequest request) {`
`110`	`110`
`111`	`111`	`if (accessToken == null \|\| accessToken.isEmpty() \|\| isTokenExpired(this.accessToken)) {`
`112`		`- this.accessToken = tokenManager.fetchAccessToken();`
	`112`	`+ synchronized (BearerTokenTwilioRestClient.class){`
	`113`	`+ this.accessToken = tokenManager.fetchAccessToken();`
	`114`	`+ }`
`113`	`115`	`}`
`114`	`116`
`115`	`117`	`request.setAuth(accessToken);`