Merge pull request #106 from semi-technologies/fix/async-await

Adding polyfill and fixing imports

Author: aliszka

connection/gqlClient.js

@@ -1,10 +1,12 @@
-const client = (config) => {
+import graphqlClient from 'graphql-client';
+
+export const gqlClient = (config) => {
     const scheme = config.scheme
     const host = config.host
     const defaultHeaders = config.headers
     return {
       query: (query, headers = {}) => {
-      var gql = require("graphql-client")({
+      var gql = graphqlClient({
         url: `${scheme}://${host}/v1/graphql`,
         headers: {
           ...defaultHeaders,
@@ -16,4 +18,4 @@ const client = (config) => {
   }
 }
 
-module.exports = client;
+export default gqlClient;

connection/httpClient.js

@@ -1,6 +1,6 @@
-const fetch = require("isomorphic-fetch");
+import fetch from 'isomorphic-fetch'
 
-const client = (config) => {
+export const httpClient = (config) => {
   const baseUri = `${config.scheme}://${config.host}/v1`
   const url = makeUrl(baseUri);
 
@@ -149,4 +149,4 @@ function addAuthHeaderIfNeeded(request, bearerToken) {
   }
 }
 
-module.exports = client;
+export default httpClient;

connection/index.js

@@ -1,10 +1,13 @@
 import { Authenticator } from './auth.js';
 import OpenidConfigurationGetter from "../misc/openidConfigurationGetter.js";
 
+import httpClient from './httpClient';
+import gqlClient from './gqlClient';
+
 export default class Connection {
   constructor(params) {
-    this.http = require("./httpClient.js")(params);
-    this.gql = require("./gqlClient.js")(params)
+    this.http = httpClient(params);
+    this.gql = gqlClient(params)
 
     this.authEnabled = (params.authClientSecret !== undefined)
     if (this.authEnabled) {

index.js

@@ -14,6 +14,9 @@ import filtersConsts from "./filters/consts.js";
 import cluster from "./cluster/index.js";
 import clusterConsts from "./cluster/consts.js";
 import replicationConsts from "./data/replication/consts.js";
+import { AuthAccessTokenCredentials, AuthUserPasswordCredentials } from "./connection/auth.js";
+
+require('babel-polyfill')
 
 const app = {
   client: function (params) {
@@ -66,4 +69,8 @@ function initDbVersionProvider(conn) {
 }
 
 export default app;
+export { AuthUserPasswordCredentials, AuthAccessTokenCredentials };
 module.exports = app;
+module.exports.AuthUserPasswordCredentials = AuthUserPasswordCredentials;
+module.exports.AuthAccessTokenCredentials = AuthAccessTokenCredentials;
+

package-lock.json

@@ -30,6 +30,7 @@
     "@babel/plugin-transform-runtime": "^7.11.5",
     "@babel/preset-env": "^7.11.5",
     "@rollup/plugin-babel": "^5.2.1",
+    "babel-polyfill": "^6.26.0",
     "jest": "^26.4.2",
     "prettier": "^2.1.1",
     "rollup": "^2.28.2"