From a8a9b527ead6fc18d5a20661f128d8800d28f7b4 Mon Sep 17 00:00:00 2001
From: Bob Wall <bob.wall@ironcorelabs.com>
Date: Thu, 3 Sep 2020 09:17:44 -0600
Subject: [PATCH] Upgrade to ironoxide 0.23.1 for rustc error (#24)

* Upgrade to ironoxide 0.23.1 for rustc error

* cargo fmt
---
 Cargo.lock  | 12 ++++++------
 Cargo.toml  |  4 ++--
 src/main.rs |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c2fc60b..83a5439 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -597,9 +597,9 @@ dependencies = [
 
 [[package]]
 name = "ironoxide"
-version = "0.23.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e3c02814c7402333edfbd029f9c193d6c685f05924fc4015205107bae30c04d"
+checksum = "f5c50d1fa6531fa2a83b6927074d1390505b7a3cd3eef44126dceef03bd350b2"
 dependencies = [
  "async-trait",
  "base64 0.12.2",
@@ -670,9 +670,9 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "7.1.2"
+version = "7.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f325ae57ddcf609f02d891486ce740f5bbd0cc3e93f9bffaacdf6594b21404"
+checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32"
 dependencies = [
  "base64 0.12.2",
  "pem",
@@ -1524,9 +1524,9 @@ dependencies = [
 
 [[package]]
 name = "vec1"
-version = "1.4.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ad2a3844cc028661fe02ab1fa64c117ce726ed268d0b93a56d8c2d5a96f961"
+checksum = "f2fffd117bafd8d50c625cce64efde70f416ce6d38f78104035a0913cf15fe97"
 
 [[package]]
 name = "vec_map"
diff --git a/Cargo.toml b/Cargo.toml
index 4f7072b..a837532 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 ironoxide = { version = "~0.23", features = ["tls-rustls"], default-features = false }
-jsonwebtoken = "~7.1"
+jsonwebtoken = "~7.2"
 serde = { version = "~1.0", features = ["derive"] }
 serde_json = "~1.0"
 structopt = "~0.3"
@@ -14,4 +14,4 @@ tokio = { version = "~0.2.11", features = ["macros"] }
 futures = "~0.3"
 
 [profile.dev.package."*"]
-opt-level = 3
\ No newline at end of file
+opt-level = 3
diff --git a/src/main.rs b/src/main.rs
index f9dda54..9b99f33 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -449,9 +449,9 @@ struct Password(String);
 #[derive(Deserialize)]
 struct SegmentId(String);
 #[derive(Deserialize)]
-struct ProjectId(usize);
+struct ProjectId(u32);
 #[derive(Deserialize)]
-struct IdentityAssertionKeyId(usize);
+struct IdentityAssertionKeyId(u32);
 
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -591,6 +591,7 @@ fn gen_jwt(user: &UserCreate) -> Result<Jwt> {
         kid: user.iak.0,
         iat: iat_seconds,
         exp: iat_seconds + 120,
+        uid: None,
     };
     let header = Header::new(Algorithm::ES256);
     let pem = std::fs::read_to_string(user.pem_file)?;