From d3277f8632f18da94d91bda06164f71c77f3ea39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christer=20War=C3=A9n?= <cwchristerw@gmail.com>
Date: Thu, 22 Jan 2026 20:25:22 +0200
Subject: [PATCH] Sync Login function from WX

---
 init.sh                | 21 +++++++++++++++------
 src/functions/login.sh | 21 +++++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/init.sh b/init.sh
index a6c39fb..0baeec4 100755
--- a/init.sh
+++ b/init.sh
@@ -103,7 +103,7 @@ wx-login(){
   elif [[ ! -z ${args['token']} ]]
   then
     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
     AUTH_METHOD=token
   elif [[ ! -z ${args['username']} ]]
@@ -152,11 +152,12 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
+          wxi-footer
           wxi-stop
         fi
 
         TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
         ;;
       token)
         echo -n "Token: "
@@ -166,9 +167,9 @@ wx-login(){
           then
             TOKEN=${args['token']}
           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
-          TOKEN=$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)
+          TOKEN=$(wxi-config login read)
         else
           read -s TOKEN
         fi
@@ -196,11 +197,19 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           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
 
         TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
         ;;
       *)
         wxi-content status "Login Type" "Unsupported"
diff --git a/src/functions/login.sh b/src/functions/login.sh
index 9184da3..91bfea6 100644
--- a/src/functions/login.sh
+++ b/src/functions/login.sh
@@ -12,7 +12,7 @@ wx-login(){
   elif [[ ! -z ${args['token']} ]]
   then
     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
     AUTH_METHOD=token
   elif [[ ! -z ${args['username']} ]]
@@ -61,11 +61,12 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
+          wxi-footer
           wxi-stop
         fi
 
         TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
         ;;
       token)
         echo -n "Token: "
@@ -75,9 +76,9 @@ wx-login(){
           then
             TOKEN=${args['token']}
           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
-          TOKEN=$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)
+          TOKEN=$(wxi-config login read)
         else
           read -s TOKEN
         fi
@@ -105,11 +106,19 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           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
 
         TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
         ;;
       *)
         wxi-content status "Login Type" "Unsupported"