Remove getter and lookup by flag > env var > global user config

Author: DavidWells

src/index.js

@@ -22,7 +22,7 @@ class BaseCommand extends Command {
   async init(err) {
     const projectRoot = findRoot(process.cwd())
     // Grab netlify API token
-    const token = this.configToken
+    const token = getConfigToken()
 
     // Get site config from netlify.toml
     const configPath = getConfigPath(projectRoot)
@@ -63,11 +63,6 @@ class BaseCommand extends Command {
     this.netlify.api.accessToken = token
   }
 
-  get configToken() {
-    const userId = globalConfig.get('userId')
-    return globalConfig.get(`users.${userId}.auth.token`)
-  }
-
   async isLoggedIn() {
     try {
       await this.netlify.api.getCurrentUser()
@@ -78,7 +73,7 @@ class BaseCommand extends Command {
   }
 
   async authenticate(authToken) {
-    const token = authToken || process.env.NETLIFY_AUTH_TOKEN || this.configToken
+    const token = getConfigToken(authToken)
     if (!token) {
       return this.expensivelyAuthenticate()
     } else {
@@ -152,4 +147,18 @@ class BaseCommand extends Command {
   }
 }
 
+function getConfigToken(authTokenFromFlag) {
+  // 1. First honor command flag --auth
+  if (authTokenFromFlag) {
+    return authTokenFromFlag
+  }
+  // 2. then Check ENV var
+  if (process.env.NETLIFY_AUTH_TOKEN) {
+    return process.env.NETLIFY_AUTH_TOKEN
+  }
+  // 3. If no env var use global user setting
+  const userId = globalConfig.get('userId')
+  return globalConfig.get(`users.${userId}.auth.token`)
+}
+
 module.exports = BaseCommand