From 0cdc32a743f15317c6f9665002f99646553cf496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christer=20War=C3=A9n?= <cwchristerw@gmail.com>
Date: Sun, 22 Jun 2025 00:45:15 +0300
Subject: [PATCH] Code Update

---
 init.sh                | 19 ++++++++++++++-----
 src/functions/login.sh | 19 ++++++++++++++-----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/init.sh b/init.sh
index 84a12aa..d504527 100755
--- a/init.sh
+++ b/init.sh
@@ -125,6 +125,8 @@ wx-login(){
     if [[ ! -z $1 ]]
     then
         ORG=$1
+        jq '.org = "'$ORG'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+        mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
     elif [[ $(hostname -d) = *"devices.waren.io" ]]
     then
         ORG=warengroup
@@ -134,6 +136,9 @@ wx-login(){
     elif [[ $(hostname -d) = *"devices.christerwaren.fi" ]]
     then
         ORG=cwchristerw
+    elif [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .org) ]]
+    then
+        ORG=$(cat $HOME/.warengroup/config.json | jq -r .org)
     else
         wx-header "Login"
         echo "Status: Organization Required"
@@ -185,7 +190,8 @@ wx-login(){
 
         if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]]
         then
-            TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG)"
+            USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)"
+            TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)"
         fi
 
         VAULT_LOGIN=$(curl https://$VAULT_DOMAIN/v1/auth/token/renew -X POST --header "X-Vault-Token: $TOKEN" -d '{ "token": "'$TOKEN'" }' -s | jq -r '.auth.client_token')
@@ -194,7 +200,7 @@ wx-login(){
             config["login",${ORG}]=$VAULT_LOGIN
             if [[ $USER != "root" && $USER != "local" ]]
             then
-                jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+                jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
                 mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
             fi
         else
@@ -204,7 +210,7 @@ wx-login(){
                 wx-header "Login"
                 echo $wxBold$ORG$wxNormal
 
-                if [[ -z $USERNAME || $USERNAME == "root" || $USERNAME == "local" ]]
+                if [[ -z $USERNAME || $USERNAME == "root" || $USERNAME == "local" || $USERNAME == "nobody" ]]
                 then
                     echo -n "Username: "
                     read USERNAME
@@ -212,6 +218,9 @@ wx-login(){
                     echo "Username: $USERNAME"
                 fi
 
+                jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+                mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
+
                 echo -n "Password: "
                 read -s PASSWORD
                 echo "****************"
@@ -232,7 +241,7 @@ wx-login(){
 
                     if [[ $USER != "root" && $USER != "local" ]]
                     then
-                        jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+                        jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
                         mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
                     fi
                 fi
@@ -261,7 +270,7 @@ wx-login(){
 
                 if [[ $USER != "root" && $USER != "local" ]]
                 then
-                    jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+                    jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
                     mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
                 fi
             fi
diff --git a/src/functions/login.sh b/src/functions/login.sh
index b631469..bdffb36 100644
--- a/src/functions/login.sh
+++ b/src/functions/login.sh
@@ -2,6 +2,8 @@ wx-login(){
     if [[ ! -z $1 ]]
     then
         ORG=$1
+        jq '.org = "'$ORG'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+        mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
     elif [[ $(hostname -d) = *"devices.waren.io" ]]
     then
         ORG=warengroup
@@ -11,6 +13,9 @@ wx-login(){
     elif [[ $(hostname -d) = *"devices.christerwaren.fi" ]]
     then
         ORG=cwchristerw
+    elif [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .org) ]]
+    then
+        ORG=$(cat $HOME/.warengroup/config.json | jq -r .org)
     else
         wx-header "Login"
         echo "Status: Organization Required"
@@ -62,7 +67,8 @@ wx-login(){
 
         if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]]
         then
-            TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG)"
+            USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)"
+            TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)"
         fi
 
         VAULT_LOGIN=$(curl https://$VAULT_DOMAIN/v1/auth/token/renew -X POST --header "X-Vault-Token: $TOKEN" -d '{ "token": "'$TOKEN'" }' -s | jq -r '.auth.client_token')
@@ -71,7 +77,7 @@ wx-login(){
             config["login",${ORG}]=$VAULT_LOGIN
             if [[ $USER != "root" && $USER != "local" ]]
             then
-                jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+                jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
                 mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
             fi
         else
@@ -81,7 +87,7 @@ wx-login(){
                 wx-header "Login"
                 echo $wxBold$ORG$wxNormal
 
-                if [[ -z $USERNAME || $USERNAME == "root" || $USERNAME == "local" ]]
+                if [[ -z $USERNAME || $USERNAME == "root" || $USERNAME == "local" || $USERNAME == "nobody" ]]
                 then
                     echo -n "Username: "
                     read USERNAME
@@ -89,6 +95,9 @@ wx-login(){
                     echo "Username: $USERNAME"
                 fi
 
+                jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+                mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
+
                 echo -n "Password: "
                 read -s PASSWORD
                 echo "****************"
@@ -109,7 +118,7 @@ wx-login(){
 
                     if [[ $USER != "root" && $USER != "local" ]]
                     then
-                        jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+                        jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
                         mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
                     fi
                 fi
@@ -138,7 +147,7 @@ wx-login(){
 
                 if [[ $USER != "root" && $USER != "local" ]]
                 then
-                    jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+                    jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
                     mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
                 fi
             fi