From 54bdf6aea5321cb4e3f53c354ea9764f3a907d1f Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Wed, 29 Jul 2020 22:25:44 -0700
Subject: [PATCH] add nonce to provider signature

---
 src/provider/Provider.ts | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/provider/Provider.ts b/src/provider/Provider.ts
index ddbec903..2cd062a9 100644
--- a/src/provider/Provider.ts
+++ b/src/provider/Provider.ts
@@ -15,6 +15,7 @@ const apiPath = '/api/v1/services'
  * data services.
  */
 export class Provider extends Instantiable {
+    public nonce: string
     private get url() {
         return this.config.providerUri
     }
@@ -22,6 +23,7 @@ export class Provider extends Instantiable {
     constructor(config: InstantiableConfig) {
         super()
         this.setInstanceConfig(config)
+        this.nonce = '0'
     }
 
     public async createSignature(account: Account, agreementId: string): Promise<string> {
@@ -43,8 +45,9 @@ export class Provider extends Instantiable {
     }
 
     public async encrypt(did: string, document: any, account: Account): Promise<string> {
+        await this.getNonce(account.getId())
         const signature = await this.ocean.utils.signature.signWithHash(
-            did,
+            did + this.nonce,
             account.getId(),
             account.getPassword()
         )
@@ -67,6 +70,23 @@ export class Provider extends Instantiable {
         }
     }
 
+    /** Get nonce from provider
+     * @param {String} consumerAddress
+     * @return {Promise<string>} string
+     */
+    public async getNonce(consumerAddress: string): Promise<string> {
+        let initializeUrl = this.getNonceEndpoint()
+        initializeUrl += `?userAddress=${consumerAddress}`
+        try {
+            const response = await this.ocean.utils.fetch.get(initializeUrl)
+            this.nonce = String((await response.json()).nonce)
+            return this.nonce
+        } catch (e) {
+            this.logger.error(e)
+            throw new Error('HTTP request failed')
+        }
+    }
+
     public async initialize(
         did: string,
         serviceIndex: number,
@@ -107,7 +127,8 @@ export class Provider extends Instantiable {
         files: File[],
         index: number = -1
     ): Promise<any> {
-        const signature = await this.createSignature(account, did)
+        await this.getNonce(account.getId())
+        const signature = await this.createSignature(account, did + this.nonce)
         const filesPromises = files
             .filter((_, i) => index === -1 || i === index)
             .map(async ({ index: i }) => {
@@ -149,9 +170,11 @@ export class Provider extends Instantiable {
         algorithmDataToken?: string
     ): Promise<ComputeJob | ComputeJob[]> {
         const address = consumerAccount.getId()
+        await this.getNonce(consumerAccount.getId())
         let signatureMessage = address
         signatureMessage += jobId || ''
         signatureMessage += (did && `${noZeroX(did)}`) || ''
+        signatureMessage += this.nonce
         const signature = await this.createHashSignature(
             consumerAccount,
             signatureMessage
@@ -244,6 +267,10 @@ export class Provider extends Instantiable {
         return `${this.url}${apiPath}/initialize`
     }
 
+    public getNonceEndpoint() {
+        return `${this.url}${apiPath}/nonce`
+    }
+
     public getConsumeEndpoint() {
         return `${this.url}${apiPath}/consume`
     }