bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Add real email-based authentication, fix RC account auth to try all 3 login options when it doesn't know #20

Browse Source
This commit is contained in:
NG (Graham)
2025-05-11 21:18:45 -04:00
parent aea56bf01e
commit d3bd795a01
7 changed files with 82 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rc_core/src/persist/user/account_json.rs
View File

@@ -33,7 +33,7 @@ impl <C: Clone> super::UserProvider<C> for AccountProvider {
let mut validation = jsonwebtoken::Validation::new(jsonwebtoken::Algorithm::HS256);
validation.set_required_spec_claims::<&str>(&[]);
jsonwebtoken::decode::<libfj::robocraft::TokenPayload>(&token.token, &secret, &validation).map_err(|e| e.to_string())?;
let user_info = if let Some(user_info) = self.db.user_by_public_id(token.uuid.clone()).await.map_err(|e| e.to_string())? {
let user_info = if let Some(user_info) = self.db.user_by_any_unique_id(token.uuid.clone()).await.map_err(|e| e.to_string())? {
user_info
} else {
return Err("User not found".to_owned());
@@ -62,14 +62,19 @@ impl super::UserAuthenticator for AccountProvider {
async fn login(&self, info: super::UserInfo) -> Result<super::UserLoginInfo, String> {
//let new_root = self.root.join(&info.payload.public_id);
let is_new_user;
let mut user_info = if let Some(user_info) = self.db.user_by_public_id(info.payload.public_id.clone()).await.map_err(|e| e.to_string())? {
let user_opt = match &info.extra {
super::ExtraUserInfo::Steam { id } => self.db.user_by_steam_id(*id).await,
super::ExtraUserInfo::Email { .. } => self.db.user_by_email(info.payload.email_address.clone()).await,
super::ExtraUserInfo::Username { .. } => self.db.user_by_display_name(info.payload.display_name.clone()).await,
}.map_err(|e| e.to_string())?;
let mut user_info = if let Some(user_info) = user_opt {
is_new_user = false;
user_info
} else {
is_new_user = true;
log::info!("New user {}", info.payload.public_id);
super::setup_new_user(&info, &self.db).await.map_err(|e| e.to_string())?;
self.db.user_by_public_id(info.payload.public_id.clone()).await.map_err(|e| e.to_string())?.unwrap()
self.db.user_by_display_name(info.payload.display_name.clone()).await.map_err(|e| e.to_string())?.unwrap()
};
let override_password = user_info.password.is_empty() && user_info.steam_id.is_none();
match info.extra {
@@ -83,7 +88,8 @@ impl super::UserAuthenticator for AccountProvider {
return Err("SteamID not supported for this user".to_owned());
}
},
super::ExtraUserInfo::Standalone { password } => {
super::ExtraUserInfo::Email { password }
| super::ExtraUserInfo::Username { password } => {
use argon2::password_hash::PasswordHasher;
let argon2_algo = argon2::Argon2::default();
if override_password {

2
rc_core/src/persist/user/initial_data.rs
View File

@@ -32,7 +32,7 @@ pub async fn setup_new_user(user: &super::UserInfo, db: &rc_database::Database)
}
fn default_user_data(user: &super::UserInfo) -> rc_database::schema::user::ActiveModel {
let password = if let super::ExtraUserInfo::Standalone { password } = &user.extra {
let password = if let super::ExtraUserInfo::Email { password } | super::ExtraUserInfo::Username { password } = &user.extra {
//password.to_owned()
use argon2::password_hash::PasswordHasher;
let argon2_algo = argon2::Argon2::default();

5
rc_core/src/persist/user/traits.rs
View File

@@ -15,7 +15,10 @@ pub enum ExtraUserInfo {
Steam {
id: u64,
},
Standalone {
Username {
password: String,
},
Email {
password: String,
}
}