From 2ed8237350a2eb4d161d4e17714a53680498f6ad Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Tue, 14 Apr 2020 15:32:17 +0300
Subject: [PATCH] refactor

---
 src/brizo/Brizo.ts                | 18 ++++++++++++++++--
 src/ocean/utils/SignatureUtils.ts |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/brizo/Brizo.ts b/src/brizo/Brizo.ts
index 76f43fd..da42fef 100644
--- a/src/brizo/Brizo.ts
+++ b/src/brizo/Brizo.ts
@@ -124,7 +124,10 @@ export class Brizo extends Instantiable {
         let signatureMessage = address
         signatureMessage += (jobId && `${jobId}`) || ''
         signatureMessage += (serviceAgreementId && `${noZeroX(serviceAgreementId)}`) || ''
-        const signature = await this.createSignature(consumerAccount, signatureMessage)
+        const signature = await this.createHashSignature(
+            consumerAccount,
+            signatureMessage
+        )
 
         let serviceEndpoint
         if (serviceAgreementId)
@@ -194,7 +197,18 @@ export class Brizo extends Instantiable {
         return result
     }
 
-    public async createSignature(account: Account, message: string): Promise<string> {
+    public async createSignature(account: Account, agreementId: string): Promise<string> {
+        const signature =
+            (await account.getToken()) ||
+            (await this.ocean.utils.signature.signText(
+                noZeroX(agreementId),
+                account.getId()
+            ))
+
+        return signature
+    }
+
+    public async createHashSignature(account: Account, message: string): Promise<string> {
         const signature =
             (await account.getToken()) ||
             (await this.ocean.utils.signature.signWithHash(message, account.getId()))
diff --git a/src/ocean/utils/SignatureUtils.ts b/src/ocean/utils/SignatureUtils.ts
index afa27c0..21da9bd 100644
--- a/src/ocean/utils/SignatureUtils.ts
+++ b/src/ocean/utils/SignatureUtils.ts
@@ -48,7 +48,7 @@ export class SignatureUtils {
             this.web3.currentProvider &&
             (this.web3.currentProvider as any).isMetaMask
         try {
-            const hash = this.web3.utils.utf8ToHex(text);
+            const hash = this.web3.utils.utf8ToHex(text)
             return await this.web3.eth.personal.sign(hash, publicKey, password)
         } catch (e) {
             if (isMetaMask) {