From 0396e318d3336e8cef232e824b8ab061f67d569e Mon Sep 17 00:00:00 2001 From: bitfl0wer Date: Thu, 17 Aug 2023 22:26:07 +0200 Subject: [PATCH] Change bearer_auth to header("Authorization" --- src/api/channels/channels.rs | 12 ++++++------ src/api/channels/messages.rs | 4 ++-- src/api/channels/permissions.rs | 9 +++++++-- src/api/channels/reactions.rs | 20 ++++++++++++++------ src/api/guilds/guilds.rs | 10 +++++----- src/api/guilds/member.rs | 8 +++++--- src/api/guilds/roles.rs | 13 ++++++++----- src/api/invites/mod.rs | 6 +++--- src/api/users/channels.rs | 2 +- src/api/users/guilds.rs | 2 +- src/api/users/relationships.rs | 19 ++++++++++++------- src/api/users/users.rs | 10 ++++++---- 12 files changed, 70 insertions(+), 45 deletions(-) diff --git a/src/api/channels/channels.rs b/src/api/channels/channels.rs index 1e8f93c..276636f 100644 --- a/src/api/channels/channels.rs +++ b/src/api/channels/channels.rs @@ -20,7 +20,7 @@ impl Channel { let chorus_request = ChorusRequest { request: Client::new() .get(format!("{}/channels/{}", url, channel_id)) - .bearer_auth(user.token()), + .header("Authorization", user.token()), limit_type: LimitType::Channel(channel_id), }; chorus_request.deserialize_response::(user).await @@ -41,7 +41,7 @@ impl Channel { user.belongs_to.borrow().urls.api, self.id )) - .bearer_auth(user.token()), + .header("Authorization", user.token()), limit_type: LimitType::Channel(self.id), }; chorus_request.handle_request_as_result(user).await @@ -74,7 +74,7 @@ impl Channel { user.belongs_to.borrow().urls.api, channel_id )) - .bearer_auth(user.token()) + .header("Authorization", user.token()) .body(to_string(&modify_data).unwrap()), limit_type: LimitType::Channel(channel_id), }; @@ -102,7 +102,7 @@ impl Channel { user.belongs_to.borrow().urls.api, channel_id )) - .bearer_auth(user.token()) + .header("Authorization", user.token()) .query(&range), limit_type: Default::default(), }; @@ -129,7 +129,7 @@ impl Channel { self.id, recipient_id )) - .bearer_auth(user.token()); + .header("Authorization", user.token()); if let Some(schema) = add_channel_recipient_schema { request = request.body(to_string(&schema).unwrap()); } @@ -157,7 +157,7 @@ impl Channel { self.id, recipient_id )) - .bearer_auth(user.token()); + .header("Authorization", user.token()); ChorusRequest { request, limit_type: LimitType::Channel(self.id), diff --git a/src/api/channels/messages.rs b/src/api/channels/messages.rs index b93ce2e..25995f9 100644 --- a/src/api/channels/messages.rs +++ b/src/api/channels/messages.rs @@ -26,7 +26,7 @@ impl Message { let chorus_request = ChorusRequest { request: Client::new() .post(format!("{}/channels/{}/messages", url_api, channel_id)) - .bearer_auth(user.token()) + .header("Authorization", user.token()) .body(to_string(&message).unwrap()), limit_type: LimitType::Channel(channel_id), }; @@ -62,7 +62,7 @@ impl Message { let chorus_request = ChorusRequest { request: Client::new() .post(format!("{}/channels/{}/messages", url_api, channel_id)) - .bearer_auth(user.token()) + .header("Authorization", user.token()) .multipart(form), limit_type: LimitType::Channel(channel_id), }; diff --git a/src/api/channels/permissions.rs b/src/api/channels/permissions.rs index 7c83d85..b445876 100644 --- a/src/api/channels/permissions.rs +++ b/src/api/channels/permissions.rs @@ -40,7 +40,10 @@ impl types::Channel { } }; let chorus_request = ChorusRequest { - request: Client::new().put(url).bearer_auth(user.token()).body(body), + request: Client::new() + .put(url) + .header("Authorization", user.token()) + .body(body), limit_type: LimitType::Channel(channel_id), }; chorus_request.handle_request_as_result(user).await @@ -66,7 +69,9 @@ impl types::Channel { overwrite_id ); let chorus_request = ChorusRequest { - request: Client::new().delete(url).bearer_auth(user.token()), + request: Client::new() + .delete(url) + .header("Authorization", user.token()), limit_type: LimitType::Channel(channel_id), }; chorus_request.handle_request_as_result(user).await diff --git a/src/api/channels/reactions.rs b/src/api/channels/reactions.rs index 05fcea0..f9b7541 100644 --- a/src/api/channels/reactions.rs +++ b/src/api/channels/reactions.rs @@ -29,7 +29,9 @@ impl ReactionMeta { self.message_id ); let chorus_request = ChorusRequest { - request: Client::new().delete(url).bearer_auth(user.token()), + request: Client::new() + .delete(url) + .header("Authorization", user.token()), limit_type: LimitType::Channel(self.channel_id), }; chorus_request.handle_request_as_result(user).await @@ -51,7 +53,7 @@ impl ReactionMeta { emoji ); let chorus_request = ChorusRequest { - request: Client::new().get(url).bearer_auth(user.token()), + request: Client::new().get(url).header("Authorization", user.token()), limit_type: LimitType::Channel(self.channel_id), }; chorus_request @@ -77,7 +79,9 @@ impl ReactionMeta { emoji ); let chorus_request = ChorusRequest { - request: Client::new().delete(url).bearer_auth(user.token()), + request: Client::new() + .delete(url) + .header("Authorization", user.token()), limit_type: LimitType::Channel(self.channel_id), }; chorus_request.handle_request_as_result(user).await @@ -104,7 +108,7 @@ impl ReactionMeta { emoji ); let chorus_request = ChorusRequest { - request: Client::new().put(url).bearer_auth(user.token()), + request: Client::new().put(url).header("Authorization", user.token()), limit_type: LimitType::Channel(self.channel_id), }; chorus_request.handle_request_as_result(user).await @@ -126,7 +130,9 @@ impl ReactionMeta { emoji ); let chorus_request = ChorusRequest { - request: Client::new().delete(url).bearer_auth(user.token()), + request: Client::new() + .delete(url) + .header("Authorization", user.token()), limit_type: LimitType::Channel(self.channel_id), }; chorus_request.handle_request_as_result(user).await @@ -156,7 +162,9 @@ impl ReactionMeta { user_id ); let chorus_request = ChorusRequest { - request: Client::new().delete(url).bearer_auth(user.token()), + request: Client::new() + .delete(url) + .header("Authorization", user.token()), limit_type: LimitType::Channel(self.channel_id), }; chorus_request.handle_request_as_result(user).await diff --git a/src/api/guilds/guilds.rs b/src/api/guilds/guilds.rs index 0c8b9cf..9031563 100644 --- a/src/api/guilds/guilds.rs +++ b/src/api/guilds/guilds.rs @@ -23,7 +23,7 @@ impl Guild { let chorus_request = ChorusRequest { request: Client::new() .post(url.clone()) - .bearer_auth(user.token.clone()) + .header("Authorization", user.token.clone()) .body(to_string(&guild_create_schema).unwrap()), limit_type: LimitType::Global, }; @@ -58,7 +58,7 @@ impl Guild { let chorus_request = ChorusRequest { request: Client::new() .post(url.clone()) - .bearer_auth(user.token.clone()), + .header("Authorization", user.token.clone()), limit_type: LimitType::Global, }; chorus_request.handle_request_as_result(user).await @@ -95,7 +95,7 @@ impl Guild { user.belongs_to.borrow().urls.api, self.id )) - .bearer_auth(user.token()), + .header("Authorization", user.token()), limit_type: LimitType::Channel(self.id), }; let result = chorus_request.send_request(user).await?; @@ -129,7 +129,7 @@ impl Guild { user.belongs_to.borrow().urls.api, guild_id )) - .bearer_auth(user.token()), + .header("Authorization", user.token()), limit_type: LimitType::Guild(guild_id), }; let response = chorus_request.deserialize_response::(user).await?; @@ -156,7 +156,7 @@ impl Channel { user.belongs_to.borrow().urls.api, guild_id )) - .bearer_auth(user.token()) + .header("Authorization", user.token()) .body(to_string(&schema).unwrap()), limit_type: LimitType::Guild(guild_id), }; diff --git a/src/api/guilds/member.rs b/src/api/guilds/member.rs index 28fa68f..dcced7e 100644 --- a/src/api/guilds/member.rs +++ b/src/api/guilds/member.rs @@ -25,7 +25,7 @@ impl types::GuildMember { member_id ); let chorus_request = ChorusRequest { - request: Client::new().get(url).bearer_auth(user.token()), + request: Client::new().get(url).header("Authorization", user.token()), limit_type: LimitType::Guild(guild_id), }; chorus_request @@ -53,7 +53,7 @@ impl types::GuildMember { role_id ); let chorus_request = ChorusRequest { - request: Client::new().put(url).bearer_auth(user.token()), + request: Client::new().put(url).header("Authorization", user.token()), limit_type: LimitType::Guild(guild_id), }; chorus_request.handle_request_as_result(user).await @@ -79,7 +79,9 @@ impl types::GuildMember { role_id ); let chorus_request = ChorusRequest { - request: Client::new().delete(url).bearer_auth(user.token()), + request: Client::new() + .delete(url) + .header("Authorization", user.token()), limit_type: LimitType::Guild(guild_id), }; chorus_request.handle_request_as_result(user).await diff --git a/src/api/guilds/roles.rs b/src/api/guilds/roles.rs index 271cf90..c0893a8 100644 --- a/src/api/guilds/roles.rs +++ b/src/api/guilds/roles.rs @@ -24,7 +24,7 @@ impl types::RoleObject { guild_id ); let chorus_request = ChorusRequest { - request: Client::new().get(url).bearer_auth(user.token()), + request: Client::new().get(url).header("Authorization", user.token()), limit_type: LimitType::Guild(guild_id), }; let roles = chorus_request @@ -50,7 +50,7 @@ impl types::RoleObject { role_id ); let chorus_request = ChorusRequest { - request: Client::new().get(url).bearer_auth(user.token()), + request: Client::new().get(url).header("Authorization", user.token()), limit_type: LimitType::Guild(guild_id), }; chorus_request @@ -80,7 +80,10 @@ impl types::RoleObject { } })?; let chorus_request = ChorusRequest { - request: Client::new().post(url).bearer_auth(user.token()).body(body), + request: Client::new() + .post(url) + .header("Authorization", user.token()) + .body(body), limit_type: LimitType::Guild(guild_id), }; chorus_request @@ -111,7 +114,7 @@ impl types::RoleObject { let chorus_request = ChorusRequest { request: Client::new() .patch(url) - .bearer_auth(user.token()) + .header("Authorization", user.token()) .body(body), limit_type: LimitType::Guild(guild_id), }; @@ -146,7 +149,7 @@ impl types::RoleObject { let chorus_request = ChorusRequest { request: Client::new() .patch(url) - .bearer_auth(user.token()) + .header("Authorization", user.token()) .body(body), limit_type: LimitType::Guild(guild_id), }; diff --git a/src/api/invites/mod.rs b/src/api/invites/mod.rs index ac9c120..c32d30a 100644 --- a/src/api/invites/mod.rs +++ b/src/api/invites/mod.rs @@ -25,7 +25,7 @@ impl UserMeta { self.belongs_to.borrow().urls.api, invite_code )) - .bearer_auth(self.token()), + .header("Authorization", self.token()), limit_type: super::LimitType::Global, }; if session_id.is_some() { @@ -50,7 +50,7 @@ impl UserMeta { self.belongs_to.borrow().urls.api )) .body(to_string(&code).unwrap()) - .bearer_auth(self.token()), + .header("Authorization", self.token()), limit_type: super::LimitType::Global, } .deserialize_response::(self) @@ -76,7 +76,7 @@ impl UserMeta { self.belongs_to.borrow().urls.api, channel_id )) - .bearer_auth(self.token()) + .header("Authorization", self.token()) .body(to_string(&create_channel_invite_schema).unwrap()), limit_type: super::LimitType::Channel(channel_id), } diff --git a/src/api/users/channels.rs b/src/api/users/channels.rs index faa58ad..74f7484 100644 --- a/src/api/users/channels.rs +++ b/src/api/users/channels.rs @@ -25,7 +25,7 @@ impl UserMeta { ChorusRequest { request: Client::new() .post(url) - .bearer_auth(self.token()) + .header("Authorization", self.token()) .body(to_string(&create_private_channel_schema).unwrap()), limit_type: LimitType::Global, } diff --git a/src/api/users/guilds.rs b/src/api/users/guilds.rs index 3967e8e..f1e586d 100644 --- a/src/api/users/guilds.rs +++ b/src/api/users/guilds.rs @@ -22,7 +22,7 @@ impl UserMeta { self.belongs_to.borrow().urls.api, guild_id )) - .bearer_auth(self.token()) + .header("Authorization", self.token()) .body(to_string(&lurking).unwrap()), limit_type: crate::api::LimitType::Guild(*guild_id), } diff --git a/src/api/users/relationships.rs b/src/api/users/relationships.rs index 41270e1..2cf0c6c 100644 --- a/src/api/users/relationships.rs +++ b/src/api/users/relationships.rs @@ -26,7 +26,7 @@ impl UserMeta { user_id ); let chorus_request = ChorusRequest { - request: Client::new().get(url).bearer_auth(self.token()), + request: Client::new().get(url).header("Authorization", self.token()), limit_type: LimitType::Global, }; chorus_request @@ -44,7 +44,7 @@ impl UserMeta { self.belongs_to.borrow().urls.api ); let chorus_request = ChorusRequest { - request: Client::new().get(url).bearer_auth(self.token()), + request: Client::new().get(url).header("Authorization", self.token()), limit_type: LimitType::Global, }; chorus_request @@ -66,7 +66,10 @@ impl UserMeta { ); let body = to_string(&schema).unwrap(); let chorus_request = ChorusRequest { - request: Client::new().post(url).bearer_auth(self.token()).body(body), + request: Client::new() + .post(url) + .header("Authorization", self.token()) + .body(body), limit_type: LimitType::Global, }; chorus_request.handle_request_as_result(self).await @@ -86,7 +89,7 @@ impl UserMeta { let chorus_request = ChorusRequest { request: Client::new() .delete(format!("{}/users/@me/relationships/{}", api_url, user_id)) - .bearer_auth(self.token()), + .header("Authorization", self.token()), limit_type: LimitType::Global, }; chorus_request.handle_request_as_result(self).await @@ -100,7 +103,7 @@ impl UserMeta { let chorus_request = ChorusRequest { request: Client::new() .put(format!("{}/users/@me/relationships/{}", api_url, user_id)) - .bearer_auth(self.token()) + .header("Authorization", self.token()) .body(to_string(&body).unwrap()), limit_type: LimitType::Global, }; @@ -115,7 +118,7 @@ impl UserMeta { let chorus_request = ChorusRequest { request: Client::new() .put(format!("{}/users/@me/relationships/{}", api_url, user_id)) - .bearer_auth(self.token()) + .header("Authorization", self.token()) .body(to_string(&body).unwrap()), limit_type: LimitType::Global, }; @@ -136,7 +139,9 @@ impl UserMeta { user_id ); let chorus_request = ChorusRequest { - request: Client::new().delete(url).bearer_auth(self.token()), + request: Client::new() + .delete(url) + .header("Authorization", self.token()), limit_type: LimitType::Global, }; chorus_request.handle_request_as_result(self).await diff --git a/src/api/users/users.rs b/src/api/users/users.rs index ff0638d..1ba4e84 100644 --- a/src/api/users/users.rs +++ b/src/api/users/users.rs @@ -50,7 +50,7 @@ impl UserMeta { let request = Client::new() .patch(format!("{}/users/@me", self.belongs_to.borrow().urls.api)) .body(to_string(&modify_schema).unwrap()) - .bearer_auth(self.token()); + .header("Authorization", self.token()); let chorus_request = ChorusRequest { request, limit_type: LimitType::default(), @@ -68,7 +68,7 @@ impl UserMeta { "{}/users/@me/delete", self.belongs_to.borrow().urls.api )) - .bearer_auth(self.token()); + .header("Authorization", self.token()); let chorus_request = ChorusRequest { request, limit_type: LimitType::default(), @@ -90,7 +90,9 @@ impl User { } else { format!("{}/users/{}", url_api, id.unwrap()) }; - let request = reqwest::Client::new().get(url).bearer_auth(user.token()); + let request = reqwest::Client::new() + .get(url) + .header("Authorization", user.token()); let chorus_request = ChorusRequest { request, limit_type: LimitType::Global, @@ -115,7 +117,7 @@ impl User { ) -> ChorusResult { let request: reqwest::RequestBuilder = Client::new() .get(format!("{}/users/@me/settings", url_api)) - .bearer_auth(token); + .header("Authorization", token); let mut user = UserMeta::shell(Rc::new(RefCell::new(instance.clone())), token.clone()).await; let chorus_request = ChorusRequest {