warengroup/wx
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Login Type to Auth Method

Browse Source
This commit is contained in:
Christer Warén
2025-12-03 13:30:21 +02:00
parent 7898e55f30
commit d91a7c21c0
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands/auth/login.sh
View File

@@ -6,25 +6,25 @@ wx-login(){
wxi-header "$ORG_HEADER" h3 wxi-header "$ORG_HEADER" h3
if [[ ! -z ${args['login-type']} ]] if [[ ! -z ${args['auth-method']} ]]
then then
LOGIN_TYPE=${args['login-type']} AUTH_METHOD=${args['auth-method']}
elif [[ ! -z ${args['token']} ]] elif [[ ! -z ${args['token']} ]]
then 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) != '' ]] 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 then
LOGIN_TYPE=token AUTH_METHOD=token
elif [[ ! -z ${args['username']} ]] elif [[ ! -z ${args['username']} ]]
then then
LOGIN_TYPE=ldap AUTH_METHOD=ldap
else else
LOGIN_TYPE=ldap AUTH_METHOD=ldap
fi fi
if [[ ! -z $LOGIN_TYPE ]] if [[ ! -z $AUTH_METHOD ]]
then then
case $LOGIN_TYPE in case $AUTH_METHOD in
ldap) ldap)
echo -n "Username: " echo -n "Username: "
if [[ ! -z ${args['username']} ]] if [[ ! -z ${args['username']} ]]

16
wx
View File

@@ -390,25 +390,25 @@ wx-login(){
wxi-header "$ORG_HEADER" h3 wxi-header "$ORG_HEADER" h3
if [[ ! -z ${args['login-type']} ]] if [[ ! -z ${args['auth-method']} ]]
then then
LOGIN_TYPE=${args['login-type']} AUTH_METHOD=${args['auth-method']}
elif [[ ! -z ${args['token']} ]] elif [[ ! -z ${args['token']} ]]
then 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) != '' ]] 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 then
LOGIN_TYPE=token AUTH_METHOD=token
elif [[ ! -z ${args['username']} ]] elif [[ ! -z ${args['username']} ]]
then then
LOGIN_TYPE=ldap AUTH_METHOD=ldap
else else
LOGIN_TYPE=ldap AUTH_METHOD=ldap
fi fi
if [[ ! -z $LOGIN_TYPE ]] if [[ ! -z $AUTH_METHOD ]]
then then
case $LOGIN_TYPE in case $AUTH_METHOD in
ldap) ldap)
echo -n "Username: " echo -n "Username: "
if [[ ! -z ${args['username']} ]] if [[ ! -z ${args['username']} ]]