jcoffey-dev
b2ded0a776
Five conflicts, resolved: - crates/common/src/auth/authentication.rs: upstream's get_directory_for_token and JwtClaims replace extract_jwt_domain; the per-domain directory code (DIR-1, DIR-5 to DIR-7) is kept, and the token lookup routes through it. The release's one new Enterprise snippet was the body of get_directory_for_issuer, which stays returning None: a token naming no address gets the server default, as DIR-2 specifies and as v0.16.22 did. - crates/common/src/manager/application.rs: upstream's rewrite of the tests, with the temp directory names renamed again, and the 5(a) notice the name-purge change should have added. - crates/common/src/network/mta.rs: both sides' imports. - crates/main/Cargo.toml: the AGPL-only license kept, version 0.16.23. - Cargo.lock: upstream's, with the fork's crates added by Cargo.
37 lines
968 B
TOML
37 lines
968 B
TOML
[package]
|
|
name = "scim"
|
|
version = "0.16.23"
|
|
edition = "2024"
|
|
|
|
[dependencies]
|
|
scim-proto = { path = "../scim-proto" }
|
|
common = { path = "../common" }
|
|
jmap = { path = "../jmap" }
|
|
store = { path = "../store" }
|
|
registry = { path = "../registry" }
|
|
directory = { path = "../directory" }
|
|
http_proto = { path = "../http-proto" }
|
|
jmap_proto = { path = "../jmap-proto" }
|
|
types = { path = "../types" }
|
|
utils = { path = "../utils" }
|
|
trc = { path = "../trc" }
|
|
hyper = { version = "1.11.1", features = ["server", "http1", "http2"] }
|
|
serde = { version = "1.0", features = ["derive"] }
|
|
serde_json = "1.0"
|
|
xxhash-rust = { version = "0.8.18", features = ["xxh3"] }
|
|
icu_locale = "2.3.1"
|
|
ahash = { version = "0.8.12", features = ["serde"] }
|
|
base64 = "0.23"
|
|
hmac = "0.13"
|
|
sha2 = "0.11"
|
|
|
|
[dev-dependencies]
|
|
|
|
[features]
|
|
test_mode = []
|
|
dev_mode = []
|
|
enterprise = ["common/enterprise", "jmap/enterprise", "store/enterprise", "directory/enterprise", "trc/enterprise"]
|
|
|
|
[lints]
|
|
workspace = true
|