From d43e33583699f573795622737fadcd397b5e264c Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Sun, 25 Jul 2021 21:52:27 -0700
Subject: [PATCH] More data cleaning

---
 src/datastore/AppsDataStore.ts                   | 16 +++++++++++++++-
 .../apps/appdefinition/AppDefinitionRouter.ts    |  6 +++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/datastore/AppsDataStore.ts b/src/datastore/AppsDataStore.ts
index c804e10..48349c1 100644
--- a/src/datastore/AppsDataStore.ts
+++ b/src/datastore/AppsDataStore.ts
@@ -5,6 +5,7 @@ import Authenticator from '../user/Authenticator'
 import ApacheMd5 from '../utils/ApacheMd5'
 import CaptainConstants from '../utils/CaptainConstants'
 import CaptainEncryptor from '../utils/Encryptor'
+import Logger from '../utils/Logger'
 import Utils from '../utils/Utils'
 import configstore = require('configstore')
 
@@ -695,7 +696,20 @@ class AppsDataStore {
 
                 appObj.appDeployTokenConfig = {
                     enabled: !!appDeployTokenConfig.enabled,
-                    appDeployToken: `${appDeployTokenConfig.appDeployToken}`,
+                    appDeployToken: `${
+                        appDeployTokenConfig.appDeployToken
+                            ? appDeployTokenConfig.appDeployToken
+                            : ''
+                    }`,
+                }
+
+                if (
+                    appObj.appDeployTokenConfig.appDeployToken ===
+                        'undefined' ||
+                    appObj.appDeployTokenConfig.appDeployToken === 'null'
+                ) {
+                    appObj.appDeployTokenConfig = { enabled: false }
+                    Logger.e('Bad values in the token')
                 }
 
                 if (!appObj.appDeployTokenConfig.enabled) {
diff --git a/src/routes/user/apps/appdefinition/AppDefinitionRouter.ts b/src/routes/user/apps/appdefinition/AppDefinitionRouter.ts
index 860a4e6..980698f 100644
--- a/src/routes/user/apps/appdefinition/AppDefinitionRouter.ts
+++ b/src/routes/user/apps/appdefinition/AppDefinitionRouter.ts
@@ -338,7 +338,11 @@ router.post('/update/', function (req, res, next) {
     } else {
         appDeployTokenConfig = {
             enabled: !!appDeployTokenConfig.enabled,
-            appDeployToken: `${appDeployTokenConfig.appDeployToken}`.trim(),
+            appDeployToken: `${
+                appDeployTokenConfig.appDeployToken
+                    ? appDeployTokenConfig.appDeployToken
+                    : ''
+            }`.trim(),
         }
     }