From 8fa3551d47890403f4ea451139d62c104b2b9351 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Tue, 8 Jun 2021 10:48:38 +0000
Subject: [PATCH] Remove cred as arguments. #576

---
 .env.dist                                   |  4 ++++
 utils/load_warranty_serial/load_serials.php | 15 ++++++++++++---
 utils/warranty_motiv_local.sh               |  2 +-
 utils/warranty_motiv_local_bulk.sh          |  2 +-
 utils/warranty_motiv_prod.sh                |  2 +-
 utils/warranty_motiv_prod_bulk.sh           |  2 +-
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.env.dist b/.env.dist
index f6d35eec..06731d8f 100644
--- a/.env.dist
+++ b/.env.dist
@@ -80,3 +80,7 @@ API_VERSION=insert_api_version_here
 
 #SSL_ENABLE for websockets
 SSL_ENABLE=set_to_true_or_false
+
+# db
+DB_USER=db_username
+DB_PASSWORD=db_password
diff --git a/utils/load_warranty_serial/load_serials.php b/utils/load_warranty_serial/load_serials.php
index 323f3156..d5369aac 100644
--- a/utils/load_warranty_serial/load_serials.php
+++ b/utils/load_warranty_serial/load_serials.php
@@ -1,11 +1,13 @@
 <?php
 
+require_once(__DIR__ . '/../../vendor/autoload.php');
+
+use Symfony\Component\Dotenv\Dotenv;
+
 // load csv
 $csv = fopen($argv[1], 'r');
 $dsn = $argv[2];
-$user = $argv[3];
-$pass = $argv[4];
-$output_file = $argv[5];
+$output_file = $argv[3];
 
 $output_fh = fopen($output_file, "w");
 
@@ -17,6 +19,13 @@ if (!file_exists($argv[1]))
     exit();
 }
 
+// get username and password
+$dotenv = new Dotenv();
+$dotenv->loadEnv(__DIR__.'/../../.env');
+
+$user = $_ENV['DB_USER'];
+$pass = $_ENV['DB_PASSWORD'];
+
 // connect to db
 $db = new PDO($dsn, $user, $pass);
 
diff --git a/utils/warranty_motiv_local.sh b/utils/warranty_motiv_local.sh
index 403c62c2..ddfcd6f5 100755
--- a/utils/warranty_motiv_local.sh
+++ b/utils/warranty_motiv_local.sh
@@ -6,4 +6,4 @@ load_status_file="/tmp/warranty_load_status_$proc_date.txt"
 echo $download_file
 echo $load_status_file
 /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php $proc_date $download_file 1
-/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php $download_file "mysql:host=localhost;dbname=resq;charset=UTF8" root password $load_status_file
+/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php $download_file "mysql:host=localhost;dbname=resq;charset=UTF8" $load_status_file
diff --git a/utils/warranty_motiv_local_bulk.sh b/utils/warranty_motiv_local_bulk.sh
index 5e1a0ab4..14a5e636 100755
--- a/utils/warranty_motiv_local_bulk.sh
+++ b/utils/warranty_motiv_local_bulk.sh
@@ -37,4 +37,4 @@ touch /tmp/warranty_download_serial.csv
 /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php 06-06-21 /tmp/warranty_download_serial.csv 0
 /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php 06-07-21 /tmp/warranty_download_serial.csv 0
 touch /tmp/warranty_load_status.txt
-/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php /tmp/warranty_download_serial.csv "mysql:host=localhost;dbname=resq;charset=UTF8" root password /tmp/warranty_load_status.txt
+/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php /tmp/warranty_download_serial.csv "mysql:host=localhost;dbname=resq;charset=UTF8" /tmp/warranty_load_status.txt
diff --git a/utils/warranty_motiv_prod.sh b/utils/warranty_motiv_prod.sh
index 12d00761..798158ef 100755
--- a/utils/warranty_motiv_prod.sh
+++ b/utils/warranty_motiv_prod.sh
@@ -5,5 +5,5 @@ load_status_file="/tmp/warranty_load_status_$proc_date.txt"
 #echo $download_file
 #echo $load_status_file
 /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php $proc_date $download_file 1
-/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php $download_file "mysql:host=172.18.203.191:3306;dbname=resq;charset=UTF8" resq Motolite456 $load_status_file
+/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php $download_file "mysql:host=172.18.203.191:3306;dbname=resq;charset=UTF8" $load_status_file
 
diff --git a/utils/warranty_motiv_prod_bulk.sh b/utils/warranty_motiv_prod_bulk.sh
index 231f6bc2..446e68f1 100755
--- a/utils/warranty_motiv_prod_bulk.sh
+++ b/utils/warranty_motiv_prod_bulk.sh
@@ -37,4 +37,4 @@ touch /tmp/warranty_download_serial.csv
 /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php 06-06-21 /tmp/warranty_download_serial.csv 0
 /usr/bin/php /var/www/resq/utils/get_warranty_serial/new_get_serials.php 06-07-21 /tmp/warranty_download_serial.csv 0
 touch /tmp/warranty_load_status.txt
-/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php /tmp/warranty_download_serial.csv "mysql:host=172.18.203.191:3306;dbname=resq;charset=UTF8" resq Motolite456 /tmp/warranty_load_status.txt
+/usr/bin/php /var/www/resq/utils/load_warranty_serial/load_serials.php /tmp/warranty_download_serial.csv "mysql:host=172.18.203.191:3306;dbname=resq;charset=UTF8" /tmp/warranty_load_status.txt