From 80db649b9f9e7fbde97556e77f73752152ccc602 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 17 Nov 2021 01:03:12 -0500 Subject: [PATCH] wip --- crates/app/obs_gateway/src/endpoints/oauth_end.rs | 2 ++ .../endpoints_ws/obs_gateway_websocket_handler.rs | 12 +++++++++--- crates/app/obs_gateway/src/main.rs | 2 ++ crates/app/obs_gateway/src/server_state.rs | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/crates/app/obs_gateway/src/endpoints/oauth_end.rs b/crates/app/obs_gateway/src/endpoints/oauth_end.rs index 4b635607c9..93167956a8 100644 --- a/crates/app/obs_gateway/src/endpoints/oauth_end.rs +++ b/crates/app/obs_gateway/src/endpoints/oauth_end.rs @@ -121,11 +121,13 @@ pub async fn oauth_end_enroll_from_redirect( } })?; + let user_id = user_token.user_id.to_string(); let auth_token = user_token.access_token.secret().to_string(); let refresh_token: Option = user_token.refresh_token .as_ref() .map(|token| token.secret().to_string()); + info!("User id: {:?}", user_id); info!("Auth token: {:?}", auth_token); info!("Refresh token: {:?}", refresh_token); diff --git a/crates/app/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs b/crates/app/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs index 7e6ecc14e7..352ab36fed 100644 --- a/crates/app/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs +++ b/crates/app/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs @@ -35,14 +35,20 @@ pub async fn obs_gateway_websocket_handler( let r = client.try_next().await.unwrap(); error!("Twitch PubSub Result: {:?}", r); - // User: vocodes - let user_id = 652567283; + //let user_id = 652567283; + + let user_id = server_state.twitch_oauth_temp.temp_oauth_user_id.parse::().unwrap(); + let bit_topic = pubsub::channel_bits::ChannelBitsEventsV2 { channel_id: user_id, }.into_topic(); - let topics = [bit_topic]; + let sub_topic = pubsub::channel_subscriptions::ChannelSubscribeEventsV1 { + channel_id: user_id, + }.into_topic(); + + let topics = [bit_topic, sub_topic]; let auth_token = server_state.twitch_oauth_temp.temp_oauth_access_token.clone(); diff --git a/crates/app/obs_gateway/src/main.rs b/crates/app/obs_gateway/src/main.rs index 746acdfee0..123e9fccb4 100644 --- a/crates/app/obs_gateway/src/main.rs +++ b/crates/app/obs_gateway/src/main.rs @@ -219,6 +219,7 @@ async fn main() -> AnyhowResult<()> { "http://localhost:54321/twitch/oauth_redirect"); // TODO: These are temporary. + let temp_oauth_user_id = easyenv::get_env_string_or_default("TEMP_TWITCH_OAUTH_USER_ID", ""); let temp_oauth_access_token = easyenv::get_env_string_or_default("TEMP_TWITCH_OAUTH_ACCESS", ""); let temp_oauth_refresh_token = easyenv::get_env_string_or_default("TEMP_TWITCH_OAUTH_REFRESH", ""); @@ -237,6 +238,7 @@ async fn main() -> AnyhowResult<()> { redirect_url: oauth_redirect_url, }, twitch_oauth_temp: TwitchOauthTemp { + temp_oauth_user_id, temp_oauth_access_token, temp_oauth_refresh_token, }, diff --git a/crates/app/obs_gateway/src/server_state.rs b/crates/app/obs_gateway/src/server_state.rs index 76f750c580..f03b78e835 100644 --- a/crates/app/obs_gateway/src/server_state.rs +++ b/crates/app/obs_gateway/src/server_state.rs @@ -36,6 +36,7 @@ pub struct TwitchOauthSecrets { #[deprecated] #[derive(Clone)] pub struct TwitchOauthTemp { + pub temp_oauth_user_id: String, pub temp_oauth_access_token: String, pub temp_oauth_refresh_token: String, }