Merge pull request #374 from ballerina-platform/patch-8.0.x

Fix panicking in ClientOAuth2 initialization
ballerina-platform · Nov 21, 2024 · c817a76 · c817a76
2 parents 28bf740 + 59a3a62
commit c817a76
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/ballerina/modules/bulk/client.bal b/ballerina/modules/bulk/client.bal
@@ -43,14 +43,19 @@ public isolated client class Client {
                 (authConfig is http:BearerTokenConfig ? authConfig : {...authConfig});
         self.clientConfig = auth.cloneReadOnly();
 
-        http:ClientOAuth2Handler|http:ClientBearerTokenAuthHandler httpHandlerResult;
+        http:ClientOAuth2Handler|http:ClientBearerTokenAuthHandler|error httpHandlerResult;
 
         if auth is http:OAuth2RefreshTokenGrantConfig {
-            httpHandlerResult = new http:ClientOAuth2Handler(auth);
+            httpHandlerResult = trap new http:ClientOAuth2Handler(auth);
         } else {
             httpHandlerResult = new http:ClientBearerTokenAuthHandler(auth);
         }
-        self.clientHandler = httpHandlerResult;
+
+        if httpHandlerResult is http:ClientOAuth2Handler|http:ClientBearerTokenAuthHandler {
+            self.clientHandler = httpHandlerResult;
+        } else {
+            return error(utils:CLIENT_INIT_ERROR_MSG + httpHandlerResult.message(), httpHandlerResult);
+        }
 
         http:Client|http:ClientError httpClientResult;
         httpClientResult = new (config.baseUrl, httpClientConfig);

diff --git a/ballerina/modules/soap/client.bal b/ballerina/modules/soap/client.bal
@@ -43,13 +43,19 @@ public isolated client class Client {
                 (authConfig is http:BearerTokenConfig ? authConfig : {...authConfig});
         self.clientConfig = auth.cloneReadOnly();
 
-        http:ClientOAuth2Handler|http:ClientBearerTokenAuthHandler httpHandlerResult;
+        http:ClientOAuth2Handler|http:ClientBearerTokenAuthHandler|error httpHandlerResult;
+
         if auth is http:OAuth2RefreshTokenGrantConfig {
-            httpHandlerResult = new http:ClientOAuth2Handler(auth);
+            httpHandlerResult = trap new http:ClientOAuth2Handler(auth);
         } else {
             httpHandlerResult = new http:ClientBearerTokenAuthHandler(auth);
         }
-        self.clientHandler = httpHandlerResult;
+
+        if httpHandlerResult is http:ClientOAuth2Handler|http:ClientBearerTokenAuthHandler {
+            self.clientHandler = httpHandlerResult;
+        } else {
+            return error(utils:CLIENT_INIT_ERROR_MSG + httpHandlerResult.message(), httpHandlerResult);
+        }
 
         http:Client|http:ClientError httpClientResult = new (config.baseUrl, httpClientConfig);