From cb779eaf0dfe05573844b885d75bbbe5dc6bee61 Mon Sep 17 00:00:00 2001
From: Bogdan Fazakas <bogdan.fazakas@gmail.com>
Date: Thu, 16 Dec 2021 13:04:38 +0200
Subject: [PATCH] fix encrypt fucntion

---
 src/provider/Provider.ts | 26 +++++++++++++-------------
 src/utils/FetchHelper.ts | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/provider/Provider.ts b/src/provider/Provider.ts
index ab6b67c9..345035dd 100644
--- a/src/provider/Provider.ts
+++ b/src/provider/Provider.ts
@@ -1,5 +1,5 @@
 import Web3 from 'web3'
-import { LoggerInstance } from '../utils'
+import { LoggerInstance, fetchData, getData } from '../utils'
 import {
   Asset,
   FileMetadata,
@@ -25,9 +25,9 @@ export class Provider {
    * @param {any} fetchMethod
    * @return {Promise<ServiceEndpoint[]>}
    */
-  async getEndpoints(providerUri: string, fetchMethod: any): Promise<any> {
+  async getEndpoints(providerUri: string): Promise<any> {
     try {
-      const endpoints = await await fetchMethod(providerUri).json()
+      const endpoints = await (await getData(providerUri)).json()
       return endpoints
     } catch (e) {
       LoggerInstance.error('Finding the service endpoints failed:', e)
@@ -77,7 +77,7 @@ export class Provider {
     serviceEndpoints?: ServiceEndpoint[]
   ): Promise<string> {
     if (!providerEndpoints) {
-      providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+      providerEndpoints = await this.getEndpoints(providerUri)
     }
     if (!serviceEndpoints) {
       serviceEndpoints = await this.getServiceEndpoints(providerUri, providerEndpoints)
@@ -128,7 +128,7 @@ export class Provider {
     providerUri: string,
     fetchMethod: any
   ): Promise<string> {
-    const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+    const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
       providerEndpoints
@@ -162,7 +162,7 @@ export class Provider {
     providerUri: string,
     fetchMethod: any
   ): Promise<FileMetadata[]> {
-    const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+    const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
       providerEndpoints
@@ -204,7 +204,7 @@ export class Provider {
     fetchMethod: any,
     userCustomParameters?: UserCustomParameters
   ): Promise<string> {
-    const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+    const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
       providerEndpoints
@@ -253,7 +253,7 @@ export class Provider {
     fetchMethod: any,
     userCustomParameters?: UserCustomParameters
   ): Promise<any> {
-    const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+    const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
       providerEndpoints
@@ -315,7 +315,7 @@ export class Provider {
     fetchMethod: any,
     output?: ComputeOutput
   ): Promise<ComputeJob | ComputeJob[]> {
-    const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+    const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
       providerEndpoints
@@ -384,7 +384,7 @@ export class Provider {
     web3: Web3,
     fetchMethod: any
   ): Promise<ComputeJob | ComputeJob[]> {
-    const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+    const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
       providerEndpoints
@@ -452,7 +452,7 @@ export class Provider {
     fetchMethod: any,
     jobId?: string
   ): Promise<ComputeJob | ComputeJob[]> {
-    const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+    const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
       providerEndpoints
@@ -522,7 +522,7 @@ export class Provider {
     web3: Web3,
     fetchMethod: any
   ): Promise<any> {
-    const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+    const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
       providerEndpoints
@@ -581,7 +581,7 @@ export class Provider {
     web3: Web3,
     fetchMethod: any
   ): Promise<ComputeJob | ComputeJob[]> {
-    const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
+    const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
       providerEndpoints
diff --git a/src/utils/FetchHelper.ts b/src/utils/FetchHelper.ts
index 8a9c75d7..6bb9e548 100644
--- a/src/utils/FetchHelper.ts
+++ b/src/utils/FetchHelper.ts
@@ -10,3 +10,37 @@ export async function fetchData(url: string, opts: RequestInit): Promise<Respons
   }
   return result
 }
+
+export async function getData(url: string): Promise<Response> {
+  return fetch(url, {
+    method: 'GET',
+    headers: {
+      'Content-type': 'application/json'
+    }
+  })
+}
+
+async function postWithHeaders(
+  url: string,
+  payload: BodyInit,
+  headers: any
+): Promise<Response> {
+  if (payload != null) {
+    return fetch(url, {
+      method: 'POST',
+      body: payload,
+      headers
+    })
+  } else {
+    return fetch(url, {
+      method: 'POST'
+    })
+  }
+}
+
+export async function postData(url: string, payload: BodyInit): Promise<Response> {
+  const headers = {
+    'Content-type': 'application/json'
+  }
+  return postWithHeaders(url, payload, headers)
+}