Merge remote-tracking branch 'hatomist/fix/sso-origin-overwrite'

This commit is contained in:
Jason Volk
2026-03-03 06:12:26 +00:00

View File

@@ -236,13 +236,17 @@ impl Service {
}
}
let is_sentinel = password.is_some_and(|p| p == "*");
match password.map(utils::hash::password) {
| None => {
self.db.userid_password.insert(user_id, b"");
},
| Some(Ok(hash)) => {
self.db.userid_password.insert(user_id, hash);
if !is_sentinel {
self.db.userid_origin.insert(user_id, "password");
}
},
| Some(Err(e)) => {
return Err!(Request(InvalidParam(