joshuafhiggins/realm-chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Adding servers, fetching servers on the client

Browse Source
This commit is contained in:
Joshua Higgins
2024-10-12 14:57:54 -04:00
Unverified
parent c333bf1b49
commit 87b3125f8e
6 changed files with 262 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
auth/src/server.rs
View File

@@ -507,11 +507,13 @@ impl RealmAuth for RealmAuthServer {
}
}
async fn add_server(self, _: Context, username: String, token: String, domain: String) -> Result<(), ErrorCode> {
async fn add_server(self, _: Context, username: String, token: String, domain: String, port: u16) -> Result<(), ErrorCode> {
if !self.is_authorized(&username, &token).await? {
return Err(Unauthorized);
}
let address = format!("{}:{}", domain, port);
let result = query!("SELECT servers FROM user WHERE username = ?", username).fetch_one(&self.db_pool).await;
match result {
Ok(row) => {
@@ -523,12 +525,12 @@ impl RealmAuth for RealmAuthServer {
}
};
for server in &vec_servers {
if server.eq(&domain) {
if server.eq(&address) {
return Err(AlreadyJoinedServer);
}
}
vec_servers.push(&domain);
vec_servers.push(&address);
let new_servers = vec_servers.join("|");
let result = query!("UPDATE user SET servers = ? WHERE username = ?", new_servers, username).fetch_one(&self.db_pool).await;
@@ -541,11 +543,13 @@ impl RealmAuth for RealmAuthServer {
}
}
async fn remove_server(self, _: Context, username: String, token: String, domain: String) -> Result<(), ErrorCode> {
async fn remove_server(self, _: Context, username: String, token: String, domain: String, port: u16) -> Result<(), ErrorCode> {
if !self.is_authorized(&username, &token).await? {
return Err(Unauthorized);
}
let address = format!("{}:{}", domain, port);
let result = query!("SELECT servers FROM user WHERE username = ?", username).fetch_one(&self.db_pool).await;
match result {
Ok(row) => {
@@ -557,7 +561,7 @@ impl RealmAuth for RealmAuthServer {
}
};
for i in 0..vec_servers.len() {
if vec_servers.get(i).unwrap().eq(&domain) {
if vec_servers.get(i).unwrap().eq(&address) {
vec_servers.remove(i);
let new_servers = vec_servers.join("|");