From 03610f2dd6833b3b6358790d044b852c154b4bf3 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Fri, 15 Dec 2017 14:00:17 +0100
Subject: feat(Recipes): Add `hasHostedOption` to enable hosted & self hosted
 services

---
 src/models/Recipe.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/models/Recipe.js')

diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 9971df77c..036d6d216 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -15,6 +15,7 @@ export default class Recipe {
   hasTeamId = false;
   hasPredefinedUrl = false;
   hasCustomUrl = false;
+  hasHostedOption = false;
   urlInputPrefix = '';
   urlInputSuffix = '';
 
@@ -45,6 +46,7 @@ export default class Recipe {
     this.hasTeamId = data.config.hasTeamId || this.hasTeamId;
     this.hasPredefinedUrl = data.config.hasPredefinedUrl || this.hasPredefinedUrl;
     this.hasCustomUrl = data.config.hasCustomUrl || this.hasCustomUrl;
+    this.hasHostedOption = data.config.hasHostedOption || this.hasHostedOption;
 
     this.urlInputPrefix = data.config.urlInputPrefix || this.urlInputPrefix;
     this.urlInputSuffix = data.config.urlInputSuffix || this.urlInputSuffix;
-- 
cgit v1.2.3-70-g09d2


From 5826dc36797b3d1d96ec986437003e5fc2626e91 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Fri, 15 Dec 2017 14:42:45 +0100
Subject: feat(Recipe): Add semver version validation

---
 src/models/Recipe.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/models/Recipe.js')

diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 036d6d216..1fc23ac89 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,10 +1,11 @@
 import emailParser from 'address-rfc2822';
+import semver from 'semver';
 
 export default class Recipe {
   id = '';
   name = '';
   description = '';
-  version = '1.0';
+  version = '';
   path = '';
 
   serviceURL = '';
@@ -31,6 +32,10 @@ export default class Recipe {
       throw Error(`Recipe '${data.name}' requires Id`);
     }
 
+    if (!semver.valid(data.version)) {
+      throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+    }
+
     this.id = data.id || this.id;
     this.name = data.name || this.name;
     this.rawAuthor = data.author || this.author;
-- 
cgit v1.2.3-70-g09d2