Skip to content
Snippets Groups Projects
Commit 5b44598b authored by Falk Rehse's avatar Falk Rehse
Browse files

Rename secret to token

parent cb4607df
No related branches found
No related tags found
No related merge requests found
Pipeline #115624 passed
...@@ -24,13 +24,13 @@ fn main() { ...@@ -24,13 +24,13 @@ fn main() {
let playlist_1 = Mutable::clone(&playlist); let playlist_1 = Mutable::clone(&playlist);
spawn(move || { spawn(move || {
let player_secret = Arc::new( let player_token = Arc::new(
env::var("SPOCCIFY_PLAYER_SECRET") env::var("SPOCCIFY_PLAYER_TOKEN")
.expect("No player secret provided!"), .expect("No player token provided!"),
); );
let client_secret = Arc::new( let client_token = Arc::new(
env::var("SPOCCIFY_CLIENT_SECRET") env::var("SPOCCIFY_CLIENT_TOKEN")
.expect("No client secret provided!"), .expect("No client token provided!"),
); );
let bind_host = let bind_host =
...@@ -45,14 +45,14 @@ fn main() { ...@@ -45,14 +45,14 @@ fn main() {
let server = TcpListener::bind(bind_address).expect("Failed to bind websocket port!"); let server = TcpListener::bind(bind_address).expect("Failed to bind websocket port!");
for stream in server.incoming() { for stream in server.incoming() {
let playlist_clone = Mutable::clone(&playlist_1); let playlist_clone = Mutable::clone(&playlist_1);
let player_secret_clone = Arc::clone(&player_secret); let player_token_clone = Arc::clone(&player_token);
let client_secret_clone = Arc::clone(&client_secret); let client_token_clone = Arc::clone(&client_token);
spawn(move || { spawn(move || {
handle_websocket( handle_websocket(
stream, stream,
playlist_clone, playlist_clone,
player_secret_clone, player_token_clone,
client_secret_clone, client_token_clone,
) )
}); });
} }
...@@ -71,8 +71,8 @@ fn main() { ...@@ -71,8 +71,8 @@ fn main() {
fn handle_websocket( fn handle_websocket(
stream: Result<TcpStream, Error>, stream: Result<TcpStream, Error>,
playlist: Mutable<Vec<Song>>, playlist: Mutable<Vec<Song>>,
player_secret: Arc<String>, player_token: Arc<String>,
client_secret: Arc<String>, client_token: Arc<String>,
) -> () { ) -> () {
if let Err(_) = stream { if let Err(_) = stream {
eprintln!("Failed to accept TCP stream!"); eprintln!("Failed to accept TCP stream!");
...@@ -94,9 +94,9 @@ fn handle_websocket( ...@@ -94,9 +94,9 @@ fn handle_websocket(
let msg = msg.unwrap(); let msg = msg.unwrap();
if let Message::Text(text) = msg { if let Message::Text(text) = msg {
if text == *player_secret { if text == *player_token {
player::handle_player(&mut websocket, &playlist); player::handle_player(&mut websocket, &playlist);
} else if text == *client_secret { } else if text == *client_token {
client::handle_client(&mut websocket, &playlist); client::handle_client(&mut websocket, &playlist);
} else { } else {
eprintln!("Invalid authentication token!"); eprintln!("Invalid authentication token!");
...@@ -104,8 +104,8 @@ fn handle_websocket( ...@@ -104,8 +104,8 @@ fn handle_websocket(
} }
/* match text { /* match text {
*player_secret => player::handle_player(&mut websocket, &playlist), *player_token => player::handle_player(&mut websocket, &playlist),
*client_secret => client::handle_client(&mut websocket, &playlist), *client_token => client::handle_client(&mut websocket, &playlist),
_ => { _ => {
eprintln!("Invalid authentication token!"); eprintln!("Invalid authentication token!");
return; return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment