diff --git a/src/commands/auth/login.sh b/src/commands/auth/login.sh index aeef7ea..9184da3 100644 --- a/src/commands/auth/login.sh +++ b/src/commands/auth/login.sh @@ -6,25 +6,25 @@ wx-login(){ wxi-header "$ORG_HEADER" h3 - if [[ ! -z ${args['login-type']} ]] + if [[ ! -z ${args['auth-method']} ]] then - LOGIN_TYPE=${args['login-type']} + AUTH_METHOD=${args['auth-method']} elif [[ ! -z ${args['token']} ]] then - LOGIN_TYPE=token + AUTH_METHOD=token elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]] then - LOGIN_TYPE=token + AUTH_METHOD=token elif [[ ! -z ${args['username']} ]] then - LOGIN_TYPE=ldap + AUTH_METHOD=ldap else - LOGIN_TYPE=ldap + AUTH_METHOD=ldap fi - if [[ ! -z $LOGIN_TYPE ]] + if [[ ! -z $AUTH_METHOD ]] then - case $LOGIN_TYPE in + case $AUTH_METHOD in ldap) echo -n "Username: " if [[ ! -z ${args['username']} ]] diff --git a/wx b/wx index 7a9a445..0751b27 100755 --- a/wx +++ b/wx @@ -390,25 +390,25 @@ wx-login(){ wxi-header "$ORG_HEADER" h3 - if [[ ! -z ${args['login-type']} ]] + if [[ ! -z ${args['auth-method']} ]] then - LOGIN_TYPE=${args['login-type']} + AUTH_METHOD=${args['auth-method']} elif [[ ! -z ${args['token']} ]] then - LOGIN_TYPE=token + AUTH_METHOD=token elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]] then - LOGIN_TYPE=token + AUTH_METHOD=token elif [[ ! -z ${args['username']} ]] then - LOGIN_TYPE=ldap + AUTH_METHOD=ldap else - LOGIN_TYPE=ldap + AUTH_METHOD=ldap fi - if [[ ! -z $LOGIN_TYPE ]] + if [[ ! -z $AUTH_METHOD ]] then - case $LOGIN_TYPE in + case $AUTH_METHOD in ldap) echo -n "Username: " if [[ ! -z ${args['username']} ]]