Merge pull request #1732 from lnash94/config_issue

Fix authentication configs issue in client generation
ballerina-platform · Jun 27, 2024 · 17cefe7 · 17cefe7
2 parents 6bcffcb + 34b95f1
commit 17cefe7
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/...i-cli/src/test/java/io/ballerina/openapi/generators/auth/MixedApiKeyAndHTTPAuthTests.java b/...i-cli/src/test/java/io/ballerina/openapi/generators/auth/MixedApiKeyAndHTTPAuthTests.java
@@ -20,11 +20,16 @@
 
 import io.ballerina.compiler.syntax.tree.Node;
 import io.ballerina.compiler.syntax.tree.ParameterNode;
+import io.ballerina.compiler.syntax.tree.SyntaxTree;
 import io.ballerina.compiler.syntax.tree.TypeDefinitionNode;
 import io.ballerina.openapi.core.generators.client.AuthConfigGeneratorImp;
+import io.ballerina.openapi.core.generators.client.BallerinaClientGenerator;
 import io.ballerina.openapi.core.generators.client.exception.ClientException;
+import io.ballerina.openapi.core.generators.client.model.OASClientConfig;
 import io.ballerina.openapi.core.generators.common.GeneratorUtils;
+import io.ballerina.openapi.core.generators.common.TypeHandler;
 import io.ballerina.openapi.core.generators.common.exception.BallerinaOpenApiException;
+import io.ballerina.openapi.core.generators.common.model.Filter;
 import io.ballerina.openapi.generators.common.TestConstants;
 import io.swagger.v3.oas.models.OpenAPI;
 import org.testng.Assert;
@@ -37,6 +42,8 @@
 import java.util.List;
 import java.util.Optional;
 
+import static io.ballerina.openapi.generators.common.TestConstants.MIXED_AUTH_INIT_STATEMENTS;
+
 /**
  * All the tests related to the auth related code snippet generation for api key auth mechanism.
  */
@@ -54,6 +61,17 @@ public void testGetConfigRecord(String yamlFile) throws IOException, BallerinaOp
         Optional<TypeDefinitionNode> connectionConfig = authRelatedTypeDefinitionNodes.stream()
                 .filter(typeDefinitionNode -> typeDefinitionNode.typeName().text().equals("ConnectionConfig"))
                 .findFirst();
