From 933e3cea5c96a13f9141da4d37d374cf022e2718 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Mon, 23 Aug 2021 11:45:19 +0530
Subject: fix: Fixing bug where the service-defaults are not merged

(when a user signs up for a service)
---
 src/stores/ServicesStore.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 5610f7a22..ccd8e2cb9 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -400,7 +400,8 @@ export default class ServicesStore extends Store {
 
     // set default values for serviceData
     // eslint-disable-next-line prefer-object-spread
-    Object.assign(
+    // TODO: How is this different from the defaults of the recipe in 'src/models/Recipe' file?
+    serviceData = Object.assign(
       {
         isEnabled: true,
         isHibernationEnabled: false,
@@ -416,11 +417,7 @@ export default class ServicesStore extends Store {
       serviceData,
     );
 
-    let data = serviceData;
-
-    if (!skipCleanup) {
-      data = this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
-    }
+    const data = skipCleanup ? serviceData : this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
 
     const response = await this.createServiceRequest.execute(recipeId, data)
       ._promise;
@@ -452,12 +449,13 @@ export default class ServicesStore extends Store {
       serviceData.name = data.name;
     }
 
-    if (data.team && !data.customURL) {
-      serviceData.team = data.team;
-    }
-
-    if (data.team && data.customURL) {
-      serviceData.customUrl = data.team;
+    if (data.team) {
+      if (!data.customURL) {
+        serviceData.team = data.team;
+      } else {
+        // TODO: Is this correct?
+        serviceData.customUrl = data.team;
+      }
     }
 
     this.actions.service.createService({
-- 
cgit v1.2.3-54-g00ecf