Finalize handling for open api oauth inherit from login workflow

aq-ikhwa-tech · aq-ikhwa-tech · commit 1d71c4875eb6 · 2024-01-10T20:27:37.000+05:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionService.java
@@ -113,11 +113,9 @@ private Mono<QueryExecutionResult> executeByNodeJs(Datasource datasource, Map<St
     private Mono<Void> injectOauth2Token(QueryVisitorContext queryVisitorContext, List<Map<String, Object>> context) {
         return queryVisitorContext.getAuthTokenMono()
                 .doOnNext(properties -> {
-                    HashMap<String, Object> hashMap = new HashMap<>();
                     for (Property property : properties) {
-                        hashMap.put(property.getKey(), property.getValue());
+                        context.add(Map.of("key" , property.getKey(), "value", property.getValue()));
                     }
-                    context.add(hashMap);
                 })
                 .then();
     }
diff --git a/server/node-service/src/plugins/openApi/index.ts b/server/node-service/src/plugins/openApi/index.ts
@@ -102,7 +102,7 @@ export async function runOpenApi(
 
   try {
     const { parameters, requestBody } = normalizeParams(otherActionData, operation, isOas3Spec);
-    const securities = extractSecurityParams(dataSourceConfig.dynamicParamsConfig, definition);
+    let securities = extractSecurityParams(dataSourceConfig, definition);
     const response = await SwaggerClient.execute({
       spec: definition,
       operationId: realOperationId,
diff --git a/server/node-service/src/plugins/openApi/util.ts b/server/node-service/src/plugins/openApi/util.ts
@@ -81,7 +81,8 @@ interface NormalizedParams {
   requestBody?: any;
 }
 
-export function extractSecurityParams(config: any, spec: OpenAPI.Document) {
+export function extractSecurityParams(datasourceConfig: any, spec: OpenAPI.Document) {
+  const config = datasourceConfig.dynamicParamsConfig;
   if (!config) {
     return {};
   }
@@ -96,6 +97,18 @@ export function extractSecurityParams(config: any, spec: OpenAPI.Document) {
     names = Object.keys(swagger2Spec.securityDefinitions || {});
   }
   const authorized = _.pick(authData, names);
+
+  let oauthAccessToken = datasourceConfig["OAUTH_ACCESS_TOKEN"];
+
+  if(oauthAccessToken) {
+    return {
+      authorized: {
+        OAUTH_ACCESS_TOKEN: { value: oauthAccessToken }
+      },
+      specSecurity: []
+    };
+  }
+
   return { authorized, specSecurity: spec.security };
 }
 
diff --git a/server/node-service/src/services/plugin.ts b/server/node-service/src/services/plugin.ts
@@ -212,9 +212,12 @@ export async function runPluginQuery(
   const queryConfig = await getQueryConfig(plugin, dataSourceConfig);
   const action = await evalToValue(queryConfig, dsl, context, dataSourceConfig);
 
-  //forward cookies
+  // forward cookies
   context.forEach(({ key, value }) => {
-    if (dataSourceConfig.dynamicParamsConfig && key in dataSourceConfig.dynamicParamsConfig) {
+    // for oauth(inherit from login) support
+    if(key == "OAUTH_ACCESS_TOKEN") {
+      dataSourceConfig["OAUTH_ACCESS_TOKEN"] = value
+    } else if (dataSourceConfig.dynamicParamsConfig && key in dataSourceConfig.dynamicParamsConfig) {
       const valueKey = `${key}.value`;
       dataSourceConfig.dynamicParamsConfig[valueKey] = value[0].value
     }

Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,9 @@ private Mono<QueryExecutionResult> executeByNodeJs(Datasource datasource, Map<St`
`113`	`113`	`private Mono<Void> injectOauth2Token(QueryVisitorContext queryVisitorContext, List<Map<String, Object>> context) {`
`114`	`114`	`return queryVisitorContext.getAuthTokenMono()`
`115`	`115`	`.doOnNext(properties -> {`
`116`		`- HashMap<String, Object> hashMap = new HashMap<>();`
`117`	`116`	`for (Property property : properties) {`
`118`		`- hashMap.put(property.getKey(), property.getValue());`
	`117`	`+ context.add(Map.of("key" , property.getKey(), "value", property.getValue()));`
`119`	`118`	`}`
`120`		`- context.add(hashMap);`
`121`	`119`	`})`
`122`	`120`	`.then();`
`123`	`121`	`}`