diff --git a/Cargo.lock b/Cargo.lock index 3b2c59fd9..c1c648a81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1161,7 +1161,7 @@ dependencies = [ [[package]] name = "daemon" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "clap", "clap_complete", @@ -2250,7 +2250,7 @@ dependencies = [ [[package]] name = "kanidm-ipa-sync" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "base64urlsafedata", "chrono", @@ -2274,7 +2274,7 @@ dependencies = [ [[package]] name = "kanidm_client" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "kanidm_proto", "reqwest", @@ -2291,7 +2291,7 @@ dependencies = [ [[package]] name = "kanidm_proto" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "base32", "base64urlsafedata", @@ -2310,7 +2310,7 @@ dependencies = [ [[package]] name = "kanidm_tools" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "clap", "clap_complete", @@ -2337,7 +2337,7 @@ dependencies = [ [[package]] name = "kanidm_unix_int" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "bytes", "clap", @@ -2369,7 +2369,7 @@ dependencies = [ [[package]] name = "kanidmd_core" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "async-trait", "chrono", @@ -2402,7 +2402,7 @@ dependencies = [ [[package]] name = "kanidmd_lib" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "async-std", "async-trait", @@ -2471,7 +2471,7 @@ dependencies = [ [[package]] name = "kanidmd_testkit" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "compact_jwt", "futures", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "compact_jwt", "gloo", @@ -2884,7 +2884,7 @@ dependencies = [ [[package]] name = "nss_kanidm" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "kanidm_unix_int", "lazy_static", @@ -3091,7 +3091,7 @@ dependencies = [ [[package]] name = "orca" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "clap", "crossbeam", @@ -3131,7 +3131,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pam_kanidm" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "kanidm_unix_int", "libc", @@ -3420,7 +3420,7 @@ dependencies = [ [[package]] name = "profiles" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "base64 0.13.1", "serde", @@ -4126,7 +4126,7 @@ dependencies = [ [[package]] name = "sketching" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" dependencies = [ "async-trait", "num_enum", diff --git a/Cargo.toml b/Cargo.toml index 37f55d293..023b6a14f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ members = [ ] [workspace.package] -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12-dev" authors = [ "William Brown ", "James Hodgkinson ", @@ -47,7 +47,7 @@ clap = { version = "^3.2", features = ["derive"] } clap_complete = "^3.2.5" # Forced by saffron/cron chrono = "^0.4.23" -compact_jwt = "^0.2.3" +compact_jwt = { version = "^0.2.3", default-features = false } # compact_jwt = { path = "../compact_jwt" } concread = "^0.4.1" # concread = { path = "../concread" } diff --git a/kanidmd/lib/Cargo.toml b/kanidmd/lib/Cargo.toml index 85c9c9cd2..91c1efc09 100644 --- a/kanidmd/lib/Cargo.toml +++ b/kanidmd/lib/Cargo.toml @@ -24,7 +24,7 @@ async-std.workspace = true async-trait.workspace = true base64.workspace = true base64urlsafedata.workspace = true -compact_jwt.workspace = true +compact_jwt = { workspace = true, features = ["openssl"] } concread.workspace = true dyn-clone.workspace = true fernet = { workspace = true, features = ["fernet_danger_timestamps"] } diff --git a/kanidmd_web_ui/Cargo.toml b/kanidmd_web_ui/Cargo.toml index 4b58718c3..ac947309a 100644 --- a/kanidmd_web_ui/Cargo.toml +++ b/kanidmd_web_ui/Cargo.toml @@ -2,7 +2,8 @@ name = "kanidmd_web_ui" description = "Kanidm Server Web User Interface" documentation = "https://docs.rs/kanidm/latest/kanidm/" -version = "1.1.0-alpha.11" + +version = "1.1.0-alpha.12-dev" authors = [ "William Brown ", "James Hodgkinson ", @@ -13,6 +14,13 @@ license = "MPL-2.0" homepage = "https://github.com/kanidm/kanidm/" repository = "https://github.com/kanidm/kanidm/" +# version.workspace = true +# authors.workspace = true +# rust-version.workspace = true +# edition.workspace = true +# license.workspace = true +# homepage.workspace = true +# repository.workspace = true # These are ignored because the crate is in a workspace #[profile.release] @@ -22,26 +30,27 @@ repository = "https://github.com/kanidm/kanidm/" crate-type = ["cdylib", "rlib"] [dependencies] -compact_jwt = { version = "^0.2.3", default-features = false, features = ["unsafe_release_without_verify"] } -gloo = "^0.8.0" -gloo-net = "0.2.6" -js-sys = "^0.3.58" +compact_jwt = { workspace = true, default-features = false, features = ["unsafe_release_without_verify"] } +# gloo = "^0.8.0" +gloo.workspace = true +gloo-net.workspace = true +js-sys.workspace = true kanidm_proto = { path = "../kanidm_proto", features = ["wasm"] } -qrcode = { version = "^0.12.0", default-features = false, features = ["svg"] } -serde = { version = "^1.0.152", features = ["derive"] } -serde_json = "^1.0.91" -serde-wasm-bindgen = "0.4" -uuid = "^1.2.1" -wasm-bindgen = { version = "^0.2.81" } -wasm-bindgen-futures = { version = "^0.4.30" } -wasm-bindgen-test = "0.3.33" -url = "^2.3.1" -yew = { version = "0.20.0", features = ["csr"] } -yew-router = "^0.17.0" +qrcode = { workspace = true, default-features = false, features = ["svg"] } +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true +serde-wasm-bindgen.workspace = true +wasm-bindgen.workspace = true +wasm-bindgen-futures.workspace = true +wasm-bindgen-test.workspace = true +url.workspace = true +uuid.workspace = true +yew = { workspace = true, features = ["csr"] } +yew-router.workspace = true [dependencies.web-sys] -version = "^0.3.60" +workspace = true features = [ "AuthenticationExtensionsClientOutputs", "AuthenticatorResponse", diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui.js b/kanidmd_web_ui/pkg/kanidmd_web_ui.js index 2735d0d08..e70239886 100644 --- a/kanidmd_web_ui/pkg/kanidmd_web_ui.js +++ b/kanidmd_web_ui/pkg/kanidmd_web_ui.js @@ -404,7 +404,7 @@ function getImports() { const ret = false; return ret; }; - imports.wbg.__wbg_modalhidebyid_9076f9d79351b537 = function(arg0, arg1) { + imports.wbg.__wbg_modalhidebyid_6dd8ae230b194210 = function(arg0, arg1) { modal_hide_by_id(getStringFromWasm0(arg0, arg1)); }; imports.wbg.__wbg_subtreeid_e348577f7ef777e3 = function(arg0, arg1) { diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm index 22ca50213..8d516ac60 100644 Binary files a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm and b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm differ diff --git a/kanidmd_web_ui/pkg/package.json b/kanidmd_web_ui/pkg/package.json index a45b1e7f0..85d32ba9c 100644 --- a/kanidmd_web_ui/pkg/package.json +++ b/kanidmd_web_ui/pkg/package.json @@ -5,7 +5,7 @@ "James Hodgkinson " ], "description": "Kanidm Server Web User Interface", - "version": "1.1.0-alpha.11", + "version": "1.1.0-alpha.12-dev", "license": "MPL-2.0", "repository": { "type": "git", diff --git a/project_docs/RELEASE_CHECKLIST.md b/project_docs/RELEASE_CHECKLIST.md index 14ec85420..4444ddfa8 100644 --- a/project_docs/RELEASE_CHECKLIST.md +++ b/project_docs/RELEASE_CHECKLIST.md @@ -57,7 +57,8 @@ cargo install cargo-outdated ### Docker - [ ] docker buildx use cluster -- [ ] `make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/radiusd` +- [ ] `make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/kanidm_tools buildx/radiusd` +- [ ] `IMAGE_VERSION=latest make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/kanidm_tools buildx/radiusd` - [ ] Update the readme on docker https://hub.docker.com/repository/docker/kanidm/server ### Distro @@ -71,4 +72,3 @@ cargo install cargo-outdated - [ ] git branch YYYYMMDD-dev-version - [ ] update version in ./kanidmd\_web\_ui/Cargo.toml - [ ] update version in ./Cargo.toml -- [ ] build wasm components with debug profile