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

Fix some minor typos & bugs; #123

Browse Source
This commit is contained in:
NG (Graham)
2026-07-05 16:28:20 -04:00
committed by NGnius
parent 2adf8249bb
commit 1dc502af32
7 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rc_auth/src/main.rs
View File

@@ -57,7 +57,7 @@ async fn main() -> std::io::Result<()> {
App::new()
.wrap_fn(|req, srv| {
use actix_web::dev::Service;
log::debug!("Request {} {}", req.method(), req.path());
log::trace!("Request {} {}", req.method(), req.path());
srv.call(req)
})
.app_data(cli_args2.clone())
@@ -74,7 +74,7 @@ async fn main() -> std::io::Result<()> {
.service(robocraft::email::email_password_auth)
.service(robocraft::steam::steam_auth)
.service(robocraft::username::user_password_auth)
.service(robocraft::displayname::displaye_password_auth)
.service(robocraft::displayname::display_password_auth)
.service(robocraft::intercom::services_ws)
.service(robocraft::intercom::service_msg)
.service(robocraft::intercom::lobby_state_ws)

2
rc_auth/src/robocraft/displayname.rs
View File

@@ -2,7 +2,7 @@ use oj_rc_core::persist::user::FederatedAuthenticator;
use actix_web::{post, web::{Data, Json}};
#[post("/authenticate/displayname/game")]
pub async fn displaye_password_auth(body: Json<libfj::robocraft::EmailUserAuthenticationPayload>, config: Data<super::RcConfig>) -> Result<Json<libfj::robocraft::AuthenticationResponseInfo>, super::ErrorTy> {
pub async fn display_password_auth(body: Json<libfj::robocraft::EmailUserAuthenticationPayload>, config: Data<super::RcConfig>) -> Result<Json<libfj::robocraft::AuthenticationResponseInfo>, super::ErrorTy> {
if body.display_name.is_none() {
return Err(super::ErrorTy::from_err(oj_rc_core::persist::user::AuthError {
message: "Missing display_name".to_owned(),

1
rc_auth/src/robocraft/intercom/services.rs
View File

@@ -4,7 +4,6 @@ use actix_web::{rt, web::{Payload, Data, Path, Json}, Error, HttpRequest, HttpRe
#[get("/intercom/.oj_services/{name}")]
pub async fn services_ws(req: HttpRequest, stream: Payload, auth: Data<super::IntercomAuth>, reg: Data<super::Users>, name: Path<String>) -> Result<HttpResponse, Error> {
log::debug!("intercom/.oj_services name is {}", name);
auth.validate(&req, &format!(".oj_services/{}", urlencoding::encode(&*name)))?;
let (res, mut session, _stream) = actix_ws::handle(&req, stream)?;

4
rc_core/src/persist/federation.rs
View File

@@ -30,9 +30,9 @@ fn default_aliases() -> std::collections::HashMap<String, String> {
fn default_defederated() -> Vec<String> {
vec![
"robocraftgame.com".to_owned(),
#[cfg(debug_assertions)]
#[cfg(not(debug_assertions))]
{ "127.0.0.1:8002".to_owned() },
#[cfg(debug_assertions)]
#[cfg(not(debug_assertions))]
{ "127.0.0.1".to_owned() },
]
}

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

@@ -263,7 +263,7 @@ impl AccountProvider {
let client_details = libfj::robocraft::TokenPayload {
public_id: pub_id.clone(),
display_name: if is_fedi { format!("{}#{}", user_info.display_name, self.domain) } else { user_info.display_name.clone() },
robocraft_name: if is_fedi { format!("{}#{}", user_info.public_id, self.domain) } else { user_info.public_id.clone() },
robocraft_name: pub_id.clone(),
email_address: user_info.email,
email_verified: true,
flags: vec![

3
rc_core/src/persist/user/federation.rs
View File

@@ -131,7 +131,7 @@ impl super::AccountProvider {
|| target_domain == "0:0:0:0:0:0:0:1"
|| target_domain.starts_with("127.0.0.")
|| target_domain.starts_with("localhost:");
// TODO contact other domain
// contact other domain to get oauth (auth) and root server
let social_urls_api = if is_localhost {
format!("http://{}/{}", target_domain, SOCIETY_URLS_API_ENDPOINT)
} else {
@@ -236,7 +236,6 @@ impl super::AccountProvider {
code: crate::data::error_codes::AuthErrorCode::BadCredentials,
});
};
//let auth_redirected_url = auth_resp.url();
log::debug!("OAuth auth response URL: {}", auth_redirected_url);
let mut query_map: std::collections::HashMap<_, _> = auth_redirected_url.query_pairs().collect();
let auth_code = if let Some(auth_code) = query_map.remove("code") {

2
rc_database/src/wrapper.rs
View File

@@ -938,7 +938,7 @@ impl Database {
pub async fn federation_by_domain(&self, domain: &str) -> Result<Option<crate::schema::federation::Model>, sea_orm::DbErr> {
crate::schema::federation::Entity::find()
.filter(crate::schema::federation::Column::Id.eq(domain))
.filter(crate::schema::federation::Column::Domain.eq(domain))
.one(self.orm.as_ref())
.await
}