From da22fd4115650478e8c0ef7fbdabba05e1b1a238 Mon Sep 17 00:00:00 2001
From: nicedevil007 <17103076+nicedevil007@users.noreply.github.com>
Date: Sun, 9 Apr 2023 21:49:22 +0200
Subject: [PATCH] removed Admintoken on INSTALL

also fixed the missing "," after the ADMINTOKEN line

added a check if argon2 is installed or not during update
---
 ct/alpine-vaultwarden.sh              |  7 +++++--
 install/alpine-vaultwarden-install.sh | 15 +--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/ct/alpine-vaultwarden.sh b/ct/alpine-vaultwarden.sh
index 07430e5a..1ccb87b2 100644
--- a/ct/alpine-vaultwarden.sh
+++ b/ct/alpine-vaultwarden.sh
@@ -55,6 +55,9 @@ function update_script() {
   if ! apk -e info newt >/dev/null 2>&1; then
     apk add -q newt
   fi
+  if ! apk -e info argon2 >/dev/null 2>&1; then
+    apk add -q argon2
+  fi
   while true; do
     CHOICE=$(
       whiptail --title "SUPPORT" --menu "Select option" 11 58 2 \
@@ -74,11 +77,11 @@ function update_script() {
       ;;
     2)
       if NEWTOKEN=$(whiptail --passwordbox "Setup your ADMIN_TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3); then
-        if [[ -z "$NEWTOKEN" ]]; then exit-script; fi      
+        if [[ -z "$NEWTOKEN" ]]; then exit-script; fi
         ADMINTOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -e -id -k 19456 -t 2 -p 1)
         if [[ -f /var/lib/vaultwarden/config.json ]]; then 
           sed -i '/admin_token/d' /var/lib/vaultwarden/config.json
-          sed -i "2i\\  \"admin_token\": \"$ADMINTOKEN\"" /var/lib/vaultwarden/config.json
+          sed -i "2i\\  \"admin_token\": \"$ADMINTOKEN\"," /var/lib/vaultwarden/config.json
         fi
       fi
       cat <<EOF >/etc/conf.d/vaultwarden
diff --git a/install/alpine-vaultwarden-install.sh b/install/alpine-vaultwarden-install.sh
index 31aef24e..e7fc39d7 100644
--- a/install/alpine-vaultwarden-install.sh
+++ b/install/alpine-vaultwarden-install.sh
@@ -25,23 +25,10 @@ msg_ok "Installed Dependencies"
 
 msg_info "Installing Alpine-Vaultwarden"
 $STD apk add vaultwarden
-ADMINTOKEN=''
-if NEWTOKEN=$(whiptail --passwordbox "Setup your ADMIN_TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3); then
-  if [[ ! -z "$NEWTOKEN" ]]; then
-    ADMINTOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -e -id -k 19456 -t 2 -p 1)
-  else
-    clear
-    echo -e "⚠  User didn't setup ADMIN_TOKEN, admin panel is disabled! \n"
-  fi
-else
-  clear
-  echo -e "⚠  User didn't setup ADMIN_TOKEN, admin panel is disabled! \n"
-fi
-cat <<EOF >/etc/conf.d/vaultwarden
 export DATA_FOLDER=/var/lib/vaultwarden
 export WEB_VAULT_FOLDER=/var/lib/vaultwarden/web-vault
 export WEB_VAULT_ENABLED=true
-export ADMIN_TOKEN='$ADMINTOKEN'
+export ADMIN_TOKEN=''
 export ROCKET_ADDRESS=0.0.0.0
 EOF
 $STD rc-service vaultwarden start