From af47a66598d7ebb7a9cd455adb6be3a29e065805 Mon Sep 17 00:00:00 2001 From: Simon Bihel Date: Mon, 17 Apr 2023 12:28:25 +0100 Subject: [PATCH] Update openidconnect-rs --- Cargo.lock | 97 ++++++++++++++++++++++++++++++++++++++++++++++-------- Cargo.toml | 14 +------- 2 files changed, 84 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 48f9f4a..bd981ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -600,6 +600,41 @@ dependencies = [ "syn", ] +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn", +] + [[package]] name = "der" version = "0.6.1" @@ -1310,6 +1345,12 @@ dependencies = [ "cxx-build", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.3.0" @@ -1599,17 +1640,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-bigint-dig" version = "0.8.2" @@ -1727,8 +1757,9 @@ dependencies = [ [[package]] name = "openidconnect" -version = "2.4.1" -source = "git+https://github.com/sbihel/openidconnect-rs?branch=replace-ring#a1c38841e3dfb571d4fe5daece8005d2c3b73a8e" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91f944611b8e7e8e4bb7e3c95a98f2b8d1aba56cfa6af00f31d9b0f7829d8431" dependencies = [ "base64 0.13.1", "chrono", @@ -1737,7 +1768,6 @@ dependencies = [ "http", "itertools", "log", - "num-bigint", "oauth2", "p256", "p384", @@ -1748,6 +1778,8 @@ dependencies = [ "serde_derive", "serde_json", "serde_path_to_error", + "serde_plain", + "serde_with", "sha2 0.10.6", "subtle", "thiserror", @@ -2541,6 +2573,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_plain" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6018081315db179d0ce57b1fe4b62a12a0028c9cf9bbef868c9cf477b3c34ae" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -2553,6 +2594,28 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sha-1" version = "0.10.1" @@ -2750,6 +2813,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "strum" version = "0.24.1" diff --git a/Cargo.toml b/Cargo.toml index dd90938..468be67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,7 @@ anyhow = "1.0.53" headers = "0.3.6" hex = "0.4.3" iri-string = { version = "0.6", features = ["serde"] } -# openidconnect = "2.1.2" -openidconnect = { git = "https://github.com/sbihel/openidconnect-rs", branch = "replace-ring", default-features = false, features = ["reqwest", "rustls-tls"] } +openidconnect = "3.0.0" rand = "0.8.4" rsa = { version = "0.7.0" } serde = { version = "1.0", features = ["derive"] } @@ -37,7 +36,6 @@ lazy_static = "1.4" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] axum = { version = "0.4.3", features = ["headers"] } -# axum-debug = "0.3.2" chrono = "0.4.19" figment = { version = "0.10.6", features = ["toml", "env"] } tokio = { version = "1.14.0", features = ["full"] } @@ -47,12 +45,9 @@ bb8-redis = "0.10.1" uuid = { version = "0.8", features = ["serde", "v4"] } [target.'cfg(target_arch = "wasm32")'.dependencies] -# cached = { version = "0.26", default-features = false } chrono = { version = "0.4.19", features = ["wasmbind"] } console_error_panic_hook = { version = "0.1" } -# console_log = "0.2" getrandom = { version = "0.2", features = ["js"] } -# log = "0.4" matchit = "0.4.2" uuid = { version = "0.8", features = ["serde", "v4", "wasm-bindgen"] } wee_alloc = { version = "0.4" } @@ -69,12 +64,5 @@ test-log = "0.2.11" tokio = { version = "1.14.0", features = ["macros", "rt"] } ethers-signers = "1.0.2" -# [target.'cfg(target_arch = "wasm32")'.profile.release] -# opt-level = "z" - -# [target.'cfg(target_arch = "wasm32")'.profile.debug] -# opt-level = "z" -# lto = false - [package.metadata.wasm-pack.profile.profiling] wasm-opt = ['-g', '-O']