From 8fb465fc5b8d51dd6d9a28622775bdd4e4e48442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20Guti=C3=A9rrez?= <pedrogp9693@gmail.com>
Date: Thu, 7 Feb 2019 11:29:55 +0100
Subject: [PATCH] improved Service definition

---
 src/ddo/DDO.ts           |  6 +++---
 src/ddo/Service.ts       | 19 +++++++++++++++++--
 src/ocean/OceanAssets.ts | 13 +++++--------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/ddo/DDO.ts b/src/ddo/DDO.ts
index 0be52d6..594d918 100644
--- a/src/ddo/DDO.ts
+++ b/src/ddo/DDO.ts
@@ -4,7 +4,7 @@ import * as signatureHelpers from "../utils/SignatureHelpers"
 import { Authentication } from "./Authentication"
 import { Proof } from "./Proof"
 import { PublicKey } from "./PublicKey"
-import { Service } from "./Service"
+import { Service, ServiceMetadata } from "./Service"
 
 /**
  * DID Descriptor Object.
@@ -89,7 +89,7 @@ export class DDO {
      */
     public getChecksum(): string {
         const web3 = Web3Provider.getWeb3()
-        const {metadata} = this.findServiceByType("Metadata")
+        const {metadata} = <ServiceMetadata>this.findServiceByType("Metadata")
         const {files, name, author, license} = metadata.base
 
         const values = [
@@ -128,7 +128,7 @@ export class DDO {
      * Generated and adds the checksum.
      */
     public addChecksum(): void {
-        const metadataService = this.findServiceByType("Metadata")
+        const metadataService = <ServiceMetadata>this.findServiceByType("Metadata")
         if (metadataService.metadata.base.checksum) {
             Logger.log("Checksum already exists")
             return
diff --git a/src/ddo/Service.ts b/src/ddo/Service.ts
index 51da0a0..dfdb5d5 100644
--- a/src/ddo/Service.ts
+++ b/src/ddo/Service.ts
@@ -2,14 +2,29 @@ import { Condition } from "./Condition"
 import { Contract } from "./Contract"
 import { MetaData } from "./MetaData"
 
-export interface Service {
+export interface ServiceCommon {
     type: string
+    serviceEndpoint?: string
     serviceDefinitionId?: string
+}
+
+export interface ServiceAuthorization extends ServiceCommon {
+    type: "Authorization"
+    service: "SecretStore" | "None" | "RSAES-OAEP"
+}
+
+export interface ServiceMetadata extends ServiceCommon {
+    type: "Metadata"
+    metadata: MetaData
+}
+
+export interface ServiceBase extends ServiceCommon {
     templateId?: string
     serviceEndpoint: string
     purchaseEndpoint?: string
     description?: string
-    metadata?: MetaData
     serviceAgreementContract?: Contract
     conditions?: Condition[]
 }
+
+export type Service = ServiceBase | ServiceAuthorization | ServiceMetadata
diff --git a/src/ocean/OceanAssets.ts b/src/ocean/OceanAssets.ts
index ebd8035..9349129 100644
--- a/src/ocean/OceanAssets.ts
+++ b/src/ocean/OceanAssets.ts
@@ -61,9 +61,6 @@ export default class OceanAssets {
         const brizo = BrizoProvider.getBrizo()
 
         const did: DID = DID.generate()
-        const accessServiceDefinitionId: string = "0"
-        const computeServiceDefintionId: string = "1"
-        const metadataServiceDefinitionId: string = "2"
 
         metadata.base.encryptedFiles = await SecretStoreProvider.getSecretStore()
             .encryptDocument(did.getId(), metadata.base.files)
@@ -75,6 +72,7 @@ export default class OceanAssets {
 
         const serviceEndpoint = aquarius.getServiceEndpoint(did)
 
+        let serviceDefinitionIdCount = 0
         // create ddo itself
         const ddo: DDO = new DDO({
             authentication: [{
@@ -96,7 +94,7 @@ export default class OceanAssets {
                     purchaseEndpoint: brizo.getPurchaseEndpoint(),
                     serviceEndpoint: brizo.getConsumeEndpoint(),
                     // the id of the service agreement?
-                    serviceDefinitionId: accessServiceDefinitionId,
+                    serviceDefinitionId: String(serviceDefinitionIdCount++),
                     // the id of the service agreement template
                     templateId: serviceAgreementTemplate.getId(),
                     serviceAgreementContract: {
@@ -118,14 +116,13 @@ export default class OceanAssets {
                 },
                 {
                     type: "Compute",
-                    serviceEndpoint: brizo.getComputeEndpoint(publisher.getId(),
-                        computeServiceDefintionId, "xxx", "xxx"),
-                    serviceDefinitionId: computeServiceDefintionId,
+                    serviceEndpoint: brizo.getComputeEndpoint(publisher.getId(), String(serviceDefinitionIdCount), "xxx", "xxx"),
+                    serviceDefinitionId: String(serviceDefinitionIdCount++),
                 },
                 {
                     type: "Metadata",
                     serviceEndpoint,
-                    serviceDefinitionId: metadataServiceDefinitionId,
+                    serviceDefinitionId: String(serviceDefinitionIdCount++),
                     metadata: {
                         // Default values
                         curation: {