From d5f0f7b52cf6cfb7ec98eac29f22668fb8e1e053 Mon Sep 17 00:00:00 2001
From: Anthony <anthonykewl20@gmail.com>
Date: Tue, 31 Oct 2023 01:09:45 +0800
Subject: [PATCH] Update globals responses

---
 add-sftp.sh  |  8 ++++----
 manifest.jps | 13 +++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/add-sftp.sh b/add-sftp.sh
index d5c3a5e..311158f 100644
--- a/add-sftp.sh
+++ b/add-sftp.sh
@@ -5,8 +5,8 @@ LOG_FILE="/home/jelastic/add-sftp-user-addon/logs/script_output.log"
 echo "Script started" >> $LOG_FILE
 
 # Generate random username and password
-USERNAME="user$(shuf -i 10000-99999 -n 1)"
-PASSWORD=$(openssl rand -base64 12)
+USERNAME=$1
+PASSWORD=$2
 
 # User's home directory
 USER_HOME="/home/$USERNAME"
@@ -47,5 +47,5 @@ echo "$USERNAME added to groups $ROOT_GROUP and root" >> $LOG_FILE
 
 HOSTNAME=$(hostname -f)
 echo "Script completed for user $USERNAME with hostname $HOSTNAME" >> $LOG_FILE
-echo "USERNAME:$USERNAME"
-echo "PASSWORD:$PASSWORD"
+echo "{ \"USERNAME\": \"$USERNAME\", \"PASSWORD\": \"$PASSWORD\" }"
+
diff --git a/manifest.jps b/manifest.jps
index a2f87ac..d8d82c1 100644
--- a/manifest.jps
+++ b/manifest.jps
@@ -20,6 +20,8 @@ settings:
       default: false
 
 globals:
+  username: "user${fn.random(10000,99999)}"
+  password: ${fn.password(min)}
   sftpHost: ${env.domain}
   sftpPort: 22
 
@@ -49,13 +51,10 @@ onInstall:
 actions:
   add_sftp_user:
     - cmd[cp]: 
-        commands: bash /home/jelastic/add-sftp-user-addon/add-sftp.sh
+        commands: bash /home/jelastic/add-sftp-user-addon/add-sftp.sh ${globals.username} ${globals.password}
         user: root
     - if ("${response.exitStatus}" != "0"):
-        return: sftpError
-    - setGlobals:
-        username: ${response.out.USERNAME}
-        password: ${response.out.PASSWORD}    
+        return: sftpError   
     - return: sftpSuccess
 
 responses:
@@ -82,10 +81,8 @@ responses:
 
         Port: ${globals.sftpPort}
 
-
         Login Credentials
-
-        Username:${response.out.USERNAME}
+        Username: ${globals.username}
 
         Password: ${globals.password}