From 5b44598b951a25cb8186304e387a433b461809a9 Mon Sep 17 00:00:00 2001
From: Falk Rehse <falk.rehse@tu-dortmund.de>
Date: Mon, 21 Nov 2022 16:01:20 +0100
Subject: [PATCH] Rename secret to token
---
src/main.rs | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index 560b205..b8ffdb4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,13 +24,13 @@ fn main() {
let playlist_1 = Mutable::clone(&playlist);
spawn(move || {
- let player_secret = Arc::new(
- env::var("SPOCCIFY_PLAYER_SECRET")
- .expect("No player secret provided!"),
+ let player_token = Arc::new(
+ env::var("SPOCCIFY_PLAYER_TOKEN")
+ .expect("No player token provided!"),
);
- let client_secret = Arc::new(
- env::var("SPOCCIFY_CLIENT_SECRET")
- .expect("No client secret provided!"),
+ let client_token = Arc::new(
+ env::var("SPOCCIFY_CLIENT_TOKEN")
+ .expect("No client token provided!"),
);
let bind_host =
@@ -45,14 +45,14 @@ fn main() {
let server = TcpListener::bind(bind_address).expect("Failed to bind websocket port!");
for stream in server.incoming() {
let playlist_clone = Mutable::clone(&playlist_1);
- let player_secret_clone = Arc::clone(&player_secret);
- let client_secret_clone = Arc::clone(&client_secret);
+ let player_token_clone = Arc::clone(&player_token);
+ let client_token_clone = Arc::clone(&client_token);
spawn(move || {
handle_websocket(
stream,
playlist_clone,
- player_secret_clone,
- client_secret_clone,
+ player_token_clone,
+ client_token_clone,
)
});
}
@@ -71,8 +71,8 @@ fn main() {
fn handle_websocket(
stream: Result<TcpStream, Error>,
playlist: Mutable<Vec<Song>>,
- player_secret: Arc<String>,
- client_secret: Arc<String>,
+ player_token: Arc<String>,
+ client_token: Arc<String>,
) -> () {
if let Err(_) = stream {
eprintln!("Failed to accept TCP stream!");
@@ -94,9 +94,9 @@ fn handle_websocket(
let msg = msg.unwrap();
if let Message::Text(text) = msg {
- if text == *player_secret {
+ if text == *player_token {
player::handle_player(&mut websocket, &playlist);
- } else if text == *client_secret {
+ } else if text == *client_token {
client::handle_client(&mut websocket, &playlist);
} else {
eprintln!("Invalid authentication token!");
@@ -104,8 +104,8 @@ fn handle_websocket(
}
/* match text {
- *player_secret => player::handle_player(&mut websocket, &playlist),
- *client_secret => client::handle_client(&mut websocket, &playlist),
+ *player_token => player::handle_player(&mut websocket, &playlist),
+ *client_token => client::handle_client(&mut websocket, &playlist),
_ => {
eprintln!("Invalid authentication token!");
return;
--
GitLab