From 5d44df595bbe5fca31107eae3b7c20a4c2b38b3e Mon Sep 17 00:00:00 2001
From: Shihaam Abdul Rahman <github@shihaam.me>
Date: Wed, 28 Apr 2021 06:45:24 +0500
Subject: [PATCH] 'fix $ in password'

---
 savepass.sh |  8 ++++----
 welcome.sh  | 22 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/savepass.sh b/savepass.sh
index 15e1d09..c376487 100644
--- a/savepass.sh
+++ b/savepass.sh
@@ -7,13 +7,13 @@ then
 		read -p 'Do you want to save login? [y/N] ' SAVE_LOGIN
 		if [ "$SAVE_LOGIN" = "Y" ]
 		then
-			echo BML_USERNAME=''${BML_USERNAME}'' > $CREDENTIALS
-			echo BML_PASSWORD=''${BML_PASSWORD}'' >> $CREDENTIALS
+			echo "BML_USERNAME='${BML_USERNAME}'" > $CREDENTIALS
+			echo "BML_PASSWORD='${BML_PASSWORD}'" >> $CREDENTIALS
 
 		elif [ "$SAVE_LOGIN" = "y" ]
 		then
-			echo BML_USERNAME=''${BML_USERNAME}'' > $CREDENTIALS
-			echo BML_PASSWORD=''${BML_PASSWORD}'' >> $CREDENTIALS
+			echo "BML_USERNAME='${BML_USERNAME}'" > $CREDENTIALS
+			echo "BML_PASSWORD='${BML_PASSWORD}'" >> $CREDENTIALS
 		else
 			:
 		fi
diff --git a/welcome.sh b/welcome.sh
index e18bfc7..47c0cf2 100644
--- a/welcome.sh
+++ b/welcome.sh
@@ -1,11 +1,25 @@
 #Requesting for User profile after login and regex to grap the Full name
-NAME=$(curl -s -b $COOKIE $BML_URL/profile \
-                | awk -F 'fullname":"' '{print $2}' \
-                | cut -f1 -d '"')
+curl -s -b $COOKIE $BML_URL/profile > /dev/null
+
+NAME=$(curl -s -b $COOKIE $BML_URL/userinfo \
+	| jq -r '.["payload"] | .["user"] | .fullname')
+PHONE=$(curl -s -b $COOKIE $BML_URL/userinfo \
+	| jq -r '.["payload"] | .["user"] | .mobile_phone')
+EMAIL=$(curl -s -b $COOKIE $BML_URL/userinfo \
+	| jq -r '.["payload"] | .["user"] | .email')
+DOB=$(curl -s -b $COOKIE $BML_URL/userinfo \
+        | jq -r '.["payload"] | .["user"] | .birthdate')
+#	| cut -f1 -d 'T' )
+IDCARD=$(curl -s -b $COOKIE $BML_URL/userinfo \
+        | jq -r '.["payload"] | .["user"] | .idcard')
 
 #display a Welcome message with fullname
 echo ""
 echo ${green}Welcome ${reset}$NAME
-#curl -s -b $COOKIE $BML_URL/userinfo
+echo ""
+echo Phone: $PHONE
+echo Email: $EMAIL
+echo Birthday: $DOB
+echo ID Card: $IDCARD
 echo ""
 source mainmenu.sh