+        TypeHandler.createInstance(openAPI, false);
+        OASClientConfig.Builder clientMetaDataBuilder = new OASClientConfig.Builder();
+        OASClientConfig oasClientConfig = clientMetaDataBuilder
+                .withFilters(new Filter())
+                .withOpenAPI(openAPI)
+                .withResourceMode(false).build();
+        BallerinaClientGenerator ballerinaClientGenerator = new BallerinaClientGenerator(oasClientConfig);
+        SyntaxTree syntaxTree = ballerinaClientGenerator.generateSyntaxTree();
+        Assert.assertTrue(syntaxTree.toSourceCode().trim().replaceAll("\\s+", "")
+                .contains(MIXED_AUTH_INIT_STATEMENTS.trim().replaceAll("\\s+", "")));
+
         if (connectionConfig.isPresent()) {
             String expectedRecord = TestConstants.CONNECTION_CONFIG_MIXED_AUTH;
             String generatedRecord = connectionConfig.get().toString();

diff --git a/openapi-cli/src/test/java/io/ballerina/openapi/generators/common/TestConstants.java b/openapi-cli/src/test/java/io/ballerina/openapi/generators/common/TestConstants.java
@@ -288,4 +288,11 @@ public class TestConstants {
     public static final String OAUTH2_REFRESH_TOKEN_GRANT_CONFIG_RECORD = "#OAuth2ClientCredentialsGrantConfigs" +
             "publictypeOAuth2ClientCredentialsGrantConfigrecord{|*http:OAuth2ClientCredentialsGrantConfig;" +
             "#TokenURLstringtokenUrl=\"https://domain/services/data/oauth2/token\";|};";
+    public static final String MIXED_AUTH_INIT_STATEMENTS = "if config.auth is ApiKeysConfig {\n" +
+            "            self.apiKeyConfig = (<ApiKeysConfig>config.auth).cloneReadOnly();\n" +
+            "        } else {\n" +
+            "            httpClientConfig.auth = <OAuth2ClientCredentialsGrantConfig|http:BearerTokenConfig|" +
+            "OAuth2RefreshTokenGrantConfig>config.auth;\n" +
+            "            self.apiKeyConfig = ();\n" +
+            "        }";
 }
diff --git a/openapi-cli/src/test/resources/expected_gen/petstore_catch_all_path_client.bal b/openapi-cli/src/test/resources/expected_gen/petstore_catch_all_path_client.bal
@@ -38,7 +38,7 @@ public isolated client class Client {
         if config.auth is ApiKeysConfig {
             self.apiKeyConfig = (<ApiKeysConfig>config.auth).cloneReadOnly();
         } else {
-            config.auth = <http:BearerTokenConfig>config.auth;
+            httpClientConfig.auth = <http:BearerTokenConfig>config.auth;
             self.apiKeyConfig = ();
         }
         http:Client httpEp = check new (serviceUrl, httpClientConfig);

diff --git a/openapi-cli/src/test/resources/expected_gen/petstore_client_swagger.bal b/openapi-cli/src/test/resources/expected_gen/petstore_client_swagger.bal
@@ -39,7 +39,7 @@ public isolated client class Client {
         if config.auth is ApiKeysConfig {
             self.apiKeyConfig = (<ApiKeysConfig>config.auth).cloneReadOnly();
         } else {
-            config.auth = <http:BearerTokenConfig>config.auth;
+            httpClientConfig.auth = <http:BearerTokenConfig>config.auth;
             self.apiKeyConfig = ();
         }
         http:Client httpEp = check new (serviceUrl, httpClientConfig);

diff --git a/...i/src/test/resources/generators/client/ballerina/combination_of_apikey_and_http_oauth.bal b/...i/src/test/resources/generators/client/ballerina/combination_of_apikey_and_http_oauth.bal
@@ -34,7 +34,7 @@ public isolated client class Client {
         if config.auth is ApiKeysConfig {
             self.apiKeyConfig = (<ApiKeysConfig>config.auth).cloneReadOnly();
         } else {
-            config.auth = <OAuth2ClientCredentialsGrantConfig|http:BearerTokenConfig|OAuth2RefreshTokenGrantConfig>config.auth;
+            httpClientConfig.auth = <OAuth2ClientCredentialsGrantConfig|http:BearerTokenConfig|OAuth2RefreshTokenGrantConfig>config.auth;
             self.apiKeyConfig = ();
         }
         http:Client httpEp = check new (serviceUrl, httpClientConfig);

diff --git a/...ore/src/main/java/io/ballerina/openapi/core/generators/client/AuthConfigGeneratorImp.java b/...ore/src/main/java/io/ballerina/openapi/core/generators/client/AuthConfigGeneratorImp.java
@@ -1367,9 +1367,9 @@ public IfElseStatementNode handleInitForMixOfApiKeyAndHTTPOrOAuth() {
 
         List<StatementNode> clientConfigAssignmentNodes = new ArrayList<>();
 
-        // config.auth = <http:BearerTokenConfig>config.auth;
+        // httpClientConfig.auth = <http:BearerTokenConfig>config.auth;
         FieldAccessExpressionNode clientConfigAuthRef = createFieldAccessExpressionNode(
-                createSimpleNameReferenceNode(createIdentifierToken(CONFIG)), createToken(DOT_TOKEN),
+                createSimpleNameReferenceNode(createIdentifierToken(HTTP_CLIENT_CONFIG)), createToken(DOT_TOKEN),
                 createSimpleNameReferenceNode(createIdentifierToken(AUTH)));
         SimpleNameReferenceNode clientConfigExpr = createSimpleNameReferenceNode(
                 createIdentifierToken("<" + getAuthFieldTypeName() +