warengroup/init.sh
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync Login function from WX

Browse Source
This commit is contained in:
Christer Warén
2026-01-22 20:25:22 +02:00
parent 40db0d7c04
commit d3277f8632
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
init.sh
View File

@@ -103,7 +103,7 @@ wx-login(){
elif [[ ! -z ${args['token']} ]] elif [[ ! -z ${args['token']} ]]
then then
AUTH_METHOD=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 [[ $(wxi-config login read) ]]
then then
AUTH_METHOD=token AUTH_METHOD=token
elif [[ ! -z ${args['username']} ]] elif [[ ! -z ${args['username']} ]]
@@ -152,11 +152,12 @@ wx-login(){
if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]] if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
then then
wxi-content status "Login" "Failed" wxi-content status "Login" "Failed"
wxi-footer
wxi-stop wxi-stop
fi fi
TOKEN=$VAULT_LOGIN TOKEN=$VAULT_LOGIN
wxi-config login wxi-config login write
;; ;;
token) token)
echo -n "Token: " echo -n "Token: "
@@ -166,9 +167,9 @@ wx-login(){
then then
TOKEN=${args['token']} TOKEN=${args['token']}
fi fi
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 [[ $(wxi-config login read) ]]
then then
TOKEN=$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) TOKEN=$(wxi-config login read)
else else
read -s TOKEN read -s TOKEN
fi fi
@@ -196,11 +197,19 @@ wx-login(){
if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]] if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
then then
wxi-content status "Login" "Failed" wxi-content status "Login" "Failed"
wxi-stop wxi-footer
if [[ $(wxi-config login read) ]]
then
wx-logout &> /dev/null
wx-login
else
wxi-stop
fi
fi fi
TOKEN=$VAULT_LOGIN TOKEN=$VAULT_LOGIN
wxi-config login wxi-config login write
;; ;;
*) *)
wxi-content status "Login Type" "Unsupported" wxi-content status "Login Type" "Unsupported"

21
src/functions/login.sh
View File

@@ -12,7 +12,7 @@ wx-login(){
elif [[ ! -z ${args['token']} ]] elif [[ ! -z ${args['token']} ]]
then then
AUTH_METHOD=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 [[ $(wxi-config login read) ]]
then then
AUTH_METHOD=token AUTH_METHOD=token
elif [[ ! -z ${args['username']} ]] elif [[ ! -z ${args['username']} ]]
@@ -61,11 +61,12 @@ wx-login(){
if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]] if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
then then
wxi-content status "Login" "Failed" wxi-content status "Login" "Failed"
wxi-footer
wxi-stop wxi-stop
fi fi
TOKEN=$VAULT_LOGIN TOKEN=$VAULT_LOGIN
wxi-config login wxi-config login write
;; ;;
token) token)
echo -n "Token: " echo -n "Token: "
@@ -75,9 +76,9 @@ wx-login(){
then then
TOKEN=${args['token']} TOKEN=${args['token']}
fi fi
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 [[ $(wxi-config login read) ]]
then then
TOKEN=$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) TOKEN=$(wxi-config login read)
else else
read -s TOKEN read -s TOKEN
fi fi
@@ -105,11 +106,19 @@ wx-login(){
if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]] if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
then then
wxi-content status "Login" "Failed" wxi-content status "Login" "Failed"
wxi-stop wxi-footer
if [[ $(wxi-config login read) ]]
then
wx-logout &> /dev/null
wx-login
else
wxi-stop
fi
fi fi
TOKEN=$VAULT_LOGIN TOKEN=$VAULT_LOGIN
wxi-config login wxi-config login write
;; ;;
*) *)
wxi-content status "Login Type" "Unsupported" wxi-content status "Login Type" "Unsupported"