use validator for scopes

CHANGELOG.md

@@ -27,6 +27,8 @@
 - `TeamInformation::thumbnail_url` is now optional (`Option<String>`).
 - Made many structs & enums non exhaustive
 - Renamed `GetBlockedTerms` -> `GetBlockedTermsRequest`
+- Changed `SCOPES` on `helix::Request`, `pubsub::Topic` and `eventsub::EventSubscription` to be `twitch_oauth2::Validator`
+- Updated `twitch_oauth2` dependency
 
 ### Changes
 
@@ -40,10 +42,10 @@
 - Deprecated `channel.follow` v1 eventsub event
 - Deprecated `Get User Follows` and associated follower related extension methods
 - Deprecated Twitch-defined tags: `Get All Stream Tags`, `Get Stream Tags`, `Replace Stream Tags` and `TwitchTag`
-- Added `beta` feature to specifically enable beta endpoints
 
 ### Added
 
+- Added `beta` feature to specifically enable beta endpoints
 - Added `Ban User` and `Unban User`
 - Added `Get Chat Settings` endpoint
 - Added `type` and `user_id` query params to `GetEventSubSubscriptionsRequest`

Cargo.toml

@@ -28,7 +28,7 @@ exclude = ["twitch_types", "twitch_oauth2"]
 
 [workspace.dependencies]
 twitch_api = { version = "0.7.0-rc.6", path = "." }
-twitch_oauth2 = { version = "0.12.1", path = "twitch_oauth2/" }
+twitch_oauth2 = { version = "0.12.2", path = "twitch_oauth2/" }
 twitch_types = { version = "0.4.1", features = [
     "serde",
 ], path = "./twitch_types" }

src/eventsub/channel/ban.rs

@@ -27,7 +27,8 @@ impl EventSubscription for ChannelBanV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelBan;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelModerate];
+    const SCOPE: twitch_oauth2::Validator =
+        twitch_oauth2::validator![twitch_oauth2::Scope::ChannelModerate];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/channel_points_custom_reward/add.rs

@@ -27,7 +27,10 @@ impl EventSubscription for ChannelPointsCustomRewardAddV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelPointsCustomRewardAdd;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelReadRedemptions];
+    const SCOPE: twitch_oauth2::Validator = twitch_oauth2::validator![any(
+        twitch_oauth2::Scope::ChannelReadRedemptions,
+        twitch_oauth2::Scope::ChannelManageRedemptions
+    )];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/channel_points_custom_reward/remove.rs

@@ -37,7 +37,10 @@ impl EventSubscription for ChannelPointsCustomRewardRemoveV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelPointsCustomRewardRemove;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelReadRedemptions];
+    const SCOPE: twitch_oauth2::Validator = twitch_oauth2::validator![any(
+        twitch_oauth2::Scope::ChannelReadRedemptions,
+        twitch_oauth2::Scope::ChannelManageRedemptions
+    )];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/channel_points_custom_reward/update.rs

@@ -37,7 +37,10 @@ impl EventSubscription for ChannelPointsCustomRewardUpdateV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelPointsCustomRewardUpdate;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelReadRedemptions];
+    const SCOPE: twitch_oauth2::Validator = twitch_oauth2::validator![any(
+        twitch_oauth2::Scope::ChannelReadRedemptions,
+        twitch_oauth2::Scope::ChannelManageRedemptions
+    )];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/channel_points_custom_reward_redemption/add.rs

@@ -37,7 +37,10 @@ impl EventSubscription for ChannelPointsCustomRewardRedemptionAddV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelPointsCustomRewardRedemptionAdd;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelReadRedemptions];
+    const SCOPE: twitch_oauth2::Validator = twitch_oauth2::validator![any(
+        twitch_oauth2::Scope::ChannelReadRedemptions,
+        twitch_oauth2::Scope::ChannelManageRedemptions
+    )];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/channel_points_custom_reward_redemption/update.rs

@@ -37,7 +37,10 @@ impl EventSubscription for ChannelPointsCustomRewardRedemptionUpdateV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelPointsCustomRewardRedemptionUpdate;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelReadRedemptions];
+    const SCOPE: twitch_oauth2::Validator = twitch_oauth2::validator![any(
+        twitch_oauth2::Scope::ChannelReadRedemptions,
+        twitch_oauth2::Scope::ChannelManageRedemptions
+    )];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/charity_campaign/donate.rs

@@ -26,7 +26,8 @@ impl EventSubscription for ChannelCharityCampaignDonateV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelCharityCampaignDonate;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelReadCharity];
+    const SCOPE: twitch_oauth2::Validator =
+        twitch_oauth2::validator![twitch_oauth2::Scope::ChannelReadCharity];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/charity_campaign/progress.rs

@@ -26,7 +26,8 @@ impl EventSubscription for ChannelCharityCampaignProgressV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelCharityCampaignProgress;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelReadCharity];
+    const SCOPE: twitch_oauth2::Validator =
+        twitch_oauth2::validator![twitch_oauth2::Scope::ChannelReadCharity];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/charity_campaign/start.rs

@@ -26,7 +26,8 @@ impl EventSubscription for ChannelCharityCampaignStartV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelCharityCampaignStart;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelReadCharity];
+    const SCOPE: twitch_oauth2::Validator =
+        twitch_oauth2::validator![twitch_oauth2::Scope::ChannelReadCharity];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/charity_campaign/stop.rs

@@ -26,7 +26,8 @@ impl EventSubscription for ChannelCharityCampaignStopV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelCharityCampaignStop;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ChannelReadCharity];
+    const SCOPE: twitch_oauth2::Validator =
+        twitch_oauth2::validator![twitch_oauth2::Scope::ChannelReadCharity];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/cheer.rs

@@ -27,7 +27,8 @@ impl EventSubscription for ChannelCheerV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelCheer;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::BitsRead];
+    const SCOPE: twitch_oauth2::Validator =
+        twitch_oauth2::validator![twitch_oauth2::Scope::BitsRead];
     const VERSION: &'static str = "1";
 }
 

src/eventsub/channel/follow.rs

@@ -29,7 +29,7 @@ impl EventSubscription for ChannelFollowV1 {
 
     const EVENT_TYPE: EventType = EventType::ChannelFollow;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[];
+    const SCOPE: twitch_oauth2::Validator = twitch_oauth2::validator![];
     const VERSION: &'static str = "1";
 }
 
@@ -122,7 +122,8 @@ impl EventSubscription for ChannelFollowV2 {
 
     const EVENT_TYPE: EventType = EventType::ChannelFollow;
     #[cfg(feature = "twitch_oauth2")]
-    const SCOPE: &'static [twitch_oauth2::Scope] = &[twitch_oauth2::Scope::ModeratorReadFollowers];
+    const SCOPE: twitch_oauth2::Validator =
+        twitch_oauth2::validator![twitch_oauth2::Scope::ModeratorReadFollowers];
     const VERSION: &'static str = "2";
 }