epic password change

changepassword.sh

@@ -1,40 +1,86 @@
-
-
 read -s -p 'Enter Current Password: ' OLD_PASSWORD
 echo ""
+echo ""
+
+while true; do
 read -s -p 'Enter New Password: ' NEW_PASSWORD
 echo ""
 read -s -p 'Repeat New Password: ' REPEAT_NEWPASSWORD
+echo ""
 if [ "$NEW_PASSWORD" = "$REPEAT_NEWPASSWORD" ]
 then
+	sleep 0.2
+	echo ""
+	break
+else
+	echo "${red}Password do not match${reset}"
+	echo "Try again"
+	echo ""
+fi
+done
+
+while true; do
 echo "Select OTP Method:"
 echo "1 - Mobile"
 echo "2 - Email"
 echo ""
-				echo "Please input: "
+read -p "Please input: " OTPCHANNEL
-				read -r OTPCHANNEL
+
-				if [ "$OTPCHANNEL" = "1" ]
+if [ "$OTPCHANNEL" = "1" ] || [ "$OTPCHANNEL" = "mobile" ]
 	then
 		OTPCHANNEL=mobile
-				elif [ "$OTPCHANNEL" = "2" ]
+	break
+elif [ "$OTPCHANNEL" = "2" ] || [ "$OTPCHANNEL" = "email" ]
 	then
 		OTPCHANNEL=email
+	break
 else
 	echo "${red}Invalid Input${reset}"
+	echo ""
 fi
+done
 
-
+OLDPASSCHECHECK=$(curl -s -b $COOKIE $BML_URL/user/changepassword \
-		curl -s -b $COOKIE $BML_URL/user/changepassword' \
 			--data-raw currentPassword=$OLD_PASSWORD \
 			--data-raw newPassword=$NEW_PASSWORD \
 			--data-raw newPasswordConfirmation=$REPEAT_NEWPASSWORD \
 			--data-raw channel=$OTPCHANNEL \
-		--compressed
+			--compressed \
+			| jq -r .success)
 
-		curl -s -b $COOKIE $BML_URL/user/changepassword' \
+if [ "$OLDPASSCHECHECK" != "true" ]
+	then
+		source changepassword.sh
+else
+	:
+fi
+
+
+if [ "$OTPCHANNEL" = "mobile" ]
+	then
+	ECHOOTPCHANNEL=$PHONE
+elif [ "$OTPCHANNEL" = "email" ]
+	then
+	ECHOOTPCHANNEL=$EMAIL
+fi
+
+echo ""
+echo "${lightgreen}OTP sent to ${yellow}${ECHOOTPCHANNEL}${reset}"
+read -p 'Enter OTP: ' OTP
+echo ""
+PASSCHANGED=$(curl -s -b $COOKIE $BML_URL/user/changepassword \
 		--data-raw currentPassword=$OLD_PASSWORD \
 		--data-raw newPassword=$NEW_PASSWORD \
 		--data-raw newPasswordConfirmation=$REPEAT_NEWPASSWORD \
-		--data-raw channel=$OTPCHANNEL
+		--data-raw channel=$OTPCHANNEL \
 		--data-raw otp=$OTP \
-		--compressed
+		--compressed \
+		| jq -r .success)
+
+if [ "$PASSCHANGED" != "true" ]
+	then
+		echo "${red}Failed to change password${reset}"
+else
+	echo "${lightgreen}Password changed succesfully ${reset}"
+	source settings-menu.sh
+fi

mainmenu.sh

@@ -39,9 +39,6 @@ elif [ "$MENU" = "5" ]
 	source services.sh
 elif [ "$MENU" = "6" ]
 	then
-        echo "WIP"
-#	sleep 2
-#	source mainmenu.sh
 	source settings-menu.sh
 elif [ "$MENU" = "clear" ]
 	then