ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2024-12-19 05:07:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Chirpstack overwriting user updates by OIDC user provisioning callback (#343)

Browse Source 
Co-authored-by: Orne Brocaar <info@brocaar.com>
This commit is contained in:
Liu Woon Yung 2024-01-11 20:28:49 +08:00 committed by GitHub
parent e379e8738c
commit f248379259
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chirpstack/src/api/internal.rs
View File

@ -56,13 +56,16 @@ impl Internal {
external_id: Some(external_id.to_string()), external_id: Some(external_id.to_string()),
..Default::default() ..Default::default()
}; };
let u = user::create(u).await?; let mut u = user::create(u).await?;
if let Err(e) = self.provision_user(&u.id, user_info).await { if let Err(e) = self.provision_user(&u.id, user_info).await {
error!(error = %e, "Provisioning user failed"); error!(error = %e, "Provisioning user failed");
user::delete(&u.id).await?; user::delete(&u.id).await?;
return Err(e); return Err(e);
} }
// fetch user again because the provisioning callback url may have updated the user.
u = user::get(&u.id).await?;
Ok(u) Ok(u)
} }