Prevent access env directly when login

Author: Yukaii

README.md

@@ -175,7 +175,7 @@ EXAMPLE
   Login as HMD successfully!
 ```
 
-Alternatively, you may supply an email and password via the `CMD_EMAIL` and `CMD_PASSWORD` environment variables, respectively.
+Alternatively, you may supply an email and password via the `CMD_CLI_ID` and `CMD_CLI_PASSWORD` environment variables, respectively.
 
 _See code: [src/commands/login.ts](https://github.com/hackmdio/codimd-cli/blob/v1.0.3/src/commands/login.ts)_
 

src/commands/login.ts

@@ -2,6 +2,7 @@ import {Command, flags} from '@oclif/command'
 import * as inquirer from 'inquirer'
 
 import {APIClient} from '../api'
+import config from '../config'
 
 export default class Login extends Command {
   static description = 'Login HackMD instance from CLI'
@@ -25,8 +26,8 @@ Login as HMD successfully!
   async run() {
     const {flags} = this.parse(Login)
 
-    let id = flags.id || process.env.CMD_CLI_ID
-    let password = process.env.CMD_CLI_PASSWORD || ''
+    let id = flags.id || config.loginID
+    let password = config.loginPassword || ''
 
     if (!id) {
       if (flags.ldap) {

src/config.ts

@@ -33,7 +33,9 @@ const envConfig = {
     ? true
     : (process.env.CMD_CLI_COOKIE_PATH || process.env.CMD_CLI_SERVER_URL)
       ? false
-      : toBooleanConfig(process.env.HMD_CLI_ENTERPRISE)
+      : toBooleanConfig(process.env.HMD_CLI_ENTERPRISE),
+  loginID: process.env.HMD_CLI_ID || process.env.CMD_CLI_ID,
+  loginPassword: process.env.HMD_CLI_PASSWORD || process.env.CMD_CLI_PASSWORD
 }
 
 // look for a readable config file; we can merge it with the env.