From c3f9a0ea75041a0751149a554daa016aada9dc30 Mon Sep 17 00:00:00 2001
From: Leo Lamprecht <mindrun@icloud.com>
Date: Sat, 2 Sep 2017 17:25:16 +0200
Subject: [PATCH] Made team switching work again

---
 src/providers/sh/commands/teams.js        |  9 ++---
 src/providers/sh/commands/teams/switch.js | 40 +++++++++++++++--------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/providers/sh/commands/teams.js b/src/providers/sh/commands/teams.js
index 60ede56..3ee2af0 100644
--- a/src/providers/sh/commands/teams.js
+++ b/src/providers/sh/commands/teams.js
@@ -106,11 +106,11 @@ const main = async ctx => {
     exit(0)
   }
 
-  const {authConfig: { credentials }, config: { sh }} = ctx
+  const {authConfig: { credentials }, config} = ctx
   const {token} = argv.token || credentials.find(item => item.provider === 'sh')
 
   try {
-    await run({ token, sh })
+    await run({ token, config })
   } catch (err) {
     if (err.userError) {
       error(err.message)
@@ -131,7 +131,8 @@ module.exports = async ctx => {
   }
 }
 
-async function run({ token, sh: { currentTeam } }) {
+async function run({ token, config }) {
+  const {currentTeam} = config.sh
   const teams = new NowTeams({ apiUrl, token, debug, currentTeam })
   const args = argv._
 
@@ -149,7 +150,7 @@ async function run({ token, sh: { currentTeam } }) {
       await change({
         teams,
         args,
-        token
+        config
       })
       break
     }
diff --git a/src/providers/sh/commands/teams/switch.js b/src/providers/sh/commands/teams/switch.js
index 3e2a032..6325dc3 100644
--- a/src/providers/sh/commands/teams/switch.js
+++ b/src/providers/sh/commands/teams/switch.js
@@ -4,24 +4,33 @@ const chalk = require('chalk')
 // Utilities
 const wait = require('../../../../util/output/wait')
 const listInput = require('../../../../util/input/list')
-const cfg = require('../../util/cfg')
 const exit = require('../../../../util/exit')
 const success = require('../../../../util/output/success')
 const info = require('../../../../util/output/info')
 const error = require('../../../../util/output/error')
 const param = require('../../../../util/output/param')
+const {writeToConfigFile} = require('../../../../util/config-files')
 
-async function updateCurrentTeam({ cfg, newTeam } = {}) {
-  delete newTeam.created
-  delete newTeam.creator_id
-  await cfg.merge({ currentTeam: newTeam })
+const updateCurrentTeam = async (config, newTeam) => {
+  if (newTeam) {
+    delete newTeam.created
+    delete newTeam.creator_id
+
+    config.sh.currentTeam = newTeam
+  } else {
+    delete config.sh.currentTeam
+  }
+
+  writeToConfigFile(config)
 }
 
-module.exports = async function({ teams, args, token }) {
+module.exports = async function({ teams, args, config }) {
   let stopSpinner = wait('Fetching teams')
   const list = (await teams.ls()).teams
-  let { user, currentTeam } = await cfg.read({ token })
+
+  let { user, currentTeam } = config.sh
   const accountIsCurrent = !currentTeam
+
   stopSpinner()
 
   if (accountIsCurrent) {
@@ -32,19 +41,22 @@ module.exports = async function({ teams, args, token }) {
 
   if (args.length !== 0) {
     const desiredSlug = args[0]
-
     const newTeam = list.find(team => team.slug === desiredSlug)
+
     if (newTeam) {
-      await updateCurrentTeam({ cfg, newTeam })
+      await updateCurrentTeam(config, newTeam)
       success(`The team ${chalk.bold(newTeam.name)} is now active!`)
       return exit()
     }
+
     if (desiredSlug === user.username) {
       stopSpinner = wait('Saving')
-      await cfg.remove('currentTeam')
+      await updateCurrentTeam(config)
+
       stopSpinner()
       return success(`Your account (${chalk.bold(desiredSlug)}) is now active!`)
     }
+
     error(`Could not find membership for team ${param(desiredSlug)}`)
     return exit(1)
   }
@@ -107,8 +119,10 @@ module.exports = async function({ teams, args, token }) {
       info('No changes made')
       return exit()
     }
+
     stopSpinner = wait('Saving')
-    await cfg.remove('currentTeam')
+    await updateCurrentTeam(config)
+
     stopSpinner()
     return success(`Your account (${chalk.bold(choice)}) is now active!`)
   }
@@ -119,8 +133,8 @@ module.exports = async function({ teams, args, token }) {
   }
 
   stopSpinner = wait('Saving')
-  await updateCurrentTeam({ cfg, newTeam })
-  stopSpinner()
+  await updateCurrentTeam(config, newTeam)
 
+  stopSpinner()
   success(`The team ${chalk.bold(newTeam.name)} is now active!`)
 }