Bunch of fixes the OpenBlocks team included in the EE Docker images, but not on their GitHub.

LennardF1989 · LennardF1989 · commit 973bf252ed40 · 2023-07-06T15:46:22.000+02:00
diff --git a/server/node-service/src/plugins/bigQuery/dataSourceConfig.ts b/server/node-service/src/plugins/bigQuery/dataSourceConfig.ts
@@ -5,7 +5,7 @@ export const dataSourceConfig = {
   params: [
     {
       key: "privateKey",
-      label: "Private Key",
+      label: "Service Account",
       type: "password",
       tooltip:
         "The private key associated with a Service Account with Big Query privileges, [Documentation](https://cloud.google.com/iam/docs/service-accounts) for service accounts.",
diff --git a/server/node-service/src/plugins/openApi/index.ts b/server/node-service/src/plugins/openApi/index.ts
@@ -25,7 +25,7 @@ const dataSourceConfig = {
       label: "Spec URL",
       key: "url",
       type: "textInput",
-      updatable: true,
+      updatable: false,
       rules: [
         {
           required: true,
@@ -146,11 +146,18 @@ const openApiPlugin: DataSourcePlugin<ActionDataType, DataSourceDataType> = {
   dataSourceConfig: {
     ...dataSourceConfig,
     extra: async (dataSourceConfig) => {
-      // called whenever datasource config opens or changes
-      const { url} = dataSourceConfig;
-      const { spec: specObj} = await retrieveSpec(url);
+      const { url, extra } = dataSourceConfig;
+      let spec: string = extra?.spec;
+      let specObj: OpenAPI.Document;
+      if (!spec) {
+        // retrieve spec from remote only once
+        const { spec: remoteSpec } = await retrieveSpec(url);
+        specObj = remoteSpec;
+        spec = JSON.stringify(remoteSpec);
+      } else {
+        specObj = safeJsonParse(spec);
+      }
       const extraParams = await authParamsConfig(specObj);
-      const spec = JSON.stringify(specObj);
       return {
         data: {
           spec,
diff --git a/server/node-service/src/plugins/sendGrid/index.ts b/server/node-service/src/plugins/sendGrid/index.ts
@@ -21,7 +21,10 @@ const dataSourceConfig = {
 
 const parseOptions: ParseOpenApiOptions = {
   actionLabel: (method: string, path: string, operation: OpenAPI.Operation) =>
-    operation.operationId?.replace("_", " ") || "",
+    operation.summary || "",
+  actionDescription: (method: string, path: string, operation: OpenAPI.Operation) => {
+    return operation.description || "";
+  }
 };
 
 type DataSourceConfigType = ConfigToType<typeof dataSourceConfig>;
diff --git a/server/node-service/src/plugins/shopify/index.ts b/server/node-service/src/plugins/shopify/index.ts
@@ -11,7 +11,14 @@ export const dataSourceConfig = {
       label: "Endpoint",
       key: "endpoint",
       rules: [{ required: true }],
+      placeholder: "https://{shop}.myshopify.com/admin/api/2023-01/graphql.json",
     },
+    {
+      type: "password",
+      label: "Access Token",
+      key: "token",
+      rules: [{ required: true }],
+    }
   ],
 } as const;
 
@@ -28,7 +35,11 @@ const shopifyPlugin: DataSourcePlugin<
   run: function (actionData, dataSourceConfig, context: PluginContext): Promise<any> {
     const { query, variables: variableKvs, headers: queryHeaders } = actionData;
     const variables = kvToRecord(variableKvs);
-    return runGraphQL(dataSourceConfig.endpoint, query, variables, {});
+    const headers = {
+      ...kvToRecord(queryHeaders),
+      'X-Shopify-Access-Token': dataSourceConfig.token
+    };
+    return runGraphQL(dataSourceConfig.endpoint, query, variables, headers);
   },
 };
 
diff --git a/server/node-service/src/plugins/slack/run.ts b/server/node-service/src/plugins/slack/run.ts
@@ -1,6 +1,7 @@
 import { DataSourceDataType } from "./dataSourceConfig";
 import { ActionDataType } from "./queryConfig";
 import { fetch } from "../../common/fetch";
+import { ServiceError } from "../../common/error";
 
 export default async function run(action: ActionDataType, dataSourceConfig: DataSourceDataType) {
   const params = new URLSearchParams();
@@ -9,5 +10,11 @@ export default async function run(action: ActionDataType, dataSourceConfig: Data
   return await fetch(dataSourceConfig.webhookURL, {
     method: "POST",
     body: params,
-  }).then((value) => value.text());
+  }).then(async (value) => {
+    const msg = await value.text();
+    if (!value.ok) {
+      throw new ServiceError(msg, value.status)
+    }
+    return msg;
+  });
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export const dataSourceConfig = {`
`5`	`5`	`params: [`
`6`	`6`	`{`
`7`	`7`	`key: "privateKey",`
`8`		`- label: "Private Key",`
	`8`	`+ label: "Service Account",`
`9`	`9`	`type: "password",`
`10`	`10`	`tooltip:`
`11`	`11`	`"The private key associated with a Service Account with Big Query privileges, [Documentation](https://cloud.google.com/iam/docs/service-accounts) for service accounts.",`