fix(add): code refactor

sasjs · Apr 21, 2021 · 60e1128 · 60e1128
1 parent 9490fa6
commit 60e1128
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/src/commands/add/addCredential.ts b/src/commands/add/addCredential.ts
@@ -38,7 +38,7 @@ export const addCredential = async (
 
   if (!target.serverUrl) {
     const serverUrl = await getAndValidateServerUrl(target)
-    target = new Target({ ...target.toJsonNoDefaults(), serverUrl })
+    target = new Target({ ...target.toJson(false), serverUrl })
   }
 
   const { client, secret } = await getCredentialsInput(target.name)
@@ -58,13 +58,13 @@ export const addCredential = async (
       access_token,
       refresh_token
     )
-    await saveToLocalConfig(target, false, true)
+    await saveToLocalConfig(target, false, false)
   } else {
     target = new Target({
-      ...target.toJsonNoDefaults(),
+      ...target.toJson(false),
       authConfig: { client, secret, access_token, refresh_token }
     })
-    await saveToGlobalConfig(target, false, true)
+    await saveToGlobalConfig(target, false, false)
   }
 }
 

diff --git a/src/commands/add/addTarget.ts b/src/commands/add/addTarget.ts
@@ -29,7 +29,7 @@ export async function addTarget(insecure: boolean = false): Promise<boolean> {
     existingTarget
   } = await getCommonFields()
 
-  const saveWithoutDefaultValues = !!existingTarget
+  const saveWithDefaultValues = !existingTarget
 
   let targetJson: any = {
     ...existingTarget,
@@ -43,7 +43,7 @@ export async function addTarget(insecure: boolean = false): Promise<boolean> {
     scope,
     new Target(targetJson),
     false,
-    saveWithoutDefaultValues
+    saveWithDefaultValues
   )
 
   process.logger?.info(`Target configuration has been saved to ${filePath} .`)
@@ -73,7 +73,7 @@ export async function addTarget(insecure: boolean = false): Promise<boolean> {
     }
 
     const { target: currentTarget } = await findTargetInConfiguration(name)
-    targetJson = { ...currentTarget.toJsonNoDefaults(), ...targetJson }
+    targetJson = { ...currentTarget.toJson(false), ...targetJson }
   }
 
   const isDefault = await getIsDefault()
@@ -82,7 +82,7 @@ export async function addTarget(insecure: boolean = false): Promise<boolean> {
     scope,
     new Target(targetJson),
     isDefault,
-    saveWithoutDefaultValues
+    saveWithDefaultValues
   )
 
   process.logger?.info(`Target configuration has been saved to ${filePath}`)
@@ -94,21 +94,17 @@ async function saveConfig(
   scope: TargetScope,
   target: Target,
   isDefault: boolean,
-  saveWithoutDefaultValues: boolean
+  saveWithDefaultValues: boolean
 ) {
   let filePath = ''
 
   if (scope === TargetScope.Local) {
-    filePath = await saveToLocalConfig(
-      target,
-      isDefault,
-      saveWithoutDefaultValues
-    )
+    filePath = await saveToLocalConfig(target, isDefault, saveWithDefaultValues)
   } else if (scope === TargetScope.Global) {
     filePath = await saveToGlobalConfig(
       target,
       isDefault,
-      saveWithoutDefaultValues
+      saveWithDefaultValues
     )
   }
 

diff --git a/src/utils/config.ts b/src/utils/config.ts
@@ -236,12 +236,10 @@ export async function saveGlobalRcFile(content: string) {
 export async function saveToGlobalConfig(
   target: Target,
   isDefault: boolean = false,
-  saveWithoutDefaultValues: boolean = false
+  saveWithDefaultValues: boolean = false
 ) {
   let globalConfig = await getGlobalRcFile()
-  const targetJson = saveWithoutDefaultValues
-    ? target.toJsonNoDefaults()
-    : target.toJson()
+  const targetJson = target.toJson(saveWithDefaultValues)
   if (globalConfig) {
     if (globalConfig.targets && globalConfig.targets.length) {
       const existingTargetIndex = globalConfig.targets.findIndex(
@@ -333,11 +331,9 @@ export async function saveLocalConfigFile(content: string) {
 export async function saveToLocalConfig(
   target: Target,
   isDefault: boolean = false,
-  saveWithoutDefaultValues: boolean = false
+  saveWithDefaultValues: boolean = true
 ) {
-  const targetJson = saveWithoutDefaultValues
-    ? target.toJsonNoDefaults()
-    : target.toJson()
+  const targetJson = target.toJson(saveWithDefaultValues)
   let config = await getLocalConfig()
   if (config) {
     if (config.targets && config.targets.length) {