Issue hashicorp#75 (hashicorp#82)

* Removed DOB
tuannvm · Nov 29, 2018 · f90afe4 · f90afe4
1 parent 59f19dd
commit f90afe4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/encryption/vault-transit-rewrap/DBHelper.cs b/encryption/vault-transit-rewrap/DBHelper.cs
@@ -25,7 +25,6 @@ public static async Task CreateTablesAsync()
                         "`state` VARCHAR(256) NOT NULL," +
                         "`postcode` VARCHAR(256) NOT NULL," +
                         "`email` VARCHAR(256) NOT NULL," +
-                        "`dob` VARCHAR(256) NULL," +
                         "PRIMARY KEY (user_id) " +
                         ") engine=InnoDB;";
                     cmd.CommandText = command;
@@ -47,7 +46,6 @@ public static async Task CreateDBAsync()
                     string command = "CREATE DATABASE IF NOT EXISTS my_app";
                     cmd.CommandText = command;
 
-
                     await cmd.ExecuteNonQueryAsync();
                     Console.WriteLine("Created (if not exist) my_app DB");
                 }
@@ -64,15 +62,14 @@ public static async Task InsertRecordAsyc(Record r)
 
                     string command = "INSERT INTO `user_data` " + 
                     "(`user_name`, `first_name`, `last_name`, `address`, " +
-                    "`city`, `state`, `postcode`, `email`, `dob`) " +
+                    "`city`, `state`, `postcode`, `email`) " +
                     $"VALUES (\"{r.Login.Username}\", \"{r.Name.First}\", \"{r.Name.Last}\", " +
                     $"\"{r.Location.Street}\", \"{r.Location.City}\", \"{r.Location.State}\", " +
-                    $"\"{r.Location.Postcode}\", \"{r.Email}\", \"{r.DOB}\");";
+                    $"\"{r.Location.Postcode}\", \"{r.Email}\");";
 
                     cmd.CommandText = command;
 
                     var rowsAffected = await cmd.ExecuteNonQueryAsync();
-                    //Console.WriteLine($"Created {rowsAffected} rows");
                 }
             }
         }
@@ -85,14 +82,13 @@ public static async Task UpdateRecordAsyc(Record r)
                 await db.Connection.OpenAsync();
                 using (var cmd = db.Connection.CreateCommand())
                 {
-
                     string command = "UPDATE `user_data` " + 
                     $"SET `address` = \"{r.Location.Street}\", " +
-                    $"`dob` = \"{r.DOB}\", " +
                     $"`email` = \"{r.Email}\" " +
                     $"WHERE `user_id` = {r.Id.Value}";
 
                     cmd.CommandText = command;
+                    Console.WriteLine("Command: " + command);
 
                     await cmd.ExecuteNonQueryAsync();
                 }
@@ -110,13 +106,11 @@ public static async Task<List<Record>> FindRecordsToRewrap(int keyVersion)
                 using (var cmd = db.Connection.CreateCommand())
                 {
                     int count = 0;
-                    string command = "SELECT `user_id`, `email`,`dob`, `address` " +
+                    string command = "SELECT `user_id`, `email`, `address` " +
                     "FROM `user_data` " + 
-                    $"WHERE `dob` NOT LIKE \"vault:v{keyVersion}:%\" " +
-                    $"OR `email` NOT LIKE \"vault:v{keyVersion}:%\" " + 
+                    $"WHERE `email` NOT LIKE \"vault:v{keyVersion}:%\" " + 
                     $"OR `address` NOT LIKE \"vault:v{keyVersion}:%\" ";
-
-
+
                     cmd.CommandText = command;
 
                     var reader = await cmd.ExecuteReaderAsync();
@@ -126,8 +120,7 @@ public static async Task<List<Record>> FindRecordsToRewrap(int keyVersion)
                         count++;
                         var user_id = reader.GetInt32(0);
                         var email = reader.GetString(1);
-                        var dob = reader.GetString(2);
-                        var address = reader.GetString(3);
+                        var address = reader.GetString(2);
 
                         RewrapExample.Location addr = new Location();
                         addr.Street = address;
@@ -137,7 +130,6 @@ public static async Task<List<Record>> FindRecordsToRewrap(int keyVersion)
                         Record r = new Record
                         {
                             Id = id,
-                            DOB = dob,
                             Email = email,
                             Location = addr,
                         };

diff --git a/encryption/vault-transit-rewrap/Program.cs b/encryption/vault-transit-rewrap/Program.cs
@@ -55,7 +55,6 @@ static async Task SeedDB(string numRecords)
             var tasks = new List<Task>();
             foreach (var record in apiResults.Records) {
                 ICollection<Task> encryptValues = new List<Task>();
-                record.DOB = await client.EncryptValue(record.DOB);
                 record.Location.Street = await client.EncryptValue(record.Location.Street);
                 record.Email = await client.EncryptValue(record.Email);
                 tasks.Add(DBHelper.InsertRecordAsyc(record));

diff --git a/encryption/vault-transit-rewrap/Record.cs b/encryption/vault-transit-rewrap/Record.cs
@@ -45,8 +45,6 @@ public class Record
         public Location Location { get; set; }
         public string Email { get; set; }
         public Login Login { get; set; }
-        public string DOB { get; set; }
-        public string Registered { get; set; }
         public string Phone { get; set; }
         public string Cell { get; set; }
         public Id Id { get; set; }

diff --git a/encryption/vault-transit-rewrap/VaultClient.cs b/encryption/vault-transit-rewrap/VaultClient.cs
@@ -67,7 +67,6 @@ public async Task ReWrapRecords(ICollection<Record> users)
             {
                 count++;
                 user.Location.Street = await ReWrapValue(user.Location.Street);
-                user.DOB = await ReWrapValue(user.DOB);
                 user.Email = await ReWrapValue(user.Email);
 
                 tasks.Add(DBHelper.UpdateRecordAsyc(user